提交代码

src/pages/productionReceipt/job/productionReceiptJob.vue

@@ -3,8 +3,7 @@
 		<com-empty-view v-if="jobList.length==0"></com-empty-view>
 		<job-filter ref="filter" otherTitle="ASN" @switchChangeToday="switchChangeToday"
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
-			:checkedWaitTask="checkedWaitTask" :isShowProductionLineCode="true"
+			:checkedWaitTask="checkedWaitTask" :isShowProductionLineCode="true" @productionLineCode="productionLineCode"
-			@productionLineCode="productionLineCode"
 			:productionline="productionLineList">
 		</job-filter>
 		<view v-if="jobList.length>0">
@@ -85,7 +84,7 @@
 				title: '',
 				scanMessage: "",
 				productionLineList: [],
-				productionLine:""
+				productionLine: ""
 			};
 		},
 		onLoad(option) {
@@ -136,7 +135,7 @@
 		methods: {
 			productionLineCode(productionLineCode) {
 				this.productionLine = productionLineCode
-				this.getList('refresh',  this.productionLine)
+				this.getList('refresh', this.productionLine)
 			},
 			getProductionReceiptJobByProductionline() {
 				getProductionReceiptJobByProductionline().then(res => {
@@ -353,8 +352,8 @@
 					this.scanMessage = ""
 					var filters = [{
 							column: "packingNumber",
-							action: "==",
+							action: "in",
-							value: result.label.packingNumber
+							value: result.package.number + "," + result.package.parentNumber
 						},
 						{
 							column: "batch",