From 1c1628290c33a1661ff24c7806d91912fb0bb66d Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Sat, 17 Aug 2024 11:04:20 +0800
Subject: [PATCH] =?UTF-8?q?HL-5369=E7=89=A9=E6=96=99=E9=9A=94=E7=A6=BB?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=EF=BC=8CPDA=E5=A2=9E=E5=8A=A0=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E5=8F=B7=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

---
 src/pages/inventoryMove/coms/comMoveJob.vue   | 47 +++++++++++++++++--
 .../inventoryMove/job/okToHoldMoveJob.vue     |  2 +-
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index fd6ab5f2..7446bf81 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="">
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
-		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
+		<job-filter ref="filter" :isShowItemCode="isShowItemCode" :isShowQurery="isShowQurery" otherTitle="ASN" @switchChangeToday="switchChangeToday"
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
-			:checkedWaitTask="checkedWaitTask">
+			:checkedWaitTask="checkedWaitTask" @onQuery="getListByFilter">
 		</job-filter>
 
 		<view v-if="jobList.length>0">
@@ -67,7 +67,15 @@
 			title: {
 				type: String,
 				default: ""
-			} 
+			},
+			isShowItemCode: {
+				type: Boolean,
+				default: false
+			},
+			isShowQurery: {
+				type: Boolean,
+				default: false
+			},
 		},
 		data() {
 			return {
@@ -82,7 +90,8 @@
 				status: '1,2', //待处理 、进行中
 				detailOptions: [],
 				detailGiveupOptions: [],
-				titleName:""
+				titleName:"",
+				filterItemCode:''
 			};
 		},
 
@@ -172,6 +181,15 @@
 					value: this.status
 				})
 				
+				if(this.filterItemCode){
+					// 物料代码
+					filters.push({
+						column: "itemCode",
+						action: "like",
+						value: this.filterItemCode
+					})
+				}
+				
 				filters.push({
 					column: "accept_user_id",
 					action: "==",
@@ -260,6 +278,27 @@
 					this.showMessage(error)
 				})
 			},
+			getListByFilter(params) {
+				console.log('getListByFilter',params)
+				if (params.itemCode) {
+					// 物料代码
+					this.filterItemCode = params.itemCode
+				}else{
+					this.filterItemCode = ''
+				}
+				if (params.status) {
+					this.status  = params.status
+					
+				}else{
+					this.status  = "1,2"
+				}
+				if(params.creationTime==""){
+					this.checkedToday = false;
+				}
+				this.todayTime = params.creationTime
+				
+				this.getList('refresh')
+			},
 
 			switchChangeToday(state, creationTime) {
 				this.checkedToday = state;
diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
index bded74f7..43d7e0b5 100644
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page-wraper">
-		<comMoveJob :title="title" ref="comMoveJob" businessTypeCode='OkToHold' > </comMoveJob>
+		<comMoveJob :isShowItemCode="true" :isShowQurery="true" :title="title" ref="comMoveJob" businessTypeCode='OkToHold' > </comMoveJob>
 	</view>
 </template>