From e5afaa8c1a21822a1e824576a82a563147ddc964 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Mon, 10 Mar 2025 13:30:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImportForm/src/ImportForm.vue                | 6 +++++-
 .../supplierManage/deliveryCalendar/index.vue               | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index 970f380b7..a7f5cd02c 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -103,7 +103,7 @@
     <template #footer>
       <div class="flex items-center">
         <div class="flex-1 text-left">
-          <el-button type="primary" plain @click="importTemplate">
+          <el-button type="primary" plain @click="importTemplate" v-if="showDownLoad">
             <Icon icon="ep:download" />
             {{ t('ts.下载模板') }}
           </el-button>
@@ -136,6 +136,10 @@ const props = defineProps({
     type: Object,
     required: true
   },
+  showDownLoad:{
+    type:Boolean,
+    default: true
+  },
   // 可以导入的文件类型
   accept: {
     type: String,
diff --git a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue
index c26fe0320..dd3881f59 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue
@@ -61,7 +61,7 @@
   <Detail ref="detailRef" :isBasic="true" :allSchemas="DeliveryCalendar.allSchemas" />
 
   <!-- 导入 -->
-  <ImportForm ref="importFormRef" url="/wms/delivery-calendar/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+  <ImportForm ref="importFormRef" :showDownLoad="false" url="/wms/delivery-calendar/import" :importTemplateData="importTemplateData" @success="importSuccess" />
 </template>
 
 <script setup lang="ts">

From 79995a30cb751faa6c1b82967c2e84b04541ba5c Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Mon, 10 Mar 2025 15:39:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=BF=E6=AC=A1=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/formatTime.ts                                     | 6 ++++++
 .../supplierManage/deliTime/deliTime.data.ts                | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/utils/formatTime.ts b/src/utils/formatTime.ts
index f1463f58a..63612c5ce 100644
--- a/src/utils/formatTime.ts
+++ b/src/utils/formatTime.ts
@@ -162,6 +162,12 @@ export const dateFormatter = (row, column, cellValue) => {
   }
   return formatDate(cellValue)
 }
+export const dateFormatterHHMMSS = (row, column, cellValue) => {
+  if (!cellValue) {
+    return
+  }
+  return formatDate(cellValue,'HH:mm:ss')
+}
 
 export const dateFormatterYM = (row, column, cellValue) => {
   if (!cellValue) {
diff --git a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts
index 7bf68b5ab..16449b433 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts
@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter,dateFormatterHHMMSS } from '@/utils/formatTime'
 
 // 表单校验
 export const DeliTimeRules = reactive({
@@ -36,7 +36,7 @@ export const DeliTime = useCrudSchemas(reactive<CrudSchema[]>([
     label: '开始时间',
     field: 'begeinTime',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatterHHMMSS,
     isSearch: true,
     table: {
       width:120