Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

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,

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) {

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

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">