From 16be3ee0238ebdff802047526f6de8a3d674267e Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 2 Sep 2024 08:47:37 +0800
Subject: [PATCH] =?UTF-8?q?HL-5168=20=E4=BF=AE=E6=94=B9=E7=BF=BB=E5=8C=85?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=98=BE=E7=A4=BA=E7=AE=B1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemCompareQty.vue      | 10 +++++++++-
 src/mycomponents/job/jobComMainDetailCard.vue |  9 +++++++--
 src/pages/package/coms/comOverPackJobCard.vue | 10 +++++++---
 src/pages/package/job/overPackageJob.vue      |  7 +++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index b735a0df..d2f8922b 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -3,13 +3,17 @@
 		<view style="flex: 1;">
 			<item :dataContent="dataContent"></item>
 		</view>
-		<view style="width: 40%;display: flex;justify-content:flex-end;margin-right: 10rpx;word-break:break-word">
+		<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>
 				<!-- :objTextStyle='objTextStyle' -->
 			<compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
 				:handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit">
 			</compare-qty>
+			<view class="text_packQty"  style="margin-top: 5rpx; margin-right: 20rpx;" v-if="isShowPackCount" >
+				{{dataContent.fromPackCount}}/{{dataContent.toPackCount}}
+			</view>
+			
 		</view>
 	</view>
 </template>
@@ -53,6 +57,10 @@
 			objTextStyle: {
 				type: Object,
 				default: null
+			},
+			isShowPackCount: {
+				type: Boolean,
+				default: false
 			}
 		},
 		watch: {
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index b9e768db..29de7bb7 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -2,7 +2,9 @@
 	<view class="task_item">
 		<view class="task_text" style="border-top: 1px solid #dedede;padding-top: 20rpx;margin-top: 20rpx;">
 			<!-- 主子表拆分，没有数量了 -->
-			<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"
+			<itemCompareQty :dataContent="dataContent" 
+			:isShowPackCount="isShowPackCount"
+			:handleQty="dataContent.handleQty" :isShowPackUnit="false"
 				></itemCompareQty>
 				<!-- :objTextStyle="{'fontWeight':'bold','fontSize':'40rpx'}" -->
 			<div class="u-p-l-10">
@@ -15,7 +17,6 @@
 					<level  title="优先级" :priority="dataContent.priority" v-if="dataContent.priority !== '' && dataContent.priority !== undefined  && dataContent.priority !== null ">
 					</level>
 				</view>
-				
 				<to-location v-if="isShowToLocation" title="目标库位" :locationCode="dataContent.toLocationCode||dataContent.locationCode">
 				</to-location>
 			
@@ -74,6 +75,10 @@
 				type: Boolean,
 				default: false
 			},
+			isShowPackCount: {
+				type: Boolean,
+				default: false
+			}
 		},
 
 
diff --git a/src/pages/package/coms/comOverPackJobCard.vue b/src/pages/package/coms/comOverPackJobCard.vue
index 5f8658fa..97217fae 100644
--- a/src/pages/package/coms/comOverPackJobCard.vue
+++ b/src/pages/package/coms/comOverPackJobCard.vue
@@ -1,9 +1,12 @@
 <template>
  	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard  :dataContent="dataContent" :isShowPackCount="true"></jobComMainDetailCard>
+		
 		<view class='split_line' v-show="dataContent.acceptUserName"></view>
+			
 		<jobAccept :dataContent="dataContent" v-show="dataContent.acceptUserName"></jobAccept>
  	</job-com-main-card>
+	
  </template>
 
  <script>
@@ -17,7 +20,8 @@
 			jobAccept
  		},
  		data() {
- 			return {};
+ 			return {
+			};
  		},
 
  		props: {
@@ -28,7 +32,7 @@
  		},
 
  		methods: {
-
+			
  		}
  	}
  </script>
diff --git a/src/pages/package/job/overPackageJob.vue b/src/pages/package/job/overPackageJob.vue
index f6a74d88..4dc05588 100644
--- a/src/pages/package/job/overPackageJob.vue
+++ b/src/pages/package/job/overPackageJob.vue
@@ -243,9 +243,16 @@
 						this.loadingType = "nomore";
 						return;
 					}
+					if(list&&list.length>0){
+						list.forEach(item=>{
+							item.fromPackCount=Math.ceil(item.qty/item.fromPackQty)
+							item.toPackCount= Math.ceil(item.qty/item.toPackQty)  
+						})
+					}
 					this.jobList = type === "refresh" ? list : this.jobList.concat(list);
 					this.pageNo++;
 					updateTitle(this.title+"(" + this.totalCount + ")");
+					
 
 				}).catch(error => {
 					if (type === "refresh") {