From cc3a2d8878d4ccb286b8d1db2ccaedeba8cfa65d 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:27:09 +0800
Subject: [PATCH] =?UTF-8?q?mycomponents/package=20=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB=208/8-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/package/PackageAndItemCard.vue |  2 +-
 src/mycomponents/package/packageCard.vue        |  2 +-
 src/mycomponents/package/packageList.vue        | 10 ++++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/mycomponents/package/PackageAndItemCard.vue b/src/mycomponents/package/PackageAndItemCard.vue
index 41271206..63bd3741 100644
--- a/src/mycomponents/package/PackageAndItemCard.vue
+++ b/src/mycomponents/package/PackageAndItemCard.vue
@@ -3,7 +3,7 @@
     <view class="uni-flex uni-row space-between" style="align-items: center">
       <view style="word-break: break-all">
         <item :dataContent="dataContent" style="margin-left: 4px; padding: 0px 5px 5px"></item>
-        <pack v-if="dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"></pack>
+        <pack v-if="dataContent.packingNumber" :packingCode="dataContent.packingNumber"></pack>
         <batch v-if="dataContent.batch != null" :batch="dataContent.batch"></batch>
         <location v-if="dataContent.locationCode != null" :locationCode="dataContent.locationCode"></location>
       </view>
diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue
index 649ffcc5..5ff8a7f1 100644
--- a/src/mycomponents/package/packageCard.vue
+++ b/src/mycomponents/package/packageCard.vue
@@ -6,7 +6,7 @@
       <view style="word-break: break-all">
         <!-- 	<container v-if="isShowContainer&&dataContent.containerNumber!=null" :container="dataContent.containerNumber">
 				</container> -->
-        <pack v-if="isShowPack && dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"> </pack>
+        <pack v-if="isShowPack && dataContent.packingNumber" :packingCode="dataContent.packingNumber"> </pack>
         <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
         <location v-if="isShowFromLocation" title="来源库位" :locationCode="dataContent.fromLocationCode"> </location>
         <!-- 	<to-location></to-location> -->
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 6bbc8601..89b70949 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -5,7 +5,10 @@
         <u-collapse-item :disabled="false" @change="collapseChange">
           <template v-slot:title>
             <u-swipe-action :options="item.scaned && isEdit ? editAndRemoveOptions : item.scaned ? removeOptions : options" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, cur, 'parent')">
-              <package-card :dataContent="item" :isShowLocation="false" :isShowFromLocation="isShowFromLocation" :isShowStatus="isShowStatus"></package-card>
+              <package-card :dataContent="item" :isShowLocation="false"
+                            :isShowFromLocation="isShowFromLocation"
+                            :isShowStatus="isShowStatus" :isShowStatus="isShowPackListStatus">
+              </package-card>
             </u-swipe-action>
           </template>
           <u-swipe-action :show="item.show" :index="index" v-for="(cur, key) in item.packList" :key="index" :options="cur.scaned && isEdit ? editAndRemoveOptions : cur.scaned ? removeOptions : options" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, cur, 'child')">
@@ -66,7 +69,10 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
-
+  isShowPackListStatus: {
+    type: Boolean,
+    default: true
+  },
   locationTitle: {
     type: String,
     default: '库位'