Merge remote-tracking branch 'origin/hella_online_20240803' into hella_online_20240803

src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts

@@ -364,7 +364,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -387,7 +387,7 @@ export const Businesstype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts

@@ -221,7 +221,7 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -244,7 +244,7 @@ export const Documentsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts

@@ -354,7 +354,7 @@ export const Jobsetting = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -377,7 +377,7 @@ export const Jobsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts

@@ -224,7 +224,7 @@ export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -247,7 +247,7 @@ export const Plansetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts

@@ -126,7 +126,7 @@ export const Recordsetting = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -149,7 +149,7 @@ export const Recordsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts

@@ -224,7 +224,7 @@ export const Requestsetting = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -247,7 +247,7 @@ export const Requestsetting = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts

@@ -98,7 +98,7 @@ export const Switch = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -121,7 +121,7 @@ export const Switch = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts

@@ -170,7 +170,7 @@ export const Transactiontype = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -193,7 +193,7 @@ export const Transactiontype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

@@ -669,6 +669,9 @@ export const PackageunitRules = reactive({
   type: [
     { required: true, message: '请选择包装类型', trigger: 'change' }
   ],
+  reuse: [
+    { required: true, message: '请选择是否重复使用', trigger: 'change' }
+  ],
   desc: [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     { required: true, message: '请输入包装描述', trigger: 'change' }

src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts

@@ -181,7 +181,7 @@ export const Barcode = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -204,7 +204,7 @@ export const Barcode = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -475,7 +475,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -498,7 +498,7 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts

@@ -215,7 +215,7 @@ export const Labeltype = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -238,7 +238,7 @@ export const Labeltype = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts

@@ -127,7 +127,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -150,7 +150,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@@ -155,7 +155,6 @@ const buttonBaseClick = (val, item) => {
   } else if (val == 'import') { // 导入
     handleImport()
   } else if (val == 'export') { // 导出
-    debugger
     handleExport()
   } else if (val == 'refresh') { // 刷新
     if (tableObject.params.filters && tableObject.params.filters.length > 0 ) {
@@ -243,7 +242,6 @@ const handleDelete = async (id: number) => {
 const exportLoading = ref(false) // 导出的加载中
 const handleExport = async () => {
   try {
-    debugger
     // 导出的二次确认
     await message.exportConfirm()
     // 发起导出

src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts

@@ -137,7 +137,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -160,7 +160,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts

@@ -140,6 +140,40 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     isForm: false,
     isTable: true
   },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts

@@ -139,7 +139,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -162,7 +162,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts

@@ -243,7 +243,7 @@ export const Carrier = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -266,7 +266,7 @@ export const Carrier = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/orderManage/owner/owner.data.ts

@@ -242,7 +242,7 @@ export const Owner = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -265,7 +265,7 @@ export const Owner = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/orderManage/shift/shift.data.ts

@@ -216,7 +216,7 @@ export const Shift = useCrudSchemas(
       sort: 'custom',
       isDetail: true,
       isForm: false,
-      isTable: false,
+      isTable: true,
       formatter: dateFormatter,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -239,7 +239,7 @@ export const Shift = useCrudSchemas(
       field: 'updater',
       isDetail: true,
       isForm: false,
-      isTable: false,
+      isTable: true,
       table: {
         width: 150
       }

src/views/wms/basicDataManage/orderManage/team/team.data.ts

@@ -173,7 +173,7 @@ export const Team = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -196,7 +196,7 @@ export const Team = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'updater',
     isDetail: true,
     isForm: false,
-    isTable: false,
+    isTable: true,
     table: {
       width: 150
     }

src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts

@@ -48,6 +48,70 @@ export const Rule = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'configuration',
     sort: 'custom',
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    isForm: false,
+    table: {
+      width: 180
+    },
+    formatter: dateFormatter,
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
   // {
   //   label: '操作',
   //   field: 'action',

src/views/wms/basicDataManage/subject/mstr/mstr.data.ts

@@ -75,17 +75,66 @@ export const Mstr = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    sort: 'custom',
+    isForm: false,
+    table: {
+      width: 180
+    },
     formatter: dateFormatter,
-    search: {
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    form: {
       component: 'DatePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        style: {width:'100%'},
-        type: 'daterange',
+        type: 'datetime',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
       }
+    }
+  },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
     isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
   },
   {
     label: '操作',

src/views/wms/basicDataManage/subject/qadCostcentre/qadCostcentre.data.ts

@@ -99,6 +99,49 @@ export const QadCostcentre = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '删除时间',
     field: 'deletionTime',

src/views/wms/basicDataManage/subject/qadProject/qadProject.data.ts

@@ -118,6 +118,49 @@ export const QadProject = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '删除时间',
     field: 'deletionTime',

src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts

@@ -246,6 +246,49 @@ export const SubjectAccount = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    table: {
+      width: 130
+    },
+    isForm: false,
+    isTable: true
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        style: {width:'100%'},
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    }
+  },
+  {
+    label: '最后更新者',
+    field: 'updater',
+    isDetail: true,
+    isForm: false,
+    isTable: true,
+    table: {
+      width: 150
+    }
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/countManage/count/countJobMain/index.vue

@@ -87,6 +87,7 @@ import * as CountJobDetailApi from '@/api/wms/countJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import * as PackageunitApi from "@/api/wms/packageunit";
+import { formatDate } from '@/utils/formatTime'
 // 盘点任务主
 defineOptions({ name: 'CountJobMain' })
 
@@ -307,8 +308,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountJobMainApi.exportCountJobMain(tableObject.params)
-    download.excel(data, '盘点任务主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -320,8 +322,10 @@ const handleExportCountJob = async (id: number,number: string) => {
   try {
     await message.exportConfirm()
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountJobMainApi.handleExportCountJob(id)
-    download.excel(data, '盘点任务主'+number+'.xlsx')
+    // download.excel(data, '盘点任务主'+number+'.xlsx')
+    download.excel(data, `【${excelTitle.value}${number}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   }finally {
     exportLoading.value = false
@@ -339,7 +343,7 @@ const handleImport = (id: string) => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '盘点任务导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后

src/views/wms/countManage/count/countPlanMain/index.vue

@@ -144,6 +144,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import BasicFormWmsCount from '@/components/BasicForm/src/BasicFormWmsCount.vue'
+import { formatDate } from '@/utils/formatTime'
 
 // 盘点计划主
 defineOptions({ name: 'CountPlanMain' })
@@ -620,8 +621,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountPlanMainApi.exportCountPlanMain(tableObject.params)
-    download.excel(data, '盘点计划主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -708,7 +710,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '盘点计划主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后

src/views/wms/countManage/count/countRecordMain/index.vue

@@ -67,6 +67,7 @@ import * as CountRecordMainApi from '@/api/wms/countRecordMain'
 import * as CountRecordDetailApi from '@/api/wms/countRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 盘点记录主
 defineOptions({ name: 'CountRecordMain' })
 
@@ -165,8 +166,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountRecordMainApi.exportCountRecordMain(tableObject.params)
-    download.excel(data, '盘点记录主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/countManage/count/countRequestMain/index.vue

@@ -114,6 +114,7 @@ import * as CountRequestMainApi from '@/api/wms/countRequestMain'
 import * as CountRequestDetailApi from '@/api/wms/countRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { SearchTableCount } from '@/components/SearchTableCount'
+import { formatDate } from '@/utils/formatTime'
 
 // 盘点申请
 defineOptions({ name: 'CountRequestMain' })
@@ -500,8 +501,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountRequestMainApi.exportCountRequestMain(tableObject.params)
-    download.excel(data, '盘点申请主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -564,7 +566,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '盘点申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后

src/views/wms/countManage/countadjust/countadjustRecordMain/index.vue

@@ -67,6 +67,7 @@ import * as CountadjustRecordMainApi from '@/api/wms/countadjustRecordMain'
 import * as CountadjustRecordDetailApi from '@/api/wms/countadjustRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 盘点调整记录主
 defineOptions({ name: 'CountadjustRecordMain' })
 
@@ -151,8 +152,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountadjustRecordMainApi.exportCountadjustRecordMain(tableObject.params)
-    download.excel(data, '盘点调整记录主.xlsx')
+     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue

@@ -87,6 +87,7 @@ import { CountadjustRequestMain,CountadjustRequestMainRules,CountadjustRequestDe
 import * as CountadjustRequestMainApi from '@/api/wms/countadjustRequestMain'
 import * as CountadjustRequestDetailApi from '@/api/wms/countadjustRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 盘点调整申请
 defineOptions({ name: 'CountadjustRequestMain' })
@@ -320,8 +321,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await CountadjustRequestMainApi.exportCountadjustRequestMain(tableObject.params)
-    download.excel(data, '盘点调整申请主.xlsx')
+     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -384,7 +386,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '盘点调整申请主导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后

src/views/wms/inventoryManage/containerinit/containerBindRecord/index.vue

@@ -87,6 +87,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'ContainerBindRecordMain' })
@@ -220,8 +221,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerBindRecordMainApi.exportContainerBindRecordMain(tableObject.params)
-    download.excel(data, '器具绑定记录主.xls')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -280,7 +282,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '器具绑定记录主导入模版.xls'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryManage/containerinit/containerRepair/index.vue

@@ -86,6 +86,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'ContainerRepairRecordMain' })
@@ -219,8 +220,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerRepairRecordMainApi.exportContainerRepairRecordMain(tableObject.params)
-    download.excel(data, '器具维修记录主.xls')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -279,7 +281,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '器具维修记录主导入模版.xls'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue

@@ -86,6 +86,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'ContainerUnbindRecordMain' })
@@ -219,8 +220,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerUnbindRecordMainApi.exportContainerUnbindRecordMain(tableObject.params)
-    download.excel(data, '器具解绑记录主.xls')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -279,7 +281,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '器具解绑记录主导入模版.xls'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryManage/containerinit/containerinitadd/index.vue

@@ -75,6 +75,7 @@ import * as ContainerDetailApi from '@/api/wms/containerDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ContainerMain' })
 
@@ -271,8 +272,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerMainApi.exportContainerMain(tableObject.params)
-    download.excel(data, '器具主.xls')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -287,7 +289,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '器具主导入模版.xls'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryManage/containerinit/containerinitrecord/index.vue

@@ -84,6 +84,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 
 defineOptions({ name: 'ContainerInitRecordMain' })
@@ -217,8 +218,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerInitRecordMainApi.exportContainerInitRecordMain(tableObject.params)
-    download.excel(data, '器具初始化记录主.xls')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -272,7 +274,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '器具初始化记录主导入模版.xls'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue

@@ -93,6 +93,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ContainerManageRequest' })
 
@@ -518,20 +519,21 @@ const handleExport = async () => {
   try {
     // 导出的二次确认
     await message.exportConfirm()
+    const excelTitle = ref(route.meta.title)
     // 发起导出
     exportLoading.value = true
     if(routeName.value == 'ReturnContainerManageRequest'){
       const data = await ContainerMainRequestApi.exportReturnContainerMainRequest(tableObject.params)
-      download.excel(data, '器具返回申请.xlsx')
+     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
         }else if ( routeName.value == 'MoveContainerManageRequest') {
           const data = await ContainerMainRequestApi.exportMoveContainerMainRequest(tableObject.params)
-          download.excel(data, '器具转移申请.xlsx')
+          download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
         }else if ( routeName.value == 'DeliverContainerManageRequest') {
           const data = await ContainerMainRequestApi.exportDeliverContainerMainRequest(tableObject.params)
-          download.excel(data, '器具发运申请.xlsx')
+         download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
         }else{
           const data = await ContainerMainRequestApi.exportContainerMainRequest(tableObject.params)
-          download.excel(data, '器具管理申请.xlsx')
+          download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
         }
   } catch {
   } finally {
@@ -547,7 +549,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'importFileName.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryjobManage/containermanage/containerRecordMain/index.vue

@@ -74,6 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ContainerRecordMain' })
 const message = useMessage() // 消息弹窗
@@ -233,8 +234,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerRecordMainApi.exportContainerRecordMain(tableObject.params)
-    download.excel(data, '器具管理记录主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue

@@ -93,6 +93,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'InitialContainerManageRequest' })
 
@@ -475,8 +476,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerMainRequestApi.exportInitialContainerMainRequest(tableObject.params)
-    download.excel(data, '初始化器具管理申请主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -491,7 +493,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: importFileName.value + '.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue

@@ -93,6 +93,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'ScrapContainerManageRequest' })
 
@@ -500,8 +501,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await ContainerMainRequestApi.exportScrapContainerMainRequest(tableObject.params)
-    download.excel(data, '报废器具管理申请主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -516,7 +518,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: 'importFileName.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 // 导入成功之后
 const importSuccess = () => {

src/views/wms/inventoryjobManage/packageManage/packagemergeMain/index.vue

@@ -66,6 +66,7 @@ import { PackagemergeMain,PackagemergeMainRules, PackagemergeDetail, Packagemerg
 import * as PackagemergeMainApi from '@/api/wms/packagemergeMain'
 import * as PackagemergeDetailApi from '@/api/wms/packagemergeDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 合包记录
 defineOptions({ name: 'PackagemergeMain' })
@@ -139,8 +140,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PackagemergeMainApi.exportPackagemergeMain(tableObject.params)
-    download.excel(data, '合包记录.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue

@@ -74,6 +74,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 defineOptions({ name: 'PackageoverJobMain' })
 
 const message = useMessage() // 消息弹窗
@@ -251,8 +252,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PackageoverJobMainApi.exportPackageoverJobMain(tableObject.params)
-    download.excel(data, '翻包任务主.xlsx')
+     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue

@@ -71,6 +71,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { getAccessToken } from '@/utils/auth'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 // 翻包记录
 defineOptions({ name: 'PackageoverMain' })
@@ -185,8 +186,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PackageoverRecordMainApi.exportPackageoverMain(tableObject.params)
-    download.excel(data, '翻包记录.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue

@@ -85,6 +85,7 @@ import { PackageoverRequestMain,PackageoverRequestMainRules, PackageoverRequestD
 import * as PackageoverRequestMainApi from '@/api/wms/packageoverRequestMain'
 import * as PackageoverRequestDetailApi from '@/api/wms/packageoverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'PackageoverRequestMain' })
 
@@ -366,8 +367,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PackageoverRequestMainApi.exportPackageoverRequestMain(tableObject.params)
-    download.excel(data, '翻包申请.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -458,7 +460,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '翻包申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRetrospect/index.vue

@@ -51,6 +51,7 @@ import * as PackageoverRetrospectApi from '@/api/wms/packageoverRetrospect'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
+import { formatDate } from '@/utils/formatTime'
 
 defineOptions({ name: 'PackageoverRetrospect' })
 
@@ -153,8 +154,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PackageoverRetrospectApi.exportPackageoverRetrospect(tableObject.params)
-    download.excel(data, '翻包记录主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/packageManage/packagesplitMain/index.vue

@@ -66,6 +66,7 @@ import { PackagesplitMain,PackagesplitMainRules, PackagesplitDetail, Packagespli
 import * as PackagesplitMainApi from '@/api/wms/packagesplitMain'
 import * as PackagesplitDetailApi from '@/api/wms/packagesplitDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 拆包记录
 defineOptions({ name: 'PackagesplitMain' })
@@ -139,8 +140,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await PackagesplitMainApi.exportPackagesplitMainApi(tableObject.params)
-    download.excel(data, '拆包记录.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionJobMain/index.vue

@@ -73,6 +73,7 @@ import * as UnplannedissueJobMainApi from '@/api/wms/unplannedissueJobMain'
 import * as UnplannedissueJobDetailApi from '@/api/wms/unplannedissueJobDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 计划外出库任务主
 defineOptions({ name: 'UnplannedissueJobMainSpare' })
 
@@ -228,8 +229,9 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
+    const excelTitle = ref(route.meta.title)
     const data = await UnplannedissueJobMainApi.exportUnplannedissueJobMain(tableObject.params)
-    download.excel(data, '计划外出库任务主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue

@@ -68,6 +68,7 @@ import * as UnplannedissueRecordMainApi from '@/api/wms/unplannedissueRecordMain
 import * as UnplannedissueRecordDetailApi from '@/api/wms/unplannedissueRecordDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
+import { formatDate } from '@/utils/formatTime'
 // 计划外出库记录主
 defineOptions({ name: 'UnplannedissueRecordMainSpare' })
 
@@ -156,8 +157,9 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     tableObject.params.detailDataType = 2
+    const excelTitle = ref(route.meta.title)
     const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params)
-    download.excel(data, '计划外出库记录主.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue

@@ -91,6 +91,7 @@ import { UnplannedissueRequestMain,UnplannedissueRequestMainRules,Unplannedissue
 import * as UnplannedissueRequestMainApi from '@/api/wms/unplannedissueRequestMain'
 import * as UnplannedissueRequestDetailApi from '@/api/wms/unplannedissueRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import { formatDate } from '@/utils/formatTime'
 
 // 计划外出库申请
 defineOptions({ name: 'UnplannedissueRequestMainSpare' })
@@ -401,8 +402,9 @@ const handleExport = async () => {
     // 发起导出
     exportLoading.value = true
     tableObject.params.detailDataType = 2
+    const excelTitle = ref(route.meta.title)
     const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params)
-    download.excel(data, '备件领用申请.xlsx')
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {
     exportLoading.value = false
@@ -510,7 +512,7 @@ const handleImport = () => {
 // 导入附件弹窗所需的参数
 const importTemplateData = reactive({
   templateUrl: '',
-  templateTitle: '备件领用申请导入模版.xlsx'
+  templateTitle: `【${route.meta.title}】导入模版.xlsx`
 })
 
 // 导入成功之后

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts

@@ -412,7 +412,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    isTable: false,
+    isTable: true,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -440,7 +440,7 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable: false,
+    isTable: true,
     isForm: false,
   },
   {

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue

@@ -346,6 +346,11 @@ const submitForm = async (formType, submitData) => {
       return;
     }
   })
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
+  if(findLocation){
+    message.warning('从库位和到库位不能相同')
+    return
+  }
   if(flag.value){
     formRef.value.formLoading = false
     return

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -332,7 +332,22 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
     }
   }
 })
+if(routeName.value == 'HoldtookRequestMain'){
+  //解决雪冰隔离转合格的bug导致其他页面没有到库位代码的问题
+  InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+    if(item.field=='toLocationCode'){
+      item.hidden = true
+    }
+  })
+}else{
+  InventorymoveRequestDetail.allSchemas.tableFormColumns.forEach(item=>{
+    if(item.field=='toLocationCode'){
+      item.hidden = false
+    }
+  })
   
+}
+console.log('tableFormColumns',InventorymoveRequestDetail.allSchemas.tableFormColumns)
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -644,24 +659,24 @@ const handleExport = async () => {
     if(routeName.value == 'OktoholdRequestMain'){
       const data = await InventorymoveRequestMainApi.exportOkToHoldRequestMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }else if ( routeName.value == 'HoldtookRequestMain') {
+    }else if ( routeName.value == 'HoldtookRequestMain') {
-          const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
+      const data = await InventorymoveRequestMainApi.exportHoldToOkRequestMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }else if ( routeName.value == 'HoldtoscrapRequestMain') {
+    }else if ( routeName.value == 'HoldtoscrapRequestMain') {
-          const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
+      const data = await InventorymoveRequestMainApi.exportHoldToScrapRequestMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }else if ( routeName.value == 'OktoscrapRequestMain') {
+    }else if ( routeName.value == 'OktoscrapRequestMain') {
-          const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
+      const data = await InventorymoveRequestMainApi.exportOkToScrapRequestMain(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }
+    }
         // else if ( routeName.value == 'ScraptoholdRequestMain') {
         //   const data = await InventorymoveRequestMainApi.exportScrapToHoldRequestMain(tableObject.params)
         //   download.excel(data, '报废转隔离申请主.xlsx')
         // }
-        else{
+    else{
-          const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
+      const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(tableObject.params)
-          download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+      download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
-        }
+    }
   } catch {
   } finally {
     exportLoading.value = false
@@ -700,7 +715,7 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let findLocation = tableData.value.find(item=>item.fromLocationCode&&item.toLocationCode&&item.fromLocationCode==item.toLocationCode)
+  let findLocation = tableData.value.find(item=>item.fromLocationCode==item.toLocationCode&&item.fromInventoryStatus==item.toInventoryStatus)
   if(findLocation){
     message.warning('从库位和到库位不能相同')
     return

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -702,7 +702,6 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
-    isTableForm:false,
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
@@ -939,9 +938,9 @@ export const InventorymoveRequestDetailRules = reactive({
   fromInventoryStatus: [
     { required: true, message: '请选择从库存状态', trigger: 'change' }
   ],
-  // toLocationCode: [
+  toLocationCode: [
-  //   { required: true, message: '请选择到库位代码', trigger: 'change' }
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  // ],
+  ],
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/index.vue

@@ -141,15 +141,15 @@ const butttondata = (row,$index) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.id,row.masterId)
+    handleDocumentPrint(row.id)
   }
 }
 
 // 单据打印
 const BASE_URL = getJmreportBaseUrl()
 const documentSrc = ref(BASE_URL + '/jmreport/view/920874172025987072?token=' + getAccessToken())
-const handleDocumentPrint = async (id,masterId) => {
+const handleDocumentPrint = async (id) => {
-  window.open(documentSrc.value + '&id=' + id+ '&masterId=' + masterId)
+  window.open(documentSrc.value + '&id=' + id)
 }
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts

@@ -388,7 +388,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isTable:false,
+    isTable:true,
   },
   {
     label: '创建时间',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue

@@ -154,7 +154,9 @@
       <el-table-column label="物料代码" width="150" prop="itemCode" align="center" />
       <el-table-column label="批次" width="150" prop="batch" align="center" />
       <el-table-column label="数量" width="100" prop="qty" align="center" />
-      <el-table-column label="计量单位" width="100" prop="uom" align="center" />
+      <el-table-column label="计量单位" width="100" prop="uom" align="center">
+        <template #default="scope"> {{ uomLabel(scope.row) }}</template>
+      </el-table-column>
       <el-table-column label="托个数" width="100" prop="allTuoQty" align="center" />
       <el-table-column label="托规格" width="100" prop="secondPackUnit" align="center" />
       <el-table-column label="托数量" width="100" prop="secondPackQty" align="center" />
@@ -180,6 +182,7 @@
 <script setup lang="ts">
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as accuracyFun from '@/utils/calculate'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
@@ -589,6 +592,16 @@ const blurThree = (oneRow, twoRow, thereeRow) => {
   })
   twoRow.qtyOne = num
 }
+// 获取单位
+const uomLabel = (row) => {
+  const obj = getStrDictOptions(DICT_TYPE.UOM).find((item) => item.value == row.uom)
+  if (obj) {
+    return obj.label
+  } else {
+    return ''
+  }
+}
+
 // 传递给父类
 const emit = defineEmits(['submitForm'])
 defineExpose({ openLabel, dialogTableVisible, isLoading }) // 提供 open 方法，用于打开弹窗