From 472ce7a8d5f757c157c4f7008e419e79f497af62 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Tue, 6 Aug 2024 22:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A1=A5=E6=96=99=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |  9 +--
 src/pages/issue/job/issueJob.vue         |  3 +-
 src/pages/repleinsh/job/repleinshJob.vue | 91 ++++++++++++++++++++++--
 3 files changed, 94 insertions(+), 9 deletions(-)

diff --git a/.env.development b/.env.development
index 2c183308..bc989d6e 100644
--- a/.env.development
+++ b/.env.development
@@ -1,11 +1,12 @@
-VITE_BASE_URL=http://172.21.32.13:81/api/admin-api
-VITE_BASE_URL_IMAGE=http://172.21.32.13:81/admin-api
+VITE_BASE_URL=http://172.22.32.8:81/api/admin-api
+VITE_BASE_URL_IMAGE=http://172.22.32.8:81/admin-api
 
 # 租户配置
-VITE_TENANT='[{"text":"长春1379","value":1}]'
+VITE_TENANT='[{"text":"成都1397","value":2},{"text":"长春2379","value":3}]'
 
 # 是否是测试环境
 VITE_isDevelopment=false
 
+
 # 积木报表请求路径
-VITE_JMREPORT_BASE_URL='http://172.21.32.13:90'
+VITE_JMREPORT_BASE_URL='http://172.22.32.8:90'
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index eaa2c31d..2cea9f5b 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -181,6 +181,7 @@
 					}
 				})
 			},
+	
 			getList(type, fromLocation = '', productionLine = '') {
 				let that = this;
 				uni.showLoading({
@@ -325,7 +326,7 @@
 				getIssueJobList(params).then(res => {
 					uni.hideLoading();
 					if (res.data.total == 0) {
-						that.showMessage('未查找到' + '【' + code + '】的收货任务');
+						that.showMessage('未查找到发料任务');
 					} else if (res.data.total == 1) {
 						that.openJobDetail(res.data.list[0]);
 					} else {
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 7cda3b72..abd4e37e 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -1,9 +1,16 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter :isShowFromLocationCode="true" ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+		<!-- 	<job-filter :isShowFromLocationCode="true" ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday" :isShowItemCode="true"
 			:checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode">
+		</job-filter> -->
+
+		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionlineList"
+			ref="filter" otherTitle="" @switchChangeToday="switchChangeToday" @switchChangeWait="switchChangeWait"
+			@onScanNumber="getScanNumber" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"
+			:isShowItemCode="true" @productionLineCode="productionLineCode" @fromLocationCode="fromLocationCode"
+			@onQuery="getListByFilter">
 		</job-filter>
 		<view v-if="jobList.length>0">
 			<uni-swipe-action ref="swipeAction">
@@ -95,6 +102,8 @@
 				scanBalance: {},
 				inInventoryStatus: "", //目标入库库存状态
 				outInventoryStatus: "", //来源出库库存状态
+				productionLineCode:"",
+				productionlineList:[]
 			};
 		},
 		onLoad(option) {
@@ -146,7 +155,7 @@
 				getBusinessType(this.businessTypeCode, res => {
 					if (res.success) {
 						this.businessType = res.businessType;
-						this.fromInventoryStatuses =res.fromInventoryStatuses.split(',');
+						this.fromInventoryStatuses = res.fromInventoryStatuses.split(',');
 						this.fromLocationAreaTypeList = res.fromLocationAreaTypeList
 						// this.openScanPopup();
 					} else {
@@ -231,12 +240,86 @@
 					that.showMessage(error)
 				})
 			},
+
+			getListByFilter(params) {
+				let that = this;
+				uni.showLoading({
+					title: "加载中­....",
+					mask: true
+				});
+				var filters = []
+				if (this.checkedToday) {
+					filters.push({
+						column: "create_time",
+						action: "betweeen",
+						value: this.todayTime
+					})
+				}
+
+				filters.push({
+					column: "status",
+					action: "in",
+					value: this.status
+				})
+
+				filters.push({
+					column: "accept_user_id",
+					action: "==",
+					value: this.$store.state.user.id
+				})
+
+				if (params.fromLocationCode) {
+					// 来源库位
+					filters.push({
+						column: "fromLocationCode",
+						action: "==",
+						value: params.fromLocationCode
+					})
+				}
+				if (params.productionLine) {
+					// 生产线
+					filters.push({
+						column: "productionLineCode",
+						action: "==",
+						value: params.productionLine
+					})
+				}
+				if (params.itemCode) {
+					// 生产线
+					filters.push({
+						column: "itemCode",
+						action: "like",
+						value: params.itemCode
+					})
+				}
+				var params = {
+					filters: filters,
+					pageNo: 1,
+					pageSize: 100,
+				}
+				getRepleinshJobList(params).then(res => {
+					uni.hideLoading();
+					if (res.data.total == 0) {
+						that.showMessage('未查找到补料任务');
+					} else if (res.data.total == 1) {
+						that.openJobDetail(res.data.list[0]);
+					} else {
+						that.showItemList(res.data.list);
+					}
+				}).catch(error => {
+
+					that.showMessage(error)
+				})
+			},
+
+
+
 			fromLocationCode(fromLocationCode) {
 				console.log('fromLocationCode', fromLocationCode)
 				this.getList('refresh', fromLocationCode, '')
 			},
 
-			openJobDetail(item, scanMessage='') {
+			openJobDetail(item, scanMessage = '') {
 				uni.navigateTo({
 					url: './repleinshDetail?id=' + item.masterId + '&status=' + item.status + '&scanMessage=' +
 						scanMessage + '&title=' + this.title
@@ -245,7 +328,7 @@
 			},
 
 			showItemList(itemList) {
-				this.$refs.scanList.openPopup(itemList);
+				this.$refs.jobListPopup.openPopup(itemList);
 			},
 
 			selectedItem(item) {