任务添加判断，修改扫描查询条件

src/pages/productPutaway/job/productPutawayJob.vue

@@ -210,7 +210,7 @@
 				})
 			},
 
-			openJobDetail(item,packingNumber='') {
+			openJobDetail(item, packingNumber = '') {
 				uni.navigateTo({
 					url: './productPutawayDetail?id=' + item.masterId + '&status=' + item.status + '&type=' + item
 						.type + '&scaned=' + packingNumber
@@ -333,19 +333,21 @@
 							action: "==",
 							value: result.label.batch
 						},
+						// {
+						// 	column: "qty",
+						// 	action: "==",
+						// 	value: result.label.qty
+						// }, 
 						{
-							column: "qty",
-							action: "==",
-							value: result.label.qty
-						}, {
 							column: "itemCode",
 							action: "==",
 							value: result.label.itemCode
-						}, {
-							column: "fromLocationCode",
-							action: "==",
-							value: result.label.fromLocationCode
-						}
+						},
+						// {
+						// 	column: "fromLocationCode",
+						// 	action: "==",
+						// 	value: result.label.fromLocationCode
+						// }
 					]
 					getProductPutawayJobList({
 						filters: filters,
@@ -358,10 +360,14 @@
 							item.selected = false
 						})
 						console.log('list', list)
-						if (list.length > 1) {
-							this.$refs.jobList.openList(list)
+						if (list.length > 0) {
+							if (list.length > 1) {
+								this.$refs.jobList.openList(list)
+							} else {
+								this.selectItem(list[0])
+							}
 						} else {
-							this.selectItem(list[0])
+							this.showMessage('未查找到任务')
 						}
 					}).catch(error => {
 						this.showMessage(error)

src/pages/productReceipt/job/productReceiptJob.vue

@@ -212,18 +212,21 @@
 				})
 			},
 
-			openJobDetail(item,packingNumber='') {
+			openJobDetail(item, packingNumber = '') {
 				if (this.type == 'predict') {
 					uni.navigateTo({
-						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber
+						url: './productReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' +
+							packingNumber
 					});
 				} else if (this.type == 'assemble') {
 					uni.navigateTo({
-						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber
+						url: './fgProductReceiptDetail?id=' + item.masterId + '&status=' + item.status +
+							'&scaned=' + packingNumber
 					});
 				} else {
 					uni.navigateTo({
-						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' + packingNumber
+						url: './scrapReceiptDetail?id=' + item.masterId + '&status=' + item.status + '&scaned=' +
+							packingNumber
 					});
 				}
 			},
@@ -342,7 +345,7 @@
 			},
 			selectItem(item) {
 				this.$refs.scanPopup.closeScanPopup();
-				this.openJobDetail(item,item.packingNumber);
+				this.openJobDetail(item, item.packingNumber);
 			},
 			getScanResult(result) {
 				try {
@@ -356,19 +359,21 @@
 							action: "==",
 							value: result.label.batch
 						},
+						// {
+						// 	column: "qty",
+						// 	action: "==",
+						// 	value: result.label.qty
+						// }, 
 						{
-							column: "qty",
-							action: "==",
-							value: result.label.qty
-						}, {
 							column: "itemCode",
 							action: "==",
 							value: result.label.itemCode
-						}, {
-							column: "fromLocationCode",
-							action: "==",
-							value: result.label.fromLocationCode
-						}
+						},
+						// {
+						// 	column: "fromLocationCode",
+						// 	action: "==",
+						// 	value: result.label.fromLocationCode
+						// }
 					]
 					getProductReceiptJobList({
 						filters: filters,
@@ -381,10 +386,14 @@
 							item.selected = false
 						})
 						console.log('list', list.length)
-						if (list.length > 1) {
-							this.$refs.jobList.openList(list)
+						if (list.length > 0) {
+							if (list.length > 1) {
+								this.$refs.jobList.openList(list)
+							} else {
+								this.selectItem(list[0])
+							}
 						} else {
-							this.selectItem(list[0])
+							this.showMessage('未查找到任务')
 						}
 					}).catch(error => {
 						this.showMessage(error)

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -254,7 +254,7 @@
 				})
 			},
 
-			openJobDetail(item,packingNumber='') {
+			openJobDetail(item, packingNumber = '') {
 				uni.navigateTo({
 					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this
 						.operation + '&scaned=' + packingNumber
@@ -342,19 +342,21 @@
 							action: "==",
 							value: result.label.batch
 						},
+						// {
+						// 	column: "qty",
+						// 	action: "==",
+						// 	value: result.label.qty
+						// }, 
 						{
-							column: "qty",
-							action: "==",
-							value: result.label.qty
-						}, {
 							column: "itemCode",
 							action: "==",
 							value: result.label.itemCode
-						}, {
-							column: "fromLocationCode",
-							action: "==",
-							value: result.label.fromLocationCode
-						}
+						},
+						// {
+						// 	column: "fromLocationCode",
+						// 	action: "==",
+						// 	value: result.label.fromLocationCode
+						// }
 					]
 					getPurchaseReceiptJobList({
 						filters: filters,
@@ -367,10 +369,14 @@
 							item.selected = false
 						})
 						console.log('list', list)
-						if (list.length > 1) {
-							this.$refs.jobList.openList(list)
+						if (list.length > 0) {
+							if (list.length > 1) {
+								this.$refs.jobList.openList(list)
+							} else {
+								this.selectItem(list[0])
+							}
 						} else {
-							this.selectItem(list[0])
+							this.showMessage('未查找到任务')
 						}
 					}).catch(error => {
 						this.showMessage(error)