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

pages/issue/coms/comScanIssuePack.vue

@@ -158,8 +158,6 @@
 			this.scanOptions = getDetailEditRemoveOption();
 		},
 		methods: {
-
-
 			openScanPopup(content, jobcontent) {
 				this.issueRecord = [];
 				this.dataContent = content;
@@ -327,7 +325,7 @@
 								this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
 									'】的发料明细,是否要继续发料?', res => {
 										if (res) {
-											let batch = that.createBatchInfo(label, balance);
+											let batch = that.createBatchInfo(label, balance,packageInfo);
 											fromLocation.Batchs.unshift(batch);
 										}
 									})
@@ -354,15 +352,15 @@
 				}
 			},
 
-			createBatchInfo(data, balance) {
+			createBatchInfo(data, balance,packageInfo) {
 				let batch = {
-					batch: data.lot,
+					batch: data.batch,
 					qty: 0,
 					uom: data.uom,
 					handleQty: Number(data.qty),
 					Records: []
 				}
-				let record = this.creatRecord(data, balance);
+				let record = this.creatRecord(data, balance,packageInfo);
 				batch.Records.push(record);
 				this.issueRecord.unshift(record)
 				return batch;