From 9fc1882e5ad74a4a1b2bccc2ac05e956f544ba30 Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 7 Apr 2025 16:58:27 +0800
Subject: [PATCH] =?UTF-8?q?YT-2348PDA=E7=9B=B4=E6=8E=A5=E7=BF=BB=E5=8C=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=AF=8F=E5=8C=85=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8DYT-2344PDA=E7=9B=B4=E6=8E=A5=E7=BF=BB=E5=8C=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8C=85=E8=A3=85=E4=B8=AA=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?YT-2352PDA=E3=80=8A=E7=9B=B4=E6=8E=A5=E5=8F=91=E6=96=99?=
 =?UTF-8?q?=E3=80=8B=E6=89=AB=E6=8F=8F=E7=AE=B1=E7=A0=81=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=BA=86=E7=BF=BB=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../record/recordComDetailCard.vue            | 27 ++++++++++++-------
 .../package/record/overPackageRecord.vue      |  2 +-
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index e992e66d..d44f684a 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -30,13 +30,16 @@
 								 :isShowFromLocation="isShowFromLocation"
 								:isShowToLocation="isShowToLocation" :isShowParentPack="isShowParentPack" >
 							</balance>
-							<view class="flex u-m-t-20 align-center">
-								<view>每包数量：</view>
-								<u-number-box v-model="detail.flippedNumber" :min='1' :max='9999' @change="valChange($event,detail)"></u-number-box>
-							</view>
-							<view class="flex u-m-t-20 align-center">
-								<view>包装数量：</view>
-								<view>{{detail.everyPackageQty}}</view>
+							<view class="" v-if="isOverPackageRecord">
+								<view class="flex u-m-t-20 align-center">
+									<view>每包数量：</view>
+									<u-number-box v-model="detail.flippedNumber" :min='1' :max='9999' @change="valChange($event,detail)"></u-number-box>
+									<uom :uom="detail.uom"></uom>
+								</view>
+								<view class="flex u-m-t-20 align-center">
+									<view>包装个数：</view>
+									<view>{{detail.everyPackageQty}}</view>
+								</view>
 							</view>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
@@ -61,6 +64,7 @@
 	import recordDetailPopup from '@/mycomponents/detail/recordDetailPopup.vue'
 	import pack from '@/mycomponents/balance/pack.vue'
 	import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
+	import uom from '@/mycomponents/qty/uom.vue'
 
 	import {
 		getDetailOption,
@@ -80,7 +84,8 @@
 			location,
 			recordDetailPopup,
 			pack,
-			PackageAndItemCard
+			PackageAndItemCard,
+			uom
 			// winListHint
 		},
 		props: {
@@ -159,7 +164,11 @@
 				type: Boolean,
 				default: true
 			},
-			
+			// 是否是翻包进入
+			isOverPackageRecord: {
+				type: Boolean,
+				default: false
+			},
 		},
 		watch: {
 
diff --git a/src/pages/package/record/overPackageRecord.vue b/src/pages/package/record/overPackageRecord.vue
index 80070f10..ea17a156 100644
--- a/src/pages/package/record/overPackageRecord.vue
+++ b/src/pages/package/record/overPackageRecord.vue
@@ -31,7 +31,7 @@
 							<record-com-detail-card :dataContent="item" :index="index"
 								@removeItem="removeItem(index,item)" @updateData="updateData" @removePack="removePack"
 								:isShowFromLocation="false" :isShowToLocation="false" :isSpecial='true' 
-								:isShowNumView='false' :isShowParentToLocation='false' :isShowStatus='false'>
+								:isShowNumView='false' :isShowParentToLocation='false' :isShowStatus='false' :isOverPackageRecord='true'>
 							</record-com-detail-card>
 						</view>
 						<view class='split_line'></view>