From 12e09e3e492bba0b021cbc6302e05f4a190c02df Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 11 Jan 2024 15:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E9=80=80?=
 =?UTF-8?q?=E6=96=99=E8=AF=A6=E7=BB=86=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/item/itemCompareQty.vue               |  4 ++--
 mycomponents/recommend/recommend.vue               |  8 +++++---
 pages.json                                         |  2 +-
 .../productionReturn/coms/comReturnDetailCard.vue  | 14 +++++++++++++-
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/mycomponents/item/itemCompareQty.vue b/mycomponents/item/itemCompareQty.vue
index 2d1ccef2..c570dcdf 100644
--- a/mycomponents/item/itemCompareQty.vue
+++ b/mycomponents/item/itemCompareQty.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="uni-flex uni-row space-between uni-inline-item" style="background-color:#fff;">
-		<view>
+		<view style="word-break: break-all;width: 50%;">
 			<item :dataContent="dataContent"></item>
 		</view>
-		<view>
+		<view style="word-break: break-all;width: 50%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
 			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack ="isShowStdPack"></recommend-qty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="Number(handleQty)" :isShowStatus="false"
diff --git a/mycomponents/recommend/recommend.vue b/mycomponents/recommend/recommend.vue
index 0efadef8..74863945 100644
--- a/mycomponents/recommend/recommend.vue
+++ b/mycomponents/recommend/recommend.vue
@@ -2,7 +2,7 @@
 	<view :class="detail.scaned?'scan_view':''" style="background-color: #ffffff; border-bottom: 1upx solid #EEEEEE;">
 		<view class="uni-flex uni-row space-between" style="align-items: center">
 			<!-- uni-inline-item 暂时拿掉-->
-			<view>
+			<view style="word-break: break-all;width: 50%;">
 				<pack v-if="isShowPack" :packingCode="detail.packingNumber"></pack>
 				<batch v-if="isShowBatch" :batch="detail.batch"></batch>
 				<location v-if="isShowFromLocation" title="来源库位" :locationCode="detail.fromLocationCode">
@@ -11,15 +11,17 @@
 				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="detail.toLocationCode">
 				</to-location>
 			</view>
-			<view>
+			<view style="word-break: break-all;">
 				<!-- ||detail.handleQty==0 可能会有扫描到0的情况-->
+
 				<recommend-qty v-if="detail.handleQty==null || detail.handleQty==undefined" :dataContent="detail"
 					:isShowStdPack="false" :isShowStatus="isShowStatus"></recommend-qty>
 				<compare-qty v-else :dataContent="detail" :recommendQty="Number(detail.qty)"
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
 
-				<view class="uni-flex uni-row" style="vertical-align:center" v-if="isDevlement()">
+
+				<view class="uni-flex uni-row center" style="vertical-align:center ;" v-if="isDevlement()">
 					<text style="font-size: 30rpx;color: #2979ff; " @click="copy">复制采购</text>
 					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
 				</view>
diff --git a/pages.json b/pages.json
index 51c6e84b..859ab9f7 100644
--- a/pages.json
+++ b/pages.json
@@ -299,7 +299,7 @@
 		{
 			"path": "pages/putaway/record/putawayRecord",
 			"style": {
-				"navigationBarTitleText": "原料上架",
+				"navigationBarTitleText": "原料上架记录",
 				"enablePullDownRefresh": false
 			}
 		},
diff --git a/pages/productionReturn/coms/comReturnDetailCard.vue b/pages/productionReturn/coms/comReturnDetailCard.vue
index 1aff431e..205747fc 100644
--- a/pages/productionReturn/coms/comReturnDetailCard.vue
+++ b/pages/productionReturn/coms/comReturnDetailCard.vue
@@ -69,7 +69,19 @@
 			
 		},
 		watch: {
-
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 
 		data() {