From 82f202f5a3a42af65e4a39429c974c095930be23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Tue, 29 Oct 2024 14:10:58 +0800
Subject: [PATCH] =?UTF-8?q?mycomponents/item=20=E6=96=87=E4=BB=B6=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=208/8-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/item/itemCompareQty.vue | 11 +++++++++--
 src/mycomponents/item/itemFilter.vue     |  6 +++++-
 src/mycomponents/item/itemQty.vue        | 11 +++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 33e6a92d..895531d3 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -1,12 +1,15 @@
 <template>
-  <view class="uni-flex uni-row space-between uni-inline-item" style="background-color: #fff">
+  <view class="uni-flex uni-row space-between uni-inline-item" style="margin-left: 10px;">
     <view>
       <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; 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>
       <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" :handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit"> </compare-qty>
     </view>
+    <view class="text_packQty"  style="margin-top: 5rpx; margin-right: 20rpx;" v-if="isShowPackCount" >
+      {{dataContent.fromPackCount}}/{{dataContent.toPackCount}}
+    </view>
   </view>
 </template>
 <script setup lang="ts">
@@ -36,6 +39,10 @@ const props = defineProps({
   objTextStyle: {
     type: Object,
     default: null
+  },
+  isShowPackCount: {
+    type: Boolean,
+    default: false
   }
 })
 </script>
diff --git a/src/mycomponents/item/itemFilter.vue b/src/mycomponents/item/itemFilter.vue
index e508acff..ecaa8d31 100644
--- a/src/mycomponents/item/itemFilter.vue
+++ b/src/mycomponents/item/itemFilter.vue
@@ -6,7 +6,7 @@
 
       <view class="uni-flex" style="flex-direction: column; width: 100%; margin-top: 10rpx">
         <view class="" style="font-size: 35rpx; margin-bottom: 10rpx"> 库位 </view>
-        <u-input style="margin-left: 0rpx" confirmType="search" v-model="locationCode" :border="true" placeholder="请输入库位" :focus="true" />
+        <uni-easyinput v-model="locationCode" placeholder="请输入库位"></uni-easyinput>
       </view>
       <view class="" style="font-size: 35rpx; margin-top: 10rpx; margin-bottom: 10rpx">
         库存状态 :
@@ -104,6 +104,10 @@ const confirm = () => {
   emit('onConfirmClick', locationCode.value, state.value)
   closeScanPopup()
 }
+const clearData = ()=>{
+  locationCode.value = ''
+  state.value = []
+}
 // 传递给父类
 const emit = defineEmits(['onConfirmClick', 'switchChangeToday'])
 </script>
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index 9eb9e54e..3644adea 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -5,7 +5,10 @@
     </view>
     <view>
       <balance-qty v-if="isShowBalanceQty" :dataContent="dataContent"></balance-qty>
-      <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" :handleQty="dataContent.handleQty" :isShowStatus="false" :isShowStdPack="showStdPack"> </compare-qty>
+      <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
+                   :handleQty="dataContent.handleQty" :isShowRecommendQty="isShowRecommendQty"
+                   :isShowStatus="false" :isShowStdPack="showStdPack">
+      </compare-qty>
     </view>
   </view>
 </template>
@@ -30,7 +33,11 @@ const props = defineProps({
   showStdPack: {
     type: Boolean,
     default: false
-  }
+  },
+  isShowRecommendQty: {
+    type: Boolean,
+    default: true
+  },
 })
 </script>