From 4f628eef9ffce011db9b406e1c6401c0e2b7aff1 Mon Sep 17 00:00:00 2001
From: niexiting <85552560@qq.com>
Date: Mon, 15 Apr 2024 16:03:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/detail/comJobDetailCard.vue |  2 +-
 src/mycomponents/package/packageList.vue     |  1 -
 src/mycomponents/qty/compareQty.vue          |  8 ++++----
 src/mycomponents/qty/recommendQty.vue        | 12 ++++++++----
 src/mycomponents/status/status.vue           |  2 +-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/mycomponents/detail/comJobDetailCard.vue b/src/mycomponents/detail/comJobDetailCard.vue
index e50db619..ee9407fc 100644
--- a/src/mycomponents/detail/comJobDetailCard.vue
+++ b/src/mycomponents/detail/comJobDetailCard.vue
@@ -4,7 +4,7 @@
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
 					<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
-						:isShowPackUnit="false"></itemCompareQty>
+						:isShowPackUnit="true"></itemCompareQty>
 				</template>
 				<package-list :dataContent="dataContent.subList" 
 				:isEdit="settingParam.allowModifyQty=='TRUE'"
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 1f7d0408..7f631f8b 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -1,6 +1,5 @@
 <template>
 	<view class="">
-
 		<view class="" v-for="(item,index) in dataContent" :key="item.id">
 			<uni-collapse ref="collapse2" @change="collapseChange">
 				<uni-collapse-item :disabled="false">
diff --git a/src/mycomponents/qty/compareQty.vue b/src/mycomponents/qty/compareQty.vue
index 2f844585..f4a148eb 100644
--- a/src/mycomponents/qty/compareQty.vue
+++ b/src/mycomponents/qty/compareQty.vue
@@ -1,7 +1,7 @@
 <template>
 	<view>
+		<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 		<view class="uni-flex uni-row ">
-			<status v-show="isShowStatus" :status='dataContent.inventoryStatus'></status>
 			<view class="uni-flex uni-row center">
 				<view v-if="Number(handleQty)!=0">
 					<view v-if="isShowRecommendQty">
@@ -28,13 +28,13 @@
 					</view>
 				</view>
 			</view>
-			<uom   :uom="dataContent.uom">
+			<uom :uom="dataContent.uom">
 			</uom>
 			<!-- <uom v-show="Number(handleQty)!=0||(isShowRecommendQty&&Number(recommendQty)>0)" :uom="dataContent.uom">
 			</uom> -->
 		</view>
 		<view>
-			<pack-unit  v-show="isShowPackUnit"  :dataContent="dataContent"></pack-unit>
+			<pack-unit v-show="isShowPackUnit" :dataContent="dataContent"></pack-unit>
 			<!-- <std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
 	</view>
@@ -106,4 +106,4 @@
 </script>
 
 <style lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue
index 75c952c9..ad328385 100644
--- a/src/mycomponents/qty/recommendQty.vue
+++ b/src/mycomponents/qty/recommendQty.vue
@@ -1,16 +1,20 @@
 <template>
 	<view>
-		<view class="uni-flex uni-row center">
-			<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
+		<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
+
+		<view class="uni-flex uni-row  center">
 			<view class="text_recommend ">
 				{{Number(dataContent.qty)}}
 			</view>
+			<!-- 	/{{Number(dataContent.packQty)}} -->
 			<!-- v-show="!isShowStdPack" -->
 			<uom :uom="dataContent.uom"></uom>
 		</view>
+
 		<view>
+			<!-- {{dataContent}} -->
 			<pack-unit :dataContent="dataContent"></pack-unit>
-		<!-- 	<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
+			<!-- 	<std-pack-qty v-show="isShowStdPack" :dataContent="dataContent"></std-pack-qty> -->
 		</view>
 	</view>
 </template>
@@ -73,4 +77,4 @@
 </script>
 
 <style lang="scss">
-</style>
+</style>
\ No newline at end of file
diff --git a/src/mycomponents/status/status.vue b/src/mycomponents/status/status.vue
index b771d9e5..03cc9cac 100644
--- a/src/mycomponents/status/status.vue
+++ b/src/mycomponents/status/status.vue
@@ -28,7 +28,7 @@
 			},
 			showDesc: {
 				type: Boolean,
-				default: false
+				default: true
 			},
 		},
 		methods: {