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

src/components/ImportForm/src/ImportForm.vue

@@ -71,8 +71,6 @@ const message = useMessage() // 消息弹窗
 const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中
 const uploadRef = ref()
-const importUrl =
-  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import'
 const uploadHeaders = ref() // 上传 Header 头
 const fileList = ref([]) // 文件列表
 const file = ref('')
@@ -120,6 +118,10 @@ const file = ref('')
     required: false,
     default: true
   },
+  url:{
+    type: String,
+    required: false,
+  }
 })
 const importTemplateData= ref(props.importTemplateData)
 const  accept= ref(props.accept)
@@ -129,6 +131,8 @@ const appendIsDisable = ref(props.appendIsDisable)//追加是否禁用,默认值
 const coverIsDisable = ref(props.coverIsDisable)//覆盖是否禁用,默认值不禁用
 const updatePart = ref(props.updatePart)//是否部门保存
 
+const importUrl =
+  import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + props.url
 /** 打开弹窗 */
 const open = () => {
   dialogVisible.value = true

src/components/UploadFile/src/UploadFile.vue

@@ -22,10 +22,10 @@
     >
       <el-button type="primary"><Icon icon="ep:upload-filled" />{{ title }}</el-button>
       <template v-if="isShowTip" #tip>
-        <div style="font-size: 8px;margin-top: 10px;">
+        <div style="font-size: 8px;margin-top: 10px;line-height: initial;">
           大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b>
         </div>
-        <div style="font-size: 8px">
+        <div style="font-size: 8px;line-height: initial;">
           格式为 <b style="color: #f56c6c">{{ fileType.join('/') }}</b> 的文件
         </div>
       </template>

src/types/components.d.ts

@@ -37,7 +37,6 @@ export type ColProps = {
 
 export type ComponentOptions = {
   label?: string
-  type?: string
   value?: FormValueType
   disabled?: boolean
   key?: string | number

src/utils/disposition/tableColumns.ts

@@ -297,10 +297,9 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     } ,
     form: {
-      component: 'TimePicker',
+      component: 'DatePicker',
       componentProps: {
         type: 'datetimerange',
-      // disabled:true,
       }
     }
   },
@@ -317,9 +316,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     } ,
     form: {
-      component: 'TimePicker',
-      // valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      // format: 'YYYY-MM-DD HH:mm:ss',
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetimerange',
+      }
     }
   },
   {