From f2554409ab939b9e790ec98d6fc9b4d3192a80a5 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 26 Sep 2024 17:11:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90=E5=93=81=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=9B=AE=E6=A0=87=E5=BA=93=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/customerReturn/job/returnJob.vue | 1 +
 src/pages/deliver/job/deliverDetail.vue    | 9 ++++++---
 src/pages/scrap/record/scrapRecord.vue     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/customerReturn/job/returnJob.vue b/src/pages/customerReturn/job/returnJob.vue
index c1ed7c28..c562ee51 100644
--- a/src/pages/customerReturn/job/returnJob.vue
+++ b/src/pages/customerReturn/job/returnJob.vue
@@ -153,6 +153,7 @@
 					filters: filters,
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
+					sorts:[{sort:"id",by:"DESC"}]
 				}
 				getCustomerReturnJobList(params).then(res => {
 					uni.hideLoading();
diff --git a/src/pages/deliver/job/deliverDetail.vue b/src/pages/deliver/job/deliverDetail.vue
index d96d1783..c43b5792 100644
--- a/src/pages/deliver/job/deliverDetail.vue
+++ b/src/pages/deliver/job/deliverDetail.vue
@@ -75,6 +75,7 @@
 		getRemoveOption,
 		getCurrDateTime,
 		getPackingNumberAndBatch,
+		deepCopyData
 	} from '@/common/basic.js';
 
 	import {
@@ -347,8 +348,9 @@
 											.ContainerNumber;
 										record.toInventoryStatus = r
 											.inventoryStatus;
-										record.toLocationCode = subItem
-											.toLocationCode;
+										// record.toLocationCode = subItem
+										// 	.toLocationCode;
+										record.toLocationCode = this.toLocationCode;
 										record.supplierCode = r.supplierCode;
 
 										//使用在途库不改变管理模式
@@ -369,9 +371,10 @@
 										}
 										record.fromParentPackingNumber = r
 											.parentPackingNumber;
+										subItem.toLocationCode = this.toLocationCode
 										subItem.recordList.push(record);
 									})
-									subList.push(subItem);
+									subList.push(deepCopyData(subItem));
 								}
 							})
 						})
diff --git a/src/pages/scrap/record/scrapRecord.vue b/src/pages/scrap/record/scrapRecord.vue
index d515c83f..a5b8f7c9 100644
--- a/src/pages/scrap/record/scrapRecord.vue
+++ b/src/pages/scrap/record/scrapRecord.vue
@@ -9,7 +9,7 @@
 					报废原因 :
 				</view>
 				<view class=""  style="width: 75%;">
-					<uni-easyinput v-if="detailSource.length>0"  v-model="reasonText" placeholder="请输入报废原因"></uni-easyinput>
+					<uni-easyinput v-if="detailSource.length>0"  v-model="reasonText" placeholder="请输入报废原因" maxlength='24'></uni-easyinput>
 				</view>
 			</view>
 			<view class='split_line'></view>