From 420bd4e0100992d33787259e765f434fb6673f72 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 29 Aug 2024 15:15:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 81575e5c..3dd50b9e 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -3,8 +3,8 @@
     "package" : "uni.UNI43932FE",
     "appid" : "__UNI__C9CF4BF",
     "description" : "",
-    "versionName" : "1.0.69",
-    "versionCode" : 69,
+    "versionName" : "1.0.70",
+    "versionCode" : 70,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

From ed5504cbfdbb9b3784b56c2c2403fc6e8472329c Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 29 Aug 2024 18:18:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E6=98=BE=E7=A4=BA=E5=AE=9E=E9=99=85=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemQty.vue               | 9 ++++++++-
 src/mycomponents/record/recordComDetailCard.vue | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index dc9623f7..eb37f9e8 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -6,7 +6,9 @@
 		<view>
 			<balance-qty v-if="isShowBalanceQty" :dataContent="dataContent"></balance-qty>
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
-				:handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack">
+				:handleQty="dataContent.handleQty"
+				:isShowRecommendQty="isShowRecommendQty"
+				 :isShowStatus="false" :isShowStdPack="showStdPack">
 			</compare-qty>
 		</view>
 	</view>
@@ -45,6 +47,11 @@
 				type: Boolean,
 				default: false
 			},
+			isShowRecommendQty: {
+				type: Boolean,
+				default: true
+			},
+			
 		},
 		watch: {
 
diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index a303f0ed..d0144453 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -6,7 +6,9 @@
 					<uni-swipe-action>
 						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
 							<item-qty :dataContent="dataContent" :isShowBalance="true"
-								:isShowBalanceQty="isShowBalanceQty"></item-qty>
+								:isShowBalanceQty="isShowBalanceQty"
+								:isShowRecommendQty="false"
+								></item-qty>
 							<view style="margin-left: 10px; margin-top: 5px;">
 								<pack title='父包装' v-if="dataContent.containerNumber" :packingCode='dataContent.containerNumber'></pack>
 								<location v-if="isShowParentToLocation" title='目标库位'