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

src/pages/deliver/coms/comScanDeliverPack.vue

@@ -375,11 +375,17 @@
 
 			createBatchInfo(data, balance, packageInfo) {
 				let batch = {
-					batch: data.lot,
+					batch: data.lot||data.batch,
 					qty: 0,
 					uom: data.uom,
 					handleQty: Number(data.qty),
-					Records: []
+					Records: [],
+					detail:{
+						handleQty: Number(data.qty),
+						packingNumber:data.packingNumber,
+						qty: 0,
+						uom:data.uom,
+					}
 				}
 				let record = this.creatRecord(data, balance, packageInfo);
 				batch.Records.push(record);

src/pages/deliver/job/deliverJob.vue

@@ -138,11 +138,11 @@
 					})
 				}
 				
-				filters.push({
+				// filters.push({
-					column: "accept_user_id",
+				// 	column: "accept_user_id",
-					action: "==",
+				// 	action: "==",
-					value: this.$store.state.user.id
+				// 	value: this.$store.state.user.id
-				})
+				// })
 				filters.push({
 					column: "status",
 					action: "in",