From c2f5c47a1b62481a0f47c61b036be81481b615dd Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Wed, 7 Aug 2024 11:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
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         |  8 +++---
 src/pages/repleinsh/job/repleinshJob.vue | 12 ++++-----
 3 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 4e2b6ee8..9b1021d2 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -3,9 +3,7 @@
 		<view class="maskbox" @tap="maskClick"></view>
 		<view class="uni-flex uni-column center"
 			style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative; border-radius: 10rpx;">
-
-			<!-- 现场并不需要这两个筛选条件，暂时拿掉 -->
-			<!-- <view class="uni-flex space-between u-col-center" style="width: 100%;">
+			<view class="uni-flex space-between u-col-center" style="width: 100%;">
 				<view class="" style="font-size: 32rpx;">
 					只看当天
 				</view>
@@ -20,7 +18,7 @@
 				</view>
 				<u-switch v-model="checkedWaitModel" active-color="#4DD865" inactive-color="#eee" size="35"
 					@change="switchChangeWait"></u-switch>
-			</view> -->
+			</view>
 			<view v-if="isShowProductionLineCode" class="uni-flex space-between u-col-center"
 				style="width: 100%;margin-top: 30rpx;">
 				<view class="" style="font-size: 32rpx;">
@@ -59,7 +57,8 @@
 						@click="scanNumberClick">扫描任务编号</button>
 				</view>
 			</view> -->
-			<view class=" uni-flex uni-row" style="margin-top: 5px;">
+			<view class=" uni-flex uni-row" style="margin-top: 5px;" v-if="isShowQurery">
+				<button class="btn_single_clear" hover-class="btn_commit_after" @click="query()">重置</button>
 				<button class="btn_single_commit" hover-class="btn_commit_after" @click="query()">查询</button>
 			</view>
 		</view>
@@ -122,6 +121,10 @@
 			isShowItemCode: {
 				type: Boolean,
 				default: false
+			},
+			isShowQurery: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -131,7 +134,9 @@
 				checkedWaitModel: false,
 				productionLineCode: '', // 生产线
 				fromLocationCode: '', // 来源库位
-				itemCode: '' //物料代码
+				itemCode: '', //物料代码
+				creationTime: '',
+				status: ''
 			}
 		},
 		watch: {
@@ -156,7 +161,9 @@
 				let params = {
 					productionLineCode: this.productionLineCode,
 					fromLocationCode: this.fromLocationCode,
-					itemCode: this.itemCode
+					itemCode: this.itemCode,
+					creationTime: this.creationTime,
+					status: this.status
 				}
 				return params;
 			},
@@ -198,17 +205,22 @@
 				if (isOn) {
 					creationTime = getTodayDate();
 				}
-
+				this.creationTime = creationTime;
 				this.$emit("switchChangeToday", isOn, creationTime)
-				this.closeScanPopup()
+				if (!this.isShowQurery) {
+					this.closeScanPopup()
+				}
 			},
 			switchChangeWait(isOn) {
 				let status = "1,2";
 				if (isOn) {
 					status = "1"
 				}
+				this.status = status;
 				this.$emit("switchChangeWait", isOn, status)
-				this.closeScanPopup()
+				if (!this.isShowQurery) {
+					this.closeScanPopup()
+				}
 			},
 
 			scanNumberClick() {
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 8e60fbf5..b14e36ae 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -2,10 +2,8 @@
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
 		<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">
+			ref="filter" otherTitle="" :checkedToday="checkedToday" :checkedWaitTask="checkedWaitTask"
+			:isShowItemCode="true" @onQuery="getListByFilter" :isShowQurery='true'>
 			<!-- <job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="true"
 				:productionline="productionlineList" ref="filter" otherTitle="" @switchChangeToday="switchChangeToday"
 				@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
@@ -181,7 +179,7 @@
 					}
 				})
 			},
-	
+
 			getList(type, fromLocation = '', productionLine = '') {
 				let that = this;
 				uni.showLoading({
diff --git a/src/pages/repleinsh/job/repleinshJob.vue b/src/pages/repleinsh/job/repleinshJob.vue
index 9b019bc9..8c3ebc2d 100644
--- a/src/pages/repleinsh/job/repleinshJob.vue
+++ b/src/pages/repleinsh/job/repleinshJob.vue
@@ -6,11 +6,11 @@
 			:checkedWaitTask="checkedWaitTask" @fromLocationCode="fromLocationCode">
 		</job-filter> -->
 
-		<job-filter :isShowFromLocationCode="true" :isShowProductionLineCode="false" :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 :isShowFromLocationCode="true" :isShowProductionLineCode="false"
+			:productionline="productionlineList" ref="filter" otherTitle="" @switchChangeToday="switchChangeToday"
+			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
+			:checkedWaitTask="checkedWaitTask" :isShowItemCode="true" @productionLineCode="productionLineCode"
+			@fromLocationCode="fromLocationCode" :isShowQurery='true' @onQuery="getListByFilter">
 		</job-filter>
 		<view v-if="jobList.length>0">
 			<uni-swipe-action ref="swipeAction">
@@ -276,7 +276,7 @@
 						value: params.fromLocationCode
 					})
 				}
-				
+
 				if (params.itemCode) {
 					// 生产线
 					filters.push({