From 4920e82c6da3f7dccca9de4966178c76d17d7248 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:40:39 +0800
Subject: [PATCH] =?UTF-8?q?mycomponents/record=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

---
 .../record/recordComDetailCard.vue            | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/mycomponents/record/recordComDetailCard.vue b/src/mycomponents/record/recordComDetailCard.vue
index be1e5786..4acf9e97 100644
--- a/src/mycomponents/record/recordComDetailCard.vue
+++ b/src/mycomponents/record/recordComDetailCard.vue
@@ -4,15 +4,20 @@
       <u-collapse-item :open="true">
         <template v-slot:title>
           <u-swipe-action :show="false" style="width: 90%" :options="removeOptions" bg-color="rgba(255,255,255,0)" @click="(...event) => removeItem(event, dataContent)">
-            <item-qty :dataContent="dataContent" :isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"></item-qty>
+            <item-qty :dataContent="dataContent" :isShowBalance="true"
+                      :isShowBalanceQty="isShowBalanceQty" :isShowRecommendQty="false">
+            </item-qty>
             <view style="margin-left: 10px; margin-top: 5px;">
-              <pack title='父包装' :packingCode='dataContent.containerNumber'></pack>
+              <pack title='父包装' v-if="dataContent.containerNumber" :packingCode='dataContent.containerNumber'></pack>
               <location v-if="isShowParentToLocation" title='目标库位' :locationCode='dataContent.toLocationCode'></location>
             </view>
           </u-swipe-action>
         </template>
         <u-swipe-action :show="detail.show" :index="index" v-for="(detail, index) in dataContent.subList" :key="index" :options="detail.scaned ? scanOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="(...event) => swipeClick(event, detail)">
-          <balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="isShowStatus" :isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation"> </balance>
+          <balance :dataContent="detail" :isShowStdPack="false"
+                   :isShowStatus="isShowStatus" :isShowPack="true"
+                   :isShowFromLocation="isShowFromLocation"  :isShowParentPack="isShowParentPack"
+                   :isShowToLocation="isShowToLocation"> </balance>
         </u-swipe-action>
       </u-collapse-item>
     </u-collapse>
@@ -31,7 +36,7 @@ import location from '@/mycomponents/balance/location.vue'
 import recordDetailPopup from '@/mycomponents/detail/recordDetailPopup.vue'
 import pack from '@/mycomponents/balance/pack.vue'
 import PackageAndItemCard from '@/mycomponents/package/PackageAndItemCard.vue'
-import { getDetailOption, getDetailEditRemoveOption, getClearOption,getEditLocationRemoveOption } from '@/common/array.js'
+import { getDetailOption, getDetailEditRemoveOption, getClearOption,getEditLocationRemoveOption ,getRecordOption} from '@/common/array.js'
 
 const props = defineProps({
   dataContent: {
@@ -64,6 +69,22 @@ const props = defineProps({
   isShowBalanceQty: {
     type: Boolean,
     default: false
+  },
+  isShowParentPack: {
+    type: Boolean,
+    default: true
+  },
+  isShowModifedLocation: {
+    type: Boolean,
+    default: false
+  },
+  allowModifyQty: {
+    type: Boolean,
+    default: false
+  },
+  allowModifyLocation: {
+    type: Boolean,
+    default: false
   }
 })
 const collapse1 = ref()
@@ -102,8 +123,8 @@ dataContent.value.subList.forEach((item) => {
 })
 onMounted(() => {
   detailOptions.value = getDetailOption()
-  scanOptions.value = getDetailEditRemoveOption()
-  removeOptions.value = getEditLocationRemoveOption()
+  scanOptions.value = getRecordOption(props.allowModifyQty,props.allowModifyLocation);
+  removeOptions.value = props.isShowModifedLocation ? getEditLocationRemoveOption():getClearOption();
 })
 const removeItem = (params, dataContent) => {
   const { text } = removeOptions.value[params[1]]