修改客户退货和报废出库记录修改数量

pages/customerReturn/record/returnRecord.vue

@@ -56,7 +56,8 @@
 	import {
 		goHome,
 		updateTitle,
-		getPackingNumberAndBatchByList
+		getPackingNumberAndBatchByList,
+		deepCopyData
 	} from '@/common/basic.js';
 
 	import {
@@ -323,27 +324,32 @@
 						if (detail.scaned) {
 							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
 								detail.packingNumber, detail.toLocationCode, detail.batch);
-							detail.itemCode = detail.itemCode;
-							detail.itemName = detail.package.itemName;
-							detail.itemDesc1 = detail.package.itemDesc1;
-							detail.itemDesc2 = detail.package.itemDesc2;
-
-							detail.inventoryStatus = detail.inventoryStatus;
-							detail.toInventoryStatus = detail.inventoryStatus;
-
-							detail.fromPackingNumber = info.packingNumber;
-							detail.toPackingNumber = info.packingNumber;
-
-							detail.fromContainerNumber = detail.containerNumber;
-							detail.toContainerNumber = detail.containerNumber
-
-							detail.fromBatch = info.batch;
-							detail.toBatch = info.batch;
-
-							detail.fromLocationCode = detail.locationCode;
-							detail.toLocationCode = detail.toLocationCode;
-
-							subList.push(detail)
+							var submitItem = deepCopyData(detail)
+							
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
+
+							submitItem.inventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = detail.inventoryStatus;
+
+							submitItem.fromPackingNumber = info.packingNumber;
+							submitItem.toPackingNumber = info.packingNumber;
+
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
+
+							submitItem.fromBatch = info.batch;
+							submitItem.toBatch = info.batch;
+
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = detail.toLocationCode;
+							
+							submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
+							submitItem.package ="";
+							subList.push(submitItem)
+							
 						}
 					})
 				})

pages/scrap/record/scrapRecord.vue

@@ -19,6 +19,7 @@
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :settingParam="dataContent"
 								:isShowLocation="true" @removeItem="removeItem(index,item)" @updateData="updateData"
+								:isShowToLocation="false"
 								@removePack="removePack">
 							</record-com-detail-card>
 						</view>
@@ -55,6 +56,7 @@
 	
 	import {
 		goHome,
+		deepCopyData
 	} from '@/common/basic.js';
 	
 	import {
@@ -274,30 +276,34 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							detail.itemCode = detail.itemCode;
-							detail.itemName = detail.package.itemName;
-							detail.itemDesc1 = detail.package.itemDesc1;
-							detail.itemDesc2 = detail.package.itemDesc2;
+							var submitItem = deepCopyData(detail)
+							submitItem.itemCode = detail.itemCode;
+							submitItem.itemName = detail.package.itemName;
+							submitItem.itemDesc1 = detail.package.itemDesc1;
+							submitItem.itemDesc2 = detail.package.itemDesc2;
 							
-							detail.inventoryStatus = detail.inventoryStatus;
+							submitItem.inventoryStatus = detail.inventoryStatus;
 							
 							detail.fromPackingNumber = detail.packingNumber;
 							detail.toPackingNumber = detail.packingNumber;
 							
-							detail.fromContainerNumber = detail.containerNumber;
-							detail.toContainerNumber = detail.containerNumber
+							submitItem.fromContainerNumber = detail.containerNumber;
+							submitItem.toContainerNumber = detail.containerNumber
 							
-							detail.fromBatch = detail.batch;
-							detail.toBatch = detail.batch;
+							submitItem.fromBatch = detail.batch;
+							submitItem.toBatch = detail.batch;
 							
-							detail.fromLocationCode = detail.locationCode;
-							detail.toLocationCode = "";
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = "";
 							
-							detail.reason = this.reasonCode;
-							subList.push(detail)
+							submitItem.reason = this.reasonCode;
+							submitItem.qty = detail.handleQty!=undefined?detail.handleQty:detail.qty;
+							submitItem.package ="";
+							subList.push(submitItem)
 						}
 					})
 				})
+				
 				this.dataContent.subList =subList
 				this.dataContent.creator = creator;
 				return this.dataContent;
@@ -337,12 +343,13 @@
 				})
 			},
 			clearData(){
-				this.reasonCode = ""
+				this.reasonCode = "";
+				this.fromLocationCode = "";
 				this.reasonText = "";
 				this.detailSource = [];
-				this.subList =[];
-				this.managementList =[];
-				this.dataContent ={}
+				this.subList = [];
+				this.managementList = [];
+				this.dataContent = {}
 			},
 
 			updateData() {