From a998dadef917dd8fc3fc3d08aa7e409f3c7933b7 Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 14:49:25 +0800
Subject: [PATCH] =?UTF-8?q?HL-5421=E8=80=83=E8=99=91=E5=BD=B1=E5=93=8D?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E5=A4=AA=E5=A4=A7=EF=BC=8C=E5=B0=81=E8=A3=85?=
 =?UTF-8?q?=E5=8D=95=E7=8B=AC=E5=B1=9E=E6=80=A7=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue            | 11 ++++++++---
 .../inventorymoveRequestMainOKHOLD/index.vue          |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index 34796ede1..8256576c8 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -78,7 +78,7 @@
           <el-input v-model="formSchema.value" v-if="isDetail && formTypeDetail == 'InputString'" />
         </template>
       </Form>
-      <Tabs ref="tabRef" v-if="formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" :tabsList="[{
+      <Tabs ref="tabRef" v-if="includeCollectionTable&&formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" :tabsList="[{
         label: '明细',
         prop: 'TableForm'
       },{
@@ -135,7 +135,7 @@
           @handleDeleteTable="handleDeleteTable"
         />
       </div>
-      <div v-if="formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" v-show="tabSheet=='CollectionTable'">
+      <div v-if="includeCollectionTable&&formType=='create'&&tableAllSchemas&&tableAllSchemas.tableFormColumns.find(item=>item.field == 'itemCode')" v-show="tabSheet=='CollectionTable'">
         <CollectionTable
         :tableFields="tableAllSchemas?tableAllSchemas.tableFormColumns:[]"
         :tableData="tableData"
@@ -369,7 +369,12 @@ const props = defineProps({
   isCheckStrictly:{
     type:Boolean,
     default:false
-  }
+  },
+  // true 展示汇总功能组件; false 不展示
+  includeCollectionTable:{
+    type:Boolean,
+    default:false
+  },
 })
 
 const { t } = useI18n() // 国际化
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index 4642f6dcf..edda6cdf3 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -44,6 +44,7 @@
     ref="formRef"
     :isOpenSearchTable="true"
     fieldTableColumn="fromPackingNumber"
+    :includeCollectionTable="true"
     @success="getList"
     :rules="InventorymoveRequestMainRules"
     :formAllSchemas="InventorymoveRequestMain.allSchemas"