From 9d0fcc427dd83b4fcbc812b845b14b91e17872f0 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Thu, 18 Jul 2024 13:13:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/style/new_style.css                | 20 +++++++++++++------
 src/mycomponents/item/itemCompareQty.vue      |  5 +++--
 src/mycomponents/job/jobComMainDetailCard.vue |  4 ++--
 src/mycomponents/qty/recommendQty.vue         | 14 +++++++++----
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 86421cce..50cf4480 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2082,19 +2082,19 @@ button::after {
 .card_packing_code {
 	color: #3315EB;
 	padding: 5px;
-	font-size: 35rpx;
+	font-size: 30rpx;
 }
 
 .card_batch {
 	color: #9747FF;
 	padding: 5px;
-	font-size: 35rpx;
+	font-size: 30rpx;
 }
 
 .card_container {
 	color: #0076F6;
 	padding: 5px;
-	font-size: 35rpx;
+	font-size: 30rpx;
 }
 
 
@@ -2118,13 +2118,13 @@ button::after {
 .card_location {
 	color: #DA8910;
 	padding: 5px;
-	font-size: 35rpx;
+	font-size: 30rpx;
 }
 
 .card_to_location {
 	color: #329362;
 	padding: 5px;
-	font-size: 35rpx;
+	font-size: 30rpx;
 }
 
 .card_location_content {
@@ -2480,9 +2480,17 @@ button[disabled] {
 
 .text_recommend {
 	color: #0A84FF;
-	font-size: 38rpx;
+	font-size: 34rpx;
+	font-weight: bold;
 }
 
+.text_packQty {
+	color: #3315EB;
+	font-size: 40rpx;
+	font-weight: bold;
+}
+
+
 .text_balance {
 	font-size: 36rpx;
 }
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 560137b4..50d5220d 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -3,9 +3,10 @@
 		<view>
 			<item :dataContent="dataContent"></item>
 		</view>
-		<view style="width: 30%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
+		<view style="width: 40%;display: flex;justify-content:flex-end;margin-right: 10rpx;">
 			<recommend-qty v-if="handleQty==0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"
-				:objTextStyle='objTextStyle'></recommend-qty>
+				></recommend-qty>
+				<!-- :objTextStyle='objTextStyle' -->
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit">
 			</compare-qty>
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 20776860..b37077f0 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -3,9 +3,9 @@
 		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;">
 			<!-- 主子表拆分，没有数量了 -->
 			<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
-				:objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}"></itemCompareQty>
+				></itemCompareQty>
+				<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
 			<div class="u-p-l-10">
-				
 				<pack v-if="isShowPack && dataContent.packingNumber!=null" :packingCode="dataContent.packingNumber">
 				</pack>
 				<batch v-if="isShowBatch && dataContent.batch!=null" :batch="dataContent.batch"></batch>
diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue
index c96707ac..394a3799 100644
--- a/src/mycomponents/qty/recommendQty.vue
+++ b/src/mycomponents/qty/recommendQty.vue
@@ -3,16 +3,20 @@
 		<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
 
 		<view class="uni-flex uni-row  center">
-			<view class="text_recommend " :style='objTextStyle'>
+			<view class="text_recommend ">
 				{{Number(dataContent.qty)}}
 			</view>
 			<!-- 	/{{Number(dataContent.packQty)}} -->
 			<!-- v-show="!isShowStdPack" -->
 			<uom :uom="dataContent.uom"></uom>
+			<view v-if="dataContent.packQty!=undefined" class="uni-flex uni-row ">
+				<view  class="uom">/</view>
+				<view class="text_packQty">{{ calc(dataContent.qty,dataContent.packQty)}}
+				</view>
+			</view>
 		</view>
 
 		<view>
-			<!-- {{dataContent}} -->
 			<pack-unit :dataContent="dataContent"></pack-unit>
 			<!-- 	<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
@@ -66,7 +70,7 @@
 				type: Boolean,
 				default: true
 			},
-			objTextStyle:{
+			objTextStyle: {
 				type: Object,
 				default: null
 			}
@@ -75,7 +79,9 @@
 
 		},
 		methods: {
-
+			calc(qty, packQty) {
+				return Math.ceil(Number(qty) / Number(packQty));
+			}
 		},
 	}
 </script>