From af5b27877bbb94ed4443772c4b226cef84315aa6 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 27 Nov 2024 09:41:58 +0800 Subject: [PATCH] =?UTF-8?q?YT-1283=E6=89=80=E6=9C=89=E5=8F=91=E8=BF=90?= =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=A8=A1=E5=9D=97=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E8=80=85?= =?UTF-8?q?=EF=BC=8C=E6=9C=80=E5=90=8E=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=86=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerSaleInvoiceRecordMain.data.ts | 54 ++++++++++--------- .../customerSaleInvoiceRequestMain.data.ts | 54 ++++++++++--------- .../deliverRecordMain.data.ts | 35 +++++++++++- .../deliverRecordMain.data.ts | 33 ++++++++++++ .../customerStatementMain.data.ts | 44 +++++++++++++-- .../finishedShipmentMain.data.ts | 51 ++++++++++++++---- .../unfinishedShipmentMain.data.ts | 54 +++++++++++++++---- .../saleShipmentMainRecord.data.ts | 33 ++++++++++++ .../saleShipmentMain.data.ts | 6 ++- .../deliverRecordMain.data.ts | 33 ++++++++++++ .../stockupMainJob/stockupMainJob.data.ts | 33 ++++++++++++ .../stockupMainRecord.data.ts | 33 ++++++++++++ .../stockupMainRequest.data.ts | 21 ++++---- .../deliverRecordMain.data.ts | 33 ++++++++++++ 14 files changed, 429 insertions(+), 88 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts index f1b236a20..73d2355bb 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRecordMain/customerSaleInvoiceRecordMain.data.ts @@ -204,14 +204,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ field: 'remark', sort: 'custom', }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - isDetail:true, - isForm: false, - isTable:false - }, + { label: '创建时间', field: 'createTime', @@ -235,34 +228,45 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ } }, { - label: '更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', - isDetail:true, + isDetail: true, isForm: false, - isTable:false + isTable: false }, { - label: '更新时间', + label: '最后更新时间', field: 'updateTime', - sort: 'custom', formatter: dateFormatter, - search: { + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { 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')] + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' } }, - detail: { - dateFormat : 'YYYY-MM-DD HH:mm:ss' + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 }, - isTable:false, - isForm: false, - table:{ - width:180 - } + isTable: false, + isForm: false }, ])) // 表单校验 diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 4d3d7ceab..62a578423 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -232,14 +232,7 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ width:150 } }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - isDetail:true, - isForm: false, - isTable:false - }, + { label: '创建时间', field: 'createTime', @@ -263,34 +256,45 @@ export const CustomerSaleInvoiceMain = useCrudSchemas(reactive([ } }, { - label: '更新者', - field: 'updater', + label: '创建者', + field: 'creator', sort: 'custom', - isDetail:true, + isDetail: true, isForm: false, - isTable:false + isTable: false }, { - label: '更新时间', + label: '最后更新时间', field: 'updateTime', - sort: 'custom', formatter: dateFormatter, - search: { + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { 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')] + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' } }, - detail: { - dateFormat : 'YYYY-MM-DD HH:mm:ss' + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 }, - isTable:false, - isForm: false, - table:{ - width:180 - } + isTable: false, + isForm: false }, { label: '操作', diff --git a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 0741ab595..0e0bbf52c 100644 --- a/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/directSupplyPinRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -149,7 +149,40 @@ export const DeliverRecordMain = useCrudSchemas( table: { width: 150 }, - isTable: false + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false }, // { // label: '代码', diff --git a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 71dd8f3e0..95800549b 100644 --- a/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -160,6 +160,39 @@ export const DeliverRecordMain = useCrudSchemas( isTable: false, isForm: false, }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, // { // label: '代码', // field: 'code', diff --git a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts index 1a5904214..7bcf999d0 100644 --- a/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts +++ b/src/views/wms/deliversettlementManage/moldAllocation/customerStatement/customerStatementMain.data.ts @@ -120,11 +120,7 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ } }, }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - }, + { label: '创建时间', field: 'createTime', @@ -157,6 +153,44 @@ export const CustomerStatementMain = useCrudSchemas(reactive([ } }, }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '操作', isDetail:false, diff --git a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts index 9e3d5cd5b..7a7f6347e 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts @@ -61,15 +61,6 @@ export const FinishedShipmentMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - isDetail:true, - isForm: false, - isTable:true, - sortTableDefault:10000 - }, { label: '创建时间', field: 'createTime', @@ -94,6 +85,48 @@ export const FinishedShipmentMain = useCrudSchemas(reactive([ sortTableDefault:10000 }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + sortTableDefault: 10000 + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '操作', field: 'action', diff --git a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts index ec741d418..5d65c3b3d 100644 --- a/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts @@ -53,16 +53,7 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive([ }, isSearch: true }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - isDetail:true, - isForm: false, - isTable:true, - sortTableDefault:10000 - - }, + { label: '创建时间', field: 'createTime', @@ -87,6 +78,49 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive([ sortTableDefault:10000 }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: true, + sortTableDefault: 10000 + + }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '操作', field: 'action', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts index 6afc3ec22..f63c89bb0 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRecord/saleShipmentMainRecord.data.ts @@ -166,6 +166,39 @@ export const SaleShipmentMainRecord = useCrudSchemas(reactive([ isForm: false, isTable: true }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '地点ID', field: 'siteId', diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index b9117e79d..90a1ff035 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -247,7 +247,8 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ }, isForm: false, isTableForm: false, - isTable: true + isTable: true, + sortTableDefault: 1000, }, { label: '创建者', @@ -256,7 +257,8 @@ export const SaleShipmentMain = useCrudSchemas(reactive([ width: 130 }, isForm: false, - isTable: true + isTable: true, + sortTableDefault:1000, }, { label: '最后更新时间', diff --git a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 54ddf8364..ad899a5b8 100644 --- a/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -168,6 +168,39 @@ export const DeliverRecordMain = useCrudSchemas( // width: 150 // }, // }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '是否可用', field: 'available', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts index 359674d44..46e69539a 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainJob/stockupMainJob.data.ts @@ -435,6 +435,39 @@ export const StockupMainJob = useCrudSchemas(reactive([ isForm: false, isTable: true }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '操作', field: 'action', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 4e5ad182a..b44e8459e 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -261,6 +261,39 @@ export const StockupMainRecord = useCrudSchemas(reactive([ isForm: false, isTable: true }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, { label: '部门', field: 'departmentCode', diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts index e1506338b..8fcd1fcd1 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts @@ -203,36 +203,35 @@ export const StockupMainRequest = useCrudSchemas(reactive([ { label: '最后更新时间', field: 'updateTime', - sort: 'custom', - isDetail: true, - isForm: false, - isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + sort: 'custom', table: { width: 180 }, + isTable: false, form: { component: 'DatePicker', componentProps: { - style: {width:'100%'}, + style: { width: '100%' }, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', + valueFormat: 'x' } - } + }, + isForm: false }, { label: '最后更新者', field: 'updater', - isDetail: true, - isForm: false, - isTable: false, + sort: 'custom', table: { width: 150 - } + }, + isTable: false, + isForm: false }, { label: '发货日期', diff --git a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts index 4340d7d6f..4bb68796e 100644 --- a/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/deliverRecordMain.data.ts @@ -160,6 +160,39 @@ export const DeliverRecordMain = useCrudSchemas( isTable: false, isForm: false, }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: false, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, + isForm: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isTable: false, + isForm: false + }, // { // label: '代码', // field: 'code',