From 7b75466bd2a471346ac8d950ad000d579951bb3b Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Tue, 22 Oct 2024 13:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=90=E8=A1=A8=E5=8E=BB=E6=8E=89=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableForm/src/TableForm.vue                | 8 ++++----
 .../inventorymoveRecordRequestMain.data.ts                | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 61bcb3632..d923fc149 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -228,7 +228,7 @@
             <el-time-picker
               :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
-              :clearable="true"
+              :clearable="headerItem?.tableForm?.clearable"
               :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
               style="width: 100%"
               :disabled="itemIsDisabled(headerItem, row)"
@@ -241,7 +241,7 @@
             <el-date-picker
               :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
-              :clearable="true"
+              :clearable="headerItem?.tableForm?.clearable"
               style="width: 100%"
               :disabled="itemIsDisabled(headerItem, row)"
               :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
@@ -258,7 +258,7 @@
             <el-date-picker
               :key="headerItem.field + $index"
               type="datetime"
-              :clearable="true"
+              :clearable="headerItem?.tableForm?.clearable"
               v-model="row[headerItem.field]"
               :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'"
               style="width: 100%"
@@ -275,7 +275,7 @@
             <el-date-picker
               :key="headerItem.field + $index"
               v-model="row[headerItem.field]"
-              :clearable="true"
+              :clearable="headerItem?.tableForm?.clearable"
               :disabled="itemIsDisabled(headerItem, row)"
               :type="headerItem?.tableForm?.timeType || 'datetimerange'"
               range-separator="至"
diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
index 750723fa6..29100c495 100644
--- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
+++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordRequestMain.data.ts
@@ -434,11 +434,13 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       placeholder: '请选择从批次',
       valueFormat: 'YYYYMMDD',
       format: 'YYYYMMDD',
+      clearable:false
     },
     form: {
       componentProps: {
         disabled: true,
         valueFormat: 'YYYYMMDD',
+        clearable: false
       }
     }
   },