From 68e980ba917e5fb2d47dfc315898b9b427c04354 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 12 Nov 2024 16:23:51 +0800
Subject: [PATCH] =?UTF-8?q?YT-835PDA=E9=A2=84=E7=94=9F=E4=BA=A7=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E4=BB=BB=E5=8A=A1=E6=89=AB=E6=8F=8F=E5=90=8E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=95=B0=E9=87=8F=E4=B8=8D=E5=BA=94=E8=AF=A5=E6=9C=89?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=95=B0=E9=87=8F=E7=9A=84=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/customerReturn/job/returnDetail.vue              | 6 +++---
 .../productReceipt/coms/comProductDetailCardBatch.vue      | 7 +++++--
 src/pages/productReceipt/job/productReceiptDetail.vue      | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/customerReturn/job/returnDetail.vue b/src/pages/customerReturn/job/returnDetail.vue
index 88d360ad..d06e96be 100644
--- a/src/pages/customerReturn/job/returnDetail.vue
+++ b/src/pages/customerReturn/job/returnDetail.vue
@@ -16,15 +16,15 @@
 			<scroll-view scroll-y="true" class="page-main-scroll">
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
-						<comDetailCardBatch :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
+					<!-- 	<comDetailCardBatch :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
 							:locationAreaTypeList="toLocationAreaTypeList" v-if="managementType=='BY_BATCH'">
-						</comDetailCardBatch>
+						</comDetailCardBatch> -->
 						<comLableDetailCard  :dataContent="item" :settingParam="jobContent" 
 						:isShowStatus="false"
 						:isShowLocation="false"
 							@remove="updateData" @updateData="updateData" @openDetail="openDetail"
-							:locationAreaTypeList="toLocationAreaTypeList" v-else>
+							:locationAreaTypeList="toLocationAreaTypeList" >
 						</comLableDetailCard >
 					</view>
 				</view>
diff --git a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
index 2617a1f9..3a21ce92 100644
--- a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
+++ b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
@@ -22,7 +22,7 @@
 			</uni-collapse-item>
 		</uni-collapse>
 
-		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm">
+		<recommend-qty-edit ref="receiptEdit" :dataContent="editItem" :settingParam="settingParam" @confirm="confirm" :isNumTips='isNumTips'>
 		</recommend-qty-edit>
 		<win-scan-location ref="scanLocationCode" title="目标库位" @getLocation='getLocation'
 			:locationAreaTypeList="locationAreaTypeList"></win-scan-location>
@@ -68,7 +68,10 @@
 				type: Array,
 				default: null
 			},
-
+			isNumTips: {
+				type: Boolean,
+				default: true
+			},
 
 		},
 		watch: {
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index de94cb2b..389f8a33 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -42,7 +42,7 @@
 				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
 					<view class="">
 						<comProductDetailCardBatch :dataContent="item" :settingParam="jobContent" :isShowLocation="false"
-							@remove="updateData" @updateData="updateData"
+							@remove="updateData" @updateData="updateData" :isNumTips='false'
 							:locationAreaTypeList='toLocationAreaTypeList' v-if="managementType=='BY_BATCH'">
 						</comProductDetailCardBatch>
 						<comProductDetailCard :dataContent="item" :settingParam="jobContent" :isShowLocation="false"