From 330c94e9f90552529a397301770c856b598e4643 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 25 Jan 2024 10:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7=E9=80=80?=
 =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E4=BF=AE=E6=94=B9=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../request/customerReturnRequestCreate.vue   | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/pages/customerReturn/request/customerReturnRequestCreate.vue b/pages/customerReturn/request/customerReturnRequestCreate.vue
index 656f5e88..6a46fa16 100644
--- a/pages/customerReturn/request/customerReturnRequestCreate.vue
+++ b/pages/customerReturn/request/customerReturnRequestCreate.vue
@@ -17,14 +17,12 @@
 
 			<view class="page-main">
 
-
 				<scroll-view scroll-y="true" class="page-main-scroll">
 					<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 						<view class="">
 							<record-com-detail-card :dataContent="item" :index="index" :isShowLocation="true"
-								:isShowBalanceQty ="false"
-								:isShowToLocation="false" @removeItem="removeItem(index,item)" @updateData="updateData"
-								@removePack="removePack">
+								:isShowBalanceQty="false" :isShowToLocation="false" @removeItem="removeItem(index,item)"
+								@updateData="updateData" @removePack="removePack">
 							</record-com-detail-card>
 						</view>
 					</view>
@@ -57,7 +55,9 @@
 </template>
 
 <script>
-	import { calc } from '@/common/calc'
+	import {
+		calc
+	} from '@/common/calc'
 	import {
 		customerReturnRequestSubmit,
 		getBasicCustomerList
@@ -73,6 +73,7 @@
 	import {
 		goHome,
 		updateTitle,
+		deepCopyData,
 		getPackingNumberAndBatchByList
 	} from '@/common/basic.js';
 
@@ -330,40 +331,47 @@
 			setParams() {
 				var subList = []
 				var creator = this.$store.state.user.id
-				this.dataContent.subList = subList;
-				this.dataContent.creator = creator;
-				this.dataContent.customerCode = 'CF';
-				this.dataContent.fromWarehouseCode = this.fromLocation.warehouseCode;
-				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+
 
 				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;
-							detail.toInventoryStatus = 'HOLD';
+							submitItem.inventoryStatus = detail.inventoryStatus;
+							submitItem.toInventoryStatus = 'HOLD';
 
-							detail.fromPackingNumber = detail.packingNumber;
-							detail.toPackingNumber = detail.packingNumber;
+							submitItem.fromPackingNumber = detail.packingNumber;
+							submitItem.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 = 'HOLD';
+							submitItem.qty = detail.handleQty;
 
-							subList.push(detail)
+							submitItem.fromLocationCode = detail.locationCode;
+							submitItem.toLocationCode = 'HOLD';
+
+							submitItem.package = ""
+
+							subList.push(submitItem)
 						}
 					})
 				})
 
+				this.dataContent.subList = subList;
+				this.dataContent.creator = creator;
+				this.dataContent.customerCode = 'CF';
+				this.dataContent.fromWarehouseCode = this.fromLocation.warehouseCode;
+				this.dataContent.toWarehouseCode = this.toWarehouseCode;
+
 				return this.dataContent;
 			},