Merge branch 'hella_online_20240803' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into hella_online_20240803

src/mycomponents/job/jobFilter.vue

@@ -198,6 +198,8 @@
 				return params;
 			},
 			reset(){
+				this.checkedTodayModel = false
+				this.checkedWaitModel = false
 				this.productionLineCode = ''
 				this.fromLocationCode = ''
 				this.fromAreaCode = ''// 来源库区

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;

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>
 

src/pages/issue/job/issueJob.vue

@@ -329,82 +329,91 @@
 					title: "加载中­....",
 					mask: true
 				});
-				var filters = []
+				// var filters = []
-				if (this.checkedToday) {
+				// if (this.checkedToday) {
-					filters.push({
+				// 	filters.push({
-						column: "create_time",
+				// 		column: "create_time",
-						action: "betweeen",
+				// 		action: "betweeen",
-						value: this.todayTime
+				// 		value: this.todayTime
-					})
+				// 	})
+				// }
+
+				// filters.push({
+				// 	column: "status",
+				// 	action: "in",
+				// 	value: this.status
+				// })
+				if (params.status) {
+					this.status  = params.status
+					
+				}else{
+					this.status  = "1,2"
+				}
+				if(params.creationTime==""){
+					this.checkedToday = false;
 				}
 
-				filters.push({
-					column: "status",
-					action: "in",
-					value: this.status
-				})
-
 
 				if (params.fromLocationCode) {
 					// 来源库位
 					this.fromLocation = params.fromLocationCode
-					filters.push({
+					// filters.push({
-						column: "fromLocationCode",
+					// 	column: "fromLocationCode",
-						action: "==",
+					// 	action: "==",
-						value: params.fromLocationCode
+					// 	value: params.fromLocationCode
-					})
+					// })
 				}else{
 					this.fromLocation = ''
 				}
 				if (params.productionLineCode) {
 					// 生产线
 					this.productionLine = params.productionLineCode
-					filters.push({
+					// filters.push({
-						column: "productionLineCode",
+					// 	column: "productionLineCode",
-						action: "==",
+					// 	action: "==",
-						value: params.productionLineCode
+					// 	value: params.productionLineCode
-					})
+					// })
 				}else{
 					this.productionLine = ''
 				}
 				if (params.itemCode) {
 					// 物料代码
 					this.filterItemCode = params.itemCode
-					filters.push({
+					// filters.push({
-						column: "itemCode",
+					// 	column: "itemCode",
-						action: "like",
+					// 	action: "like",
-						value: params.itemCode
+					// 	value: params.itemCode
-					})
+					// })
 				}else{
 					this.filterItemCode = ''
 				}
 				if (params.fromAreaCode) {
 					// 来源库区
 					this.fromAreaCode = params.fromAreaCode
-					filters.push({
+					// filters.push({
-						column: "fromAreaCode",
+					// 	column: "fromAreaCode",
-						action: "==",
+					// 	action: "==",
-						value: params.fromAreaCode
+					// 	value: params.fromAreaCode
-					})
+					// })
 				}else{
 					this.fromAreaCode = ''
 				}
 				if (params.toAreaCode) {
 					// 到库区
 					this.toAreaCode = params.toAreaCode
-					filters.push({
+					// filters.push({
-						column: "toAreaCode",
+					// 	column: "toAreaCode",
-						action: "==",
+					// 	action: "==",
-						value: params.toAreaCode
+					// 	value: params.toAreaCode
-					})
+					// })
 				}else{
 					this.toAreaCode = ''
 				}
-				var params = {
+				// var params = {
-					filters: filters,
+				// 	filters: filters,
-					pageNo: 1,
+				// 	pageNo: 1,
-					pageSize: 100,
+				// 	pageSize: 100,
-				}
+				// }
 				
 				this.getList('refresh', this.fromLocation, this.productionLine, this.filterItemCode,this.fromAreaCode,this.toAreaCode)
 				// getIssueJobList(params).then(res => {

src/pages/repleinsh/job/repleinshJob.vue

@@ -281,29 +281,37 @@
 					title: "加载中­....",
 					mask: true
 				});
-				var filters = []
+				// var filters = []
-				if (this.checkedToday) {
+				// if (this.checkedToday) {
-					filters.push({
+				// 	filters.push({
-						column: "create_time",
+				// 		column: "create_time",
-						action: "betweeen",
+				// 		action: "betweeen",
-						value: this.todayTime
+				// 		value: this.todayTime
-					})
+				// 	})
-				}
+				// }
 
-				filters.push({
+				// filters.push({
-					column: "status",
+				// 	column: "status",
-					action: "in",
+				// 	action: "in",
-					value: this.status
+				// 	value: this.status
-				})
+				// })
+				if (params.status) {
+					this.status  = params.status
+				}else{
+					this.status  = "1,2"
+				}
+				if(params.creationTime==""){
+					this.checkedToday = false;
+				}
 
 				if (params.fromLocationCode) {
 					// 来源库位
 					this.fromLocationCode = params.fromLocationCode
-					filters.push({
+					// filters.push({
-						column: "fromLocationCode",
+					// 	column: "fromLocationCode",
-						action: "==",
+					// 	action: "==",
-						value: params.fromLocationCode
+					// 	value: params.fromLocationCode
-					})
+					// })
 				}else{
 					this.fromLocationCode = ''
 				}
@@ -311,19 +319,19 @@
 				if (params.itemCode) {
 					// 物料代码
 					this.filterItemCode = params.itemCode
-					filters.push({
+					// filters.push({
-						column: "itemCode",
+					// 	column: "itemCode",
-						action: "like",
+					// 	action: "like",
-						value: params.itemCode
+					// 	value: params.itemCode
-					})
+					// })
 				}else{
 					this.filterItemCode = ''
 				}
-				var params = {
+				// var params = {
-					filters: filters,
+				// 	filters: filters,
-					pageNo: 1,
+				// 	pageNo: 1,
-					pageSize: 100,
+				// 	pageSize: 100,
-				}
+				// }
 				this.getList('refresh', this.fromLocationCode, this.filterItemCode)
 			
 				// getRepleinshJobList(params).then(res => {