From f001eab0a93d12156b70b4fc96a581b3052285da Mon Sep 17 00:00:00 2001
From: wangyufei <2267742828@qq.com>
Date: Tue, 20 Aug 2024 13:14:56 +0800
Subject: [PATCH] =?UTF-8?q?HL-5421=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E7=9A=84=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B1=87=E6=80=BB?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E5=BA=93=E5=AD=98=E7=9A=84=E6=B1=87=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BasicForm/src/BasicForm.vue          |  4 ++--
 .../inventorymoveRequestMainOKHOLD/index.vue        | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue
index d2136a0be..53727949b 100644
--- a/src/components/BasicForm/src/BasicForm.vue
+++ b/src/components/BasicForm/src/BasicForm.vue
@@ -85,7 +85,7 @@
         label: '汇总',
         prop: 'CollectionTable'
       }]" v-model="tabSheet" @change="tabChange"/>
-      <div class="table" v-if="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
+      <div class="table" v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns" v-show="(tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere != 'countPlan')||(tabSheet=='TableForm'&&isBusiness && formType == 'update' && updateTypeEdiltSubList && fromeWhere != 'countPlan')">
         <TableForm
           ref="tableFormRef"
           class="w-[100%]"
@@ -123,7 +123,7 @@
           </template>
         </TableForm>
       </div>
-      <div v-if="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
+      <div v-if="tableAllSchemas&&tableAllSchemas.tableFormColumns" v-show="tabSheet=='TableForm'&&isBusiness && formType == 'create' && fromeWhere == 'countPlan'">
         <TableFormCountPlan
           :tableFields="tableAllSchemas.tableFormColumns"
           :tableData="tableData"
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
index edd2f3133..4642f6dcf 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue
@@ -618,8 +618,19 @@ const formRef = ref()
 const openForm =async (type: string, row?: number) => {
   if(type=='create'){
     InventorymoveRequestMain.allSchemas.formSchema.forEach(item =>{
+      if(item.field == 'fromWarehouseCode'){
+        item.componentProps.isSearchList = true
+        item.componentProps.disabled = false
+      }
       if(item.field == 'dueTime') {
-        item.value = dayjs().add(1, 'hour')
+        item.value = dayjs().add(1, 'hour').valueOf()
+      }
+    })
+  }else{
+    InventorymoveRequestMain.allSchemas.formSchema.forEach(item =>{
+      if(item.field == 'fromWarehouseCode'){
+        item.componentProps.isSearchList = false
+        item.componentProps.disabled = true
       }
     })
   }