From e9383b708494bcfa315834a30cb42c66981f7b10 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 16 Dec 2024 13:24:53 +0800
Subject: [PATCH] =?UTF-8?q?YT-1715=E9=99=A4=E6=9D=A5=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E4=BB=BB=E5=8A=A1=EF=BC=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?pda=E6=A0=B7=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E5=92=8C=E4=B9=8B=E5=89=8D=E6=A0=B7=E5=BC=8F=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemCompareQty.vue                  | 8 ++++++--
 src/mycomponents/job/jobComMainDetailCard.vue             | 7 ++++++-
 src/mycomponents/qty/recommendHandleQty.vue               | 8 ++++++--
 .../purchaseReceipt/coms/comReceiptDetailCardBacth.vue    | 6 +++++-
 src/pages/purchaseReceipt/coms/comReceiptJobCard.vue      | 6 +++++-
 src/pages/purchaseReceipt/job/receiptDetail.vue           | 2 +-
 src/pages/purchaseReceipt/job/receiptJob.vue              | 3 +--
 7 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 7c97325f..a4d55922 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -4,7 +4,7 @@
 			<item :dataContent="dataContent"></item>
 		</view>
 		<view style="width: 40%;display: flex; flex-direction: column; align-items: flex-end; justify-content:flex-end;margin-right: 10rpx;word-break:break-word; ">
-			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"
+			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"  :isShowSupplierQty='isShowSupplierQty'
 				></recommend-qty>
 				<!-- :objTextStyle='objTextStyle' -->
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
@@ -61,7 +61,11 @@
 			isShowPackCount: {
 				type: Boolean,
 				default: false
-			}
+			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
 		},
 		watch: {
 
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index e2018ee0..41c48f9e 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -5,6 +5,7 @@
 			<itemCompareQty :dataContent="dataContent" 
 			:isShowPackCount="isShowPackCount"
 			:handleQty="dataContent.handleQty" :isShowPackUnit="false"
+			:isShowSupplierQty='isShowSupplierQty'
 				></itemCompareQty>
 				<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
 			<div class="u-p-l-10">
@@ -78,7 +79,11 @@
 			isShowPackCount: {
 				type: Boolean,
 				default: false
-			}
+			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
 		},
 
 
diff --git a/src/mycomponents/qty/recommendHandleQty.vue b/src/mycomponents/qty/recommendHandleQty.vue
index 6ae0e8aa..b6ff4c3d 100644
--- a/src/mycomponents/qty/recommendHandleQty.vue
+++ b/src/mycomponents/qty/recommendHandleQty.vue
@@ -10,7 +10,7 @@
 				{{Number(dataContent.qty)}}
 			</view>
 			<uom :uom="dataContent.uom"></uom>
-			<view  class="uni-flex uni-row  center" v-if="dataContent.uom != dataContent.supplierUom">
+			<view  class="uni-flex uni-row  center" v-if="dataContent.uom != dataContent.supplierUom && isShowSupplierQty">
 				<span class="uom">|</span>
 				<view class="text_recommend " style="font-size: 30rpx;margin-left: 12rpx;">
 					{{Number(dataContent.supplierQty) || 0}}
@@ -85,7 +85,11 @@
 			isShowCount: {
 				type: Boolean,
 				default: true
-			}
+			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
 		},
 		watch: {
 
diff --git a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
index 2c2a63e1..e7cf690c 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue
@@ -7,7 +7,7 @@
 						<uni-swipe-action-item :right-options="dataContent.handleQty>0? removeOptions:options"
 							@click="swipeClick($event,dataContent)">
 							<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
-								:isShowPackUnit="false"></itemCompareQty>
+								:isShowPackUnit="false"  :isShowSupplierQty='isShowSupplierQty'></itemCompareQty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
@@ -72,6 +72,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
 
 		},
 		watch: {
diff --git a/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue b/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
index 6f4e1daf..82588dbd 100644
--- a/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
+++ b/src/pages/purchaseReceipt/coms/comReceiptJobCard.vue
@@ -1,6 +1,6 @@
 <template>
 	<jobComMainCardAsn :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard  :dataContent="dataContent" :isShowSupplierQty='isShowSupplierQty'></jobComMainDetailCard>
 	</jobComMainCardAsn>
 </template>
 
@@ -21,6 +21,10 @@
 				type: Object,
 				default: {}
 			},
+			isShowSupplierQty: {
+				type: Boolean,
+				default: false
+			},
 		},
 
 		methods: {
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index 96b3ca5a..3a69bf99 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.vue
@@ -34,7 +34,7 @@
 						<!-- 管理精度是批次 -->
 						<comReceiptDetailCardBacth ref='comReceiptDetailCardBacthRef' :dataContent="item" :index="index" :settingParam="jobContent"
 							@remove="updateData" @updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList'
-							v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'"  :isNumPackTips='true'>
+							v-if="managementType == 'BY_BATCH' || managementType =='BY_QUANTITY'"  :isNumPackTips='true'  :isShowSupplierQty='true'>
 						</comReceiptDetailCardBacth>
 						<com-receipt-detail-card :dataContent="item" :index="index" :settingParam="jobContent" @remove="updateData"
 							@updateData="updateData" :locationAreaTypeList='toLocationAreaTypeList' v-else>
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 11fb464a..4b795b19 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -10,7 +10,7 @@
 				<view v-for="(item, index) in jobList" :key="index">
 					<uni-swipe-action-item :right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
-						<com-receipt-job-card :dataContent="item" @click='openJobDetail(item)'></com-receipt-job-card>
+						<com-receipt-job-card :dataContent="item" @click='openJobDetail(item)'  :isShowSupplierQty='true'></com-receipt-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>
@@ -222,7 +222,6 @@
 					if (type === "refresh") {
 						uni.stopPullDownRefresh();
 					}
-
 					var list = res.data.list;
 					this.totalCount = res.data.total
 					updateTitle(this.title + "(" + this.totalCount + ")");