缺陷：HL-5009，SCP基础数据 查询列表、导出添加创建人创建时间更新人更新时间，业务部分查询列表、导出添加创建时间创建人

.gitignore

@@ -12,3 +12,4 @@ auto-*.d.ts
 .history
 /sfms3.0
 /sfms3.0-ui
+.vscode/

src/locales/en-US.ts

@@ -1286,7 +1286,8 @@ export default {
     生产日期不能小于:'The date of production cannot be less than',
     生产日期不能大于当前系统日期:'The production date cannot be greater than the current system date',
     发票回转:'Return of invoice',
-    发票回转成功:'The invoice has been successfully forwarded'
+    发票回转成功: 'The invoice has been successfully forwarded',
+    最后更新人: 'Last Updated By'
   },
 
 

src/locales/zh-CN.ts

@@ -1282,7 +1282,8 @@ export default {
     生产日期不能小于:'生产日期不能小于',
     生产日期不能大于当前系统日期:'生产日期不能大于当前系统日期',
     发票回转:'发票回转',
-    发票回转成功:'发票回转成功'
+    发票回转成功: '发票回转成功',
+    最后更新人:'最后更新人'
   },
 
 }

src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue

@@ -26,15 +26,28 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-clientTable v-loading="loading" :data="list" :default-sort="{ prop: 'priority', order: 'null' }">
-      <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode" />
+      <el-table-column align="center" :label="t('ts.策略代码')" prop="strategyCode"  show-overflow-tooltip width="150px" />
-      <el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip />
+      <el-table-column align="center" :label="t('ts.策略名称')" prop="name" show-overflow-tooltip width="150px" />
-      <el-table-column align="center" :label="t('ts.策略描述')" prop="description" />
+      <el-table-column align="center" :label="t('ts.策略描述')" prop="description"  show-overflow-tooltip width="150px" />
-      <el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable/>
+      <el-table-column align="center" :label="t('ts.优先级')" prop="priority" sortable width="120"/>
       <el-table-column align="center" :label="t('ts.状态')" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      vue
+      <el-table-column align="center" :label="t('ts.创建时间')" prop="createTime" width="200px" >
+        <template #default="scope">
+          {{ formatDate(scope.row.createTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="t('ts.创建人')" prop="creator" width="150px" />
+      <el-table-column align="center" :label="t('ts.最后更新时间')" prop="updateTime" width="200px" >
+        <template #default="scope">
+          {{ formatDate(scope.row.updateTime) }}
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="t('ts.最后更新人')" prop="updater" width="150px" />
       <el-table-column align="center" :label="t('ts.操作')" fixed="right" width="240">
         <template #default="scope">
           <ButtonBase :Butttondata="butttondata(scope.row)" @button-base-click="buttonTableClick($event, scope.row)" />
@@ -54,6 +67,7 @@ import { DICT_TYPE } from '@/utils/dict'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as RuleApi from '@/api/wms/rule'
 import AddForm from './AddForm.vue'
+import dayjs from 'dayjs'
 
 defineOptions({ name: 'SupplieDeliveryStrategy' })
 const queryFormRef = ref() // 搜索的表单
@@ -165,6 +179,14 @@ const buttonTableClick = (val, row) => {
   }
 }
 
+//时间格式化
+const formatDate = (date) => {
+  if (!date) return ''; // 处理空值
+  return dayjs(date).format('YYYY-MM-DD HH:mm:ss'); // 根据需求格式化
+}
+
+
+
 /** 初始化 **/
 onMounted(() => {
   getList()

src/views/wms/basicDataManage/supplierManage/supplierCycle/supplierCycle.data.ts

@@ -17,6 +17,9 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
     label: '供应商代码',
     field: 'supplierCode',
     sort: 'custom',
+    table: {
+      width: 150,
+    },
     isSearch: true,
     form: {
       componentProps: {
@@ -151,6 +154,44 @@ export const SupplierCycle = useCrudSchemas(reactive<CrudSchema[]>([
       },
     }
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    formatter: dateFormatter,
+    isForm:false,
+  },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false,
+  },
+  {
+    label: '最后更新时间',
+    field: 'updateTime',
+    sort: 'custom',
+    table: {
+      width: 200,
+    },
+    formatter: dateFormatter,
+    isForm:false,
+  },
+  {
+    label: '最后更新人',
+    field: 'updater',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+    isForm:false,
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts

@@ -226,6 +226,12 @@ export const SupplierUser = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isForm: false,
   },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    isForm: false,
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts

@@ -666,7 +666,8 @@ export const PurchasereceiptJobMain = useCrudSchemas(
           dateFormat: 'YYYY-MM-DD HH:mm:ss',
           valueFormat: 'x'
         }
-      }
+      },
+      isTable:false,
     },
     {
       label: '创建者',
@@ -1081,16 +1082,6 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
       sortTableDefault: 1012,
       hiddenInMain: true
     },
-    {
-      label: '创建者',
-      field: 'creator',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      hiddenInMain: true,
-      sortTableDefault: 1012
-    },
     {
       label: '创建时间',
       field: 'createTime',
@@ -1110,7 +1101,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas(
           valueFormat: 'x'
         }
       },
-      hiddenInMain: true,
+      hiddenInMain: false,
+      sortTableDefault: 1012
+    },
+    {
+      label: '创建者',
+      field: 'creator',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      hiddenInMain: false,
       sortTableDefault: 1012
     },
     {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -911,16 +911,6 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortTableDefault: 1007,
     hiddenInMain: true
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault: 1014,
-    hiddenInMain: true,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -932,7 +922,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
-    hiddenInMain: true,
+    hiddenInMain: false,
     sortTableDefault: 1014,
     form: {
       component: 'DatePicker',
@@ -943,6 +933,16 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     },
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault: 1014,
+    hiddenInMain: false,
+  },
 
 ]))
 

src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts

@@ -276,7 +276,7 @@ export const PurchaseMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '创建时间',
     field: 'createTime',
-    isTable:true,
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -806,16 +806,6 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
-    label: '创建者',
-    field: 'creator',
-    isTableForm: false,
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
-    isForm: false,
-  },
   {
     label: '创建时间',
     field: 'createTime',
@@ -828,7 +818,7 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     isForm: false,
     form: {
       component: 'DatePicker',
@@ -841,14 +831,29 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '最后更新者',
+    label: '创建者',
-    field: 'updater',
+    field: 'creator',
     isTableForm: false,
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     isForm: false,
+  },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   isTableForm: false,
+  //   isTable: true,
+  //   hiddenInMain:false,
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   table: {
+  //     width: 150
+  //   },
+  //   isForm: false,
   //   form: {
   //     component: 'DatePicker',
   //     componentProps: {
@@ -858,31 +863,26 @@ export const PurchaseDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //       valueFormat: 'x',
   //     }
   //   }
-  },
+  // },
-  {
+  // {
-    label: '最后更新时间',
+  //   label: '最后更新者',
-    field: 'updateTime',
+  //   field: 'updater',
-    isTableForm: false,
+  //   isTableForm: false,
-    isTable: true,
+  //   table: {
-    hiddenInMain:true,
+  //     width: 150
-    formatter: dateFormatter,
+  //   },
-    detail: {
+  //   hiddenInMain:false,
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   isForm: false,
-    },
+  //   // form: {
-    table: {
+  //   //   component: 'DatePicker',
-      width: 150
+  //   //   componentProps: {
-    },
+  //   //     style: {width:'100%'},
-    isForm: false,
+  //   //     type: 'datetime',
-    form: {
+  //   //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-      component: 'DatePicker',
+  //   //     valueFormat: 'x',
-      componentProps: {
+  //   //   }
-        style: {width:'100%'},
+  //   // }
-        type: 'datetime',
+  // },
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    }
-  },
   {
     label: '备注',
     hiddenInMain:true,

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/supplierdeliverRecordMain.data.ts

@@ -737,6 +737,34 @@ export const SupplierdeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  // {
+  //   label: '最后操作时间',
+  //   field: 'updateTime',
+  //   formatter: dateFormatter,
+  //   detail: {
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //   },
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   form: {
+  //     component: 'DatePicker',
+  //     componentProps: {
+  //       type: 'datetime',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       valueFormat: 'x',
+  //     }
+  //   },
+  // },
+  // {
+  //   label: '最后操作人',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  // },
   {
     label: '操作',
     hiddenInMain:true,

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -345,7 +345,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
-    isTable:true,
+    isTable:false,
     table: {
       width: 180
     },
@@ -1169,7 +1169,7 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -1193,45 +1193,45 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    hiddenInMain:true,
+    hiddenInMain:false,
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新时间',
-    field: 'updateTime',
-    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',
-      }
-    },
-    hiddenInMain:true,
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    isForm: false,
-  },
-  {
-    label: '最后更新者',
-    field: 'updater',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    hiddenInMain:true,
     isTableForm: false,
     isForm: false,
   },
+  // {
+  //   label: '最后更新时间',
+  //   field: 'updateTime',
+  //   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',
+  //     }
+  //   },
+  //   hiddenInMain:false,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
+  // {
+  //   label: '最后更新者',
+  //   field: 'updater',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   hiddenInMain:false,
+  //   isTableForm: false,
+  //   isForm: false,
+  // },
   {
     label: '备注',
     field: 'remark',

src/views/wms/supplierManage/invoicingcalendar/invoicingcalendar.data.ts

@@ -57,22 +57,6 @@ export const Invoicingcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'remark',
     sort: 'custom',
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    sort: 'custom',
-    formatter: dateFormatter,
-    search: {
-      component: 'DatePicker',
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
-        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
-      }
-    },
-    isForm: false,
-    isTable: false,
-  },
   {
     label: '扩展属性',
     field: 'extraProperties',
@@ -98,6 +82,29 @@ export const Invoicingcalendar = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: false,
     isForm:false,
   },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+    isTable: true,
+  },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    isTable: true,
+    isForm:false,
+  },
   {
     label: '操作',
     field: 'action',

src/views/wms/supplierManage/supplierApbalance/supplierApbalanceDetail/supplierApbalanceDetail.data.ts

@@ -211,7 +211,6 @@ export const SupplierApbalanceDetail = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
   },
   {
     label: '备注',

src/views/wms/supplierManage/supplierApbalance/supplierApbalanceMain/supplierApbalanceMain.data.ts

@@ -159,7 +159,7 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
     formatter: dateFormatter,
     isSearch: false,
-    isTable: false,
+    isTable: true,
     isForm:false,
     isDetail:false,
     search: {
@@ -170,7 +170,15 @@ export const SupplierApbalanceMain = useCrudSchemas(reactive<CrudSchema[]>([
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
-    isForm: false,
+  },
+  {
+    label: '创建人',
+    field: 'creator',
+    sort: 'custom',
+    isSearch: false,
+    isTable: true,
+    isForm:false,
+    isDetail:false,
   },
   {
     label: '部门id',