From ab395f1498ab7ce9d59ce94da2a1c1f5c40b87dc Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 12 Aug 2024 10:14:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E6=96=99=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=A5=E6=BA=90=E5=BA=93=E5=8C=BA=E5=92=8C?=
 =?UTF-8?q?=E5=88=B0=E5=BA=93=E5=8C=BA=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/job/jobFilter.vue | 32 +++++++++++++++
 src/pages/issue/job/issueJob.vue   | 66 ++++++++++++++++++++++++------
 2 files changed, 85 insertions(+), 13 deletions(-)

diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 0da05f0f..4dcd4b84 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -46,6 +46,22 @@
 				<u-input style="margin-left: 20rpx;" confirmType="search" v-model="fromLocationCode" :border="true"
 					placeholder="请输入来源库位" @confirm="fromLocationCodeConfirm" />
 			</view>
+			<view v-if="isShowFromAreaCode" class="uni-flex space-between u-col-center"
+				style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;">
+					来源库区
+				</view>
+				<u-input style="margin-left: 20rpx;" confirmType="search" v-model="fromAreaCode" :border="true"
+					placeholder="请输入来源库区"  />
+			</view>
+			<view v-if="isShowToAreaCode" class="uni-flex space-between u-col-center"
+				style="width: 100%;margin-top: 30rpx;">
+				<view class="" style="font-size: 32rpx;">
+					到库区
+				</view>
+				<u-input style="margin-left: 50rpx;" confirmType="search" v-model="toAreaCode" :border="true"
+					placeholder="请输入到库区"  />
+			</view>
 
 			<!-- <view class="">
 				<view class="uni-flex u-row-center" style="margin-top: 30rpx;" v-if="isShowAsn">
@@ -125,6 +141,16 @@
 			isShowQurery: {
 				type: Boolean,
 				default: false
+			},
+			//来源库区
+			isShowFromAreaCode: {
+				type: Boolean,
+				default: false
+			},
+			//到库区
+			isShowToAreaCode: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -134,6 +160,8 @@
 				checkedWaitModel: false,
 				productionLineCode: '', // 生产线
 				fromLocationCode: '', // 来源库位
+				fromAreaCode: '', // 来源库区
+				toAreaCode: '', // 到库区
 				itemCode: '', //物料代码
 				creationTime: '',
 				status: ''
@@ -161,6 +189,8 @@
 				let params = {
 					productionLineCode: this.productionLineCode,
 					fromLocationCode: this.fromLocationCode,
+					fromAreaCode: this.fromAreaCode, // 来源库区
+					toAreaCode: this.toAreaCode, // 到库区
 					itemCode: this.itemCode,
 					creationTime: this.creationTime,
 					status: this.status
@@ -170,6 +200,8 @@
 			reset(){
 				this.productionLineCode = ''
 				this.fromLocationCode = ''
+				this.fromAreaCode = ''// 来源库区
+				this.toAreaCode = ''// 到库区
 				this.itemCode = ''
 				this.creationTime = ''
 				this.status = ''
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index f8680e9d..c4b6b589 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true" :productionline="productionlineList"
+		<job-filter :isShowFromLocationCode="true" :isShowFromAreaCode="false" :isShowToAreaCode="false" :isShowProductionLineCode="true" :productionline="productionlineList"
 			ref="filter" otherTitle="" 
 			:checkedToday="checkedToday" 
 			:checkedWaitTask="checkedWaitTask"
@@ -109,6 +109,8 @@
 				title: '',
 				productionLine: "",
 				fromLocation: "",
+				fromAreaCode: '', // 来源库区
+				toAreaCode: '', // 到库区
 				filterItemCode: "",
 				businessTypeCode: "Issue",
 				businessType: null,
@@ -141,13 +143,13 @@
 			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
 				return;
 			}
-			this.getList('more', this.fromLocation, this.productionLine, this.filterItemCode)
+			this.getList('more', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 			
 
 		},
 
 		onPullDownRefresh() {
-			this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+			this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 		},
 
 		//后退按钮
@@ -171,11 +173,11 @@
 
 		methods: {
 			timerRefresh() {
-				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 				this.stopRefresh();
 				var that = this;
 				this.timer = setInterval(function() {
-					that.getList('refresh', that.fromLocation, that.productionLine, that.filterItemCode)
+					that.getList('refresh', that.fromLocation, that.productionLine, that.filterItemCode,this.fromAreaCode,this.toAreaCode)
 					console.log('发料刷新');
 				}, planRefreshTime)
 			},
@@ -215,7 +217,7 @@
 				})
 			},
 
-			getList(type, fromLocation = '', productionLine = '',filterItemCode='') {
+			getList(type, fromLocation = '', productionLine = '',filterItemCode='',fromAreaCode='',toAreaCode='') {
 				let that = this;
 				uni.showLoading({
 					title: "加载中­....",
@@ -250,6 +252,22 @@
 						action: "==",
 						value: fromLocation
 					})
+				}
+				if(fromAreaCode){
+					//来源库区
+					filters.push({
+						column: "from_area_code",
+						action: "==",
+						value: fromAreaCode
+					})
+				}
+				if(toAreaCode){
+					//到库区
+					filters.push({
+						column: "to_area_code",
+						action: "==",
+						value: toAreaCode
+					})
 				}
 				if (productionLine) {
 					// 生产线
@@ -357,6 +375,28 @@
 					})
 				}else{
 					this.filterItemCode = ''
+				}
+				if (params.fromAreaCode) {
+					// 来源库区
+					this.fromAreaCode = params.fromAreaCode
+					filters.push({
+						column: "from_area_code",
+						action: "==",
+						value: params.fromAreaCode
+					})
+				}else{
+					this.fromAreaCode = ''
+				}
+				if (params.toAreaCode) {
+					// 到库区
+					this.toAreaCode = params.toAreaCode
+					filters.push({
+						column: "to_area_code",
+						action: "==",
+						value: params.toAreaCode
+					})
+				}else{
+					this.toAreaCode = ''
 				}
 				var params = {
 					filters: filters,
@@ -364,7 +404,7 @@
 					pageSize: 100,
 				}
 				
-				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 				// getIssueJobList(params).then(res => {
 				// 	uni.hideLoading();
 				// 	if (res.data.total == 0) {
@@ -383,12 +423,12 @@
 
 			fromLocationCode(fromLocation) {
 				this.fromLocation = fromLocation;
-				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 				
 			},
 			productionLineCode(productionLineCode) {
 				this.productionLine = productionLineCode
-				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 			},
 			getByAsnNumber(code) {
 				let that = this;
@@ -461,7 +501,7 @@
 			cancleJob(id) {
 				cancleTakeIssueJob(id).then(res => {
 					if (res.data) {
-						this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+						this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 						
 						uni.showToast({
 							title: "放弃任务成功"
@@ -498,14 +538,14 @@
 			switchChangeToday(state, creationTime) {
 				this.checkedToday = state;
 				this.todayTime = creationTime;
-				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 				
 			},
 
 			switchChangeWait(state, jobStatus) {
 				this.checkedWaitTask = state;
 				this.status = jobStatus;
-				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 			},
 			getJobInfoByNumber(number,scanMessage){
 				let that = this;
@@ -542,7 +582,7 @@
 									if (this.$refs.scanPopup) {
 										this.$refs.scanPopup.getfocus()
 									}
-									this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode)
+									this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 								}
 							});
 							

From 06f67bc4812742ee09a725d7cc4bee5a73c31e78 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Mon, 12 Aug 2024 14:24:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/issue/job/issueJob.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index c4b6b589..a145d723 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter :isShowFromLocationCode="true" :isShowFromAreaCode="false" :isShowToAreaCode="false" :isShowProductionLineCode="true" :productionline="productionlineList"
+		<job-filter :isShowFromLocationCode="true" :isShowFromAreaCode="true" :isShowToAreaCode="true" :isShowProductionLineCode="true" :productionline="productionlineList"
 			ref="filter" otherTitle="" 
 			:checkedToday="checkedToday" 
 			:checkedWaitTask="checkedWaitTask"
@@ -256,7 +256,7 @@
 				if(fromAreaCode){
 					//来源库区
 					filters.push({
-						column: "from_area_code",
+						column: "fromAreaCode",
 						action: "==",
 						value: fromAreaCode
 					})
@@ -264,7 +264,7 @@
 				if(toAreaCode){
 					//到库区
 					filters.push({
-						column: "to_area_code",
+						column: "toAreaCode",
 						action: "==",
 						value: toAreaCode
 					})
@@ -380,7 +380,7 @@
 					// 来源库区
 					this.fromAreaCode = params.fromAreaCode
 					filters.push({
-						column: "from_area_code",
+						column: "fromAreaCode",
 						action: "==",
 						value: params.fromAreaCode
 					})
@@ -391,7 +391,7 @@
 					// 到库区
 					this.toAreaCode = params.toAreaCode
 					filters.push({
-						column: "to_area_code",
+						column: "toAreaCode",
 						action: "==",
 						value: params.toAreaCode
 					})