From 7f42a1f70d16acc1f6fa1fef8c529fa670b97f15 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Mon, 24 Jun 2024 10:18:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=92=8C?= =?UTF-8?q?=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=20=E5=88=9B=E5=BB=BA=E4=BA=BA=20=E5=88=9B=E5=BB=BA=E6=97=B6?= =?UTF-8?q?=E9=97=B4=20=E6=9B=B4=E6=96=B0=E4=BA=BA=EF=BC=8C=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agvLocationrelation.data.ts | 67 +++++++++-- .../customerManage/customer/customer.data.ts | 51 +++++++-- .../customerdock/customerdock.data.ts | 51 +++++++-- .../customeritem/customeritem.data.ts | 53 +++++++-- .../customerManage/project/project.data.ts | 53 +++++++-- .../saleprice/saleprice.data.ts | 49 ++++++-- .../businesstype/businesstype.data.ts | 107 +++++++++++------- .../documentsetting/documentsetting.data.ts | 99 ++++++++++------ .../jobsetting/jobsetting.data.ts | 65 ++++++++--- .../plansetting/plansetting.data.ts | 69 +++++++---- .../recordsetting/recordsetting.data.ts | 91 ++++++++++----- .../requestsetting/requestsetting.data.ts | 69 +++++++---- .../documentSetting/switch/switch.data.ts | 69 ++++++++++- .../transactiontype/transactiontype.data.ts | 61 ++++++++-- .../areabasic/areabasic.data.ts | 54 +++++++-- .../factoryModeling/dock/dock.data.ts | 53 +++++++-- .../factoryModeling/location/location.data.ts | 53 +++++++-- .../locationgroup/locationgroup.data.ts | 51 +++++++-- .../factoryModeling/process/process.data.ts | 61 +++++++--- .../productionline/productionline.data.ts | 63 ++++++++--- .../warehouse/warehouse.data.ts | 53 +++++++-- .../factoryModeling/workshop/workshop.data.ts | 61 ++++++++-- .../workstation/workstation.data.ts | 57 +++++++--- .../itemManage/bom/bom.data.ts | 40 ++++++- .../itemManage/itembasic/itembasic.data.ts | 67 ++++++++--- .../itempackage/itempackage.data.ts | 18 +-- .../itemwarehouse/itemwarehouse.data.ts | 51 +++++++++ .../packageunit/packageunit.data.ts | 46 ++++++++ .../productionlineitem.data.ts | 38 ++++++- .../stdcostprice/stdcostprice.data.ts | 40 ++++++- .../labelManage/barcode/barcode.data.ts | 66 +++++++++++ .../callmaterials/callmaterials.data.ts | 70 ++++++++---- .../labelManage/labeltype/labeltype.data.ts | 67 ++++++++++- .../locationLabel/locationLabel.data.ts | 64 +++++++++++ .../manufacturePackage.data.ts | 66 ++++++++++- .../purchasePackage/purchasePackage.data.ts | 33 +++++- .../utensilPackage/utensilPackage.data.ts | 66 ++++++++++- .../orderManage/carrier/carrier.data.ts | 51 +++++++-- .../orderManage/owner/owner.data.ts | 51 +++++++-- .../orderManage/shift/shift.data.ts | 49 ++++++-- .../orderManage/team/team.data.ts | 48 ++++++-- .../purchaseprice/purchaseprice.data.ts | 51 +++++++-- .../supplierManage/supplier/supplier.data.ts | 42 +++++-- .../supplieritem/supplieritem.data.ts | 41 +++++-- .../accountcalendar/accountcalendar.data.ts | 63 ++++++++--- .../currencyexchange/currencyexchange.data.ts | 55 +++++++-- .../systemcalendar/systemcalendar.data.ts | 61 +++++++--- .../mesBarCode/mesBarCode.data.ts | 59 ++++++++-- .../inventoryManage/expectin/expectin.data.ts | 33 ++++++ .../expectout/expectout.data.ts | 33 ++++++ .../transaction/transaction.data.ts | 35 +++++- .../transferlog/transferlog.data.ts | 33 ++++++ .../issue/issueJobMain/issueJobMain.data.ts | 42 ++++++- .../issueRecordMain/issueRecordMain.data.ts | 58 ++++++++-- .../issueRequestMain/issueRequestMain.data.ts | 10 +- .../productionreceiptJobMain.data.ts | 6 +- .../productionreceiptRecordMain.data.ts | 48 ++++++-- .../productionreturnJobMain.data.ts | 6 +- .../productionreturnRecordMain.data.ts | 46 +++++++- .../productionreturnRequestMain.data.ts | 12 +- .../productionreturnRequestMainNo.data.ts | 8 +- .../repleinshJobMain/repleinshJobMain.data.ts | 4 +- .../repleinshRecordMain.data.ts | 40 ++++++- .../repleinshRequestMain.data.ts | 10 +- .../productdismantleRecordMain.data.ts | 40 ++++++- .../productionMain/productionMain.data.ts | 4 +- .../productionMainAssemble.data.ts | 6 +- .../productionMainAssembleSparePart.data.ts | 6 +- .../productionMainPredictSparePart.data.ts | 4 +- .../productreceiptJobMain.data.ts | 2 +- .../productreceiptRecordMain.data.ts | 44 ++++++- .../productreceiptRequestMain.data.ts | 6 +- .../productreceiptAssembleRecordMain.data.ts | 42 ++++++- .../productreceiptAssembleRequestMain.data.ts | 11 +- .../productreceiptscrapRecordMain.data.ts | 44 ++++++- .../productredressJobMain.data.ts | 10 +- .../productredressRecordMain.data.ts | 16 +-- .../productredressRequestMain.data.ts | 10 +- .../productrepairRecordMain.data.ts | 38 ++++++- .../productrepairRequestMain.data.ts | 10 +- .../productscrapRecordMain.data.ts | 42 ++++++- .../productscrapRequestMain.data.ts | 4 +- .../purchasereceiptJobMain.data.ts | 37 +++++- .../purchasereceiptRecordMain.data.ts | 78 +++++++++++-- .../purchasereceiptRequestMain.data.ts | 57 +++++++--- .../purchasereturnJobMain.data.ts | 8 +- .../purchasereturnRecordMain.data.ts | 12 +- .../purchasereturnRequestMain.data.ts | 107 +++++++++++------- .../putawayJobMain/putawayJobMain.data.ts | 50 ++++++-- .../putawayRecordMain.data.ts | 52 +++++++-- .../putawayRequestMain.data.ts | 57 +++++++--- .../sparereceiptRecordMain.data.ts | 14 +-- .../sparereceiptRequestMain.data.ts | 105 +++++++++++------ .../purchaseclaimRecordMain.data.ts | 42 +++---- .../purchaseclaimRequestMain.data.ts | 9 +- 95 files changed, 3349 insertions(+), 805 deletions(-) diff --git a/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts b/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts index 656e96bf8..7c26a4bdc 100644 --- a/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts +++ b/src/views/wms/agvManage/agvLocationrelation/agvLocationrelation.data.ts @@ -113,30 +113,75 @@ export const AgvLocationrelation = useCrudSchemas(reactive([ } } }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + }, { label: '创建时间', field: 'createTime', - sort: 'custom', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, - isSearch: true, - search: { + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + 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', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - isForm: false, + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } }, { - label: '备注', - field: 'remark', - sort: 'custom', - isSearch: false, + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } }, { label: '操作', diff --git a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts index b66cbc76d..e99169502 100644 --- a/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customer/customer.data.ts @@ -211,12 +211,44 @@ export const Customer = useCrudSchemas(reactive([ { 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: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - sort: 'custom', table: { width: 180 }, @@ -228,18 +260,17 @@ export const Customer = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false + } }, { - label: '创建者', - field: 'creator', - sort: 'custom', + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, table: { width: 150 - }, - isForm: false, - isTable: false + } }, { label: '操作', @@ -300,4 +331,4 @@ export const CustomerRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 3d2e53e22..6ba5ac483 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -239,16 +239,47 @@ export const Customerdock = useCrudSchemas(reactive([ { 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: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - sort: 'custom', table: { width: 180 }, - isSearch: false, form: { component: 'DatePicker', componentProps: { @@ -257,19 +288,17 @@ export const Customerdock = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, + } }, { - label: '创建者', - field: 'creator', - isSearch: false, - isTable: false, + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, - sort: 'custom', + isTable: false, table: { width: 150 - }, + } }, { label: '操作', @@ -327,4 +356,4 @@ export const CustomerdockRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts index df7d8de52..fee2ec949 100644 --- a/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts @@ -251,13 +251,13 @@ export const Customeritem = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 150 + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, form: { component: 'DatePicker', @@ -267,19 +267,50 @@ export const Customeritem = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, - isForm: false + table: { + width: 150 + } }, { label: '操作', @@ -320,4 +351,4 @@ export const CustomeritemRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/customerManage/project/project.data.ts b/src/views/wms/basicDataManage/customerManage/project/project.data.ts index 3ce4977d6..622fbb5ed 100644 --- a/src/views/wms/basicDataManage/customerManage/project/project.data.ts +++ b/src/views/wms/basicDataManage/customerManage/project/project.data.ts @@ -122,14 +122,14 @@ export const Project = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -138,19 +138,50 @@ export const Project = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false, + } }, { label: '创建者', field: 'creator', - sort: 'custom', table: { - width: 150 + width: 130 }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, isTable: false, + 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: false, + table: { + width: 150 + } }, { label: '操作', @@ -180,4 +211,4 @@ export const ProjectRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts index 25f750122..b11dd0df9 100644 --- a/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts +++ b/src/views/wms/basicDataManage/customerManage/saleprice/saleprice.data.ts @@ -173,14 +173,14 @@ export const Saleprice = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -189,19 +189,50 @@ export const Saleprice = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false, + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, + table: { + width: 150 + } }, { label: '操作', diff --git a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts index 71710f119..1da7b2914 100644 --- a/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/businesstype/businesstype.data.ts @@ -39,7 +39,7 @@ export const Businesstype = useCrudSchemas(reactive([ } } }, - + { label: '可用物料类型范围', field: 'itemTypes', @@ -261,29 +261,6 @@ export const Businesstype = useCrudSchemas(reactive([ } }, }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isTable: false, - isForm: false, - }, { label: '描述', field: 'description', @@ -292,7 +269,7 @@ export const Businesstype = useCrudSchemas(reactive([ width: 150 }, }, - { + { label: '备注', field: 'remark', sort: 'custom', @@ -300,18 +277,8 @@ export const Businesstype = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '创建者', - field: 'creator', - isTable: false, - isForm: false, - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '是否可用', + { + label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', @@ -330,6 +297,70 @@ export const Businesstype = useCrudSchemas(reactive([ } }, }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -376,4 +407,4 @@ export const BusinesstypeRules = reactive({ onTheWayArea: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts index 403fd4ce6..40165f836 100644 --- a/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/documentsetting/documentsetting.data.ts @@ -157,19 +157,45 @@ export const Documentsetting = useCrudSchemas(reactive([ } }, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + isTable: false, + isForm: false + }, { label: '创建时间', field: 'createTime', - isTable: false, - formatter: dateFormatter, isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -178,45 +204,50 @@ export const Documentsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } }, - { - label: '备注', - field: 'remark', - sort: 'custom', + { + label: '创建者', + field: 'creator', table: { - width: 150 + width: 130 }, - }, - { - label: '创建者', - field: 'creator', - isTable: false, isForm: false, - sort: 'custom', - table: { - width: 150 - }, + isTable: true }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + width: 180 }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, isTable: false, - isForm: false + table: { + width: 150 + } }, { label: '操作', @@ -271,4 +302,4 @@ export const DocumentsettingRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts index 16eb4f37b..a50809ca0 100644 --- a/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/jobsetting/jobsetting.data.ts @@ -310,19 +310,25 @@ export const Jobsetting = useCrudSchemas(reactive([ } }, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', - formatter: dateFormatter, isForm: false, - isTable: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -331,25 +337,50 @@ export const Jobsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true }, - { - label: '备注', - field: 'remark', + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + width: 180 }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } }, - { - label: '创建者', - field: 'creator', - isTable: false, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, - sort: 'custom', + isTable: false, table: { width: 150 - }, + } }, { label: '操作', @@ -405,4 +436,4 @@ export const JobsettingRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts index 07ac11277..dc0df6732 100644 --- a/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/plansetting/plansetting.data.ts @@ -178,19 +178,27 @@ export const Plansetting = useCrudSchemas(reactive([ } }, }, + { + label: '备注', + field: 'remark', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - isTable: false, isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -199,27 +207,50 @@ export const Plansetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true }, - { - label: '备注', - field: 'remark', - isTable: true, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + width: 180 }, - isSearch: true, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } }, - { - label: '创建者', - field: 'creator', - isTable: false, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, - sort: 'custom', + isTable: false, table: { width: 150 - }, + } }, { label: '操作', @@ -257,4 +288,4 @@ export const PlansettingRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts index 83f73a421..e14cac633 100644 --- a/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/recordsetting/recordsetting.data.ts @@ -68,16 +68,39 @@ export const Recordsetting = useCrudSchemas(reactive([ } }, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + }, + { + label: '是否可用', + field: 'available', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + sort: 'custom', + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + isTable: false, + isForm: false, + }, { label: '创建时间', field: 'createTime', - isTable: false, - formatter: dateFormatter, isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, - sort: 'custom', form: { component: 'DatePicker', componentProps: { @@ -86,36 +109,50 @@ export const Recordsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', + } }, - { - label: '创建者', - field: 'creator', - isTable: false, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, isForm: false, - sort: 'custom', + isTable: true }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + table: { + width: 180 + }, form: { - component: 'Switch', - value: 'TRUE', + component: 'DatePicker', componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', } - }, - isTable: false, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, + isTable: false, + table: { + width: 150 + } }, { label: '操作', @@ -140,4 +177,4 @@ export const RecordsettingRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts index 9d776a2de..9bdad8a12 100644 --- a/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/requestsetting/requestsetting.data.ts @@ -178,19 +178,27 @@ export const Requestsetting = useCrudSchemas(reactive([ } }, }, + { + label: '备注', + field: 'remark', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + }, { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - isTable: false, isForm: false, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -199,27 +207,50 @@ export const Requestsetting = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true }, - { - label: '备注', - field: 'remark', - isTable: true, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + width: 180 }, - isSearch: true, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } }, - { - label: '创建者', - field: 'creator', - isTable: false, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, - sort: 'custom', + isTable: false, table: { width: 150 - }, + } }, { label: '操作', @@ -257,4 +288,4 @@ export const RequestsettingRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts index 7e39cc083..3acd75e5b 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/switch/switch.data.ts @@ -1,5 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' - +import { dateFormatter } from '@/utils/formatTime' +const { t } = useI18n() // 国际化 /** * @returns {Array} 单据开关 */ @@ -61,6 +62,70 @@ export const Switch = useCrudSchemas(reactive([ } }, }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -86,4 +151,4 @@ export const SwitchRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts index 1bec72c46..1e36faade 100644 --- a/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts +++ b/src/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data.ts @@ -137,13 +137,14 @@ export const Transactiontype = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, - sort: 'custom', - isTable: false, - isForm: false, form: { component: 'DatePicker', componentProps: { @@ -152,18 +153,54 @@ export const Transactiontype = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true }, - { - label: '备注', - field: 'remark', + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: 'creator', - isTable: false, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, + isTable: false, + table: { + width: 150 + } + }, + { + label: '备注', + field: 'remark', sort: 'custom', }, { @@ -197,4 +234,4 @@ export const TransactiontypeRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index 1e94bd35b..2470bc8c8 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -173,14 +173,14 @@ export const Area = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -189,19 +189,50 @@ export const Area = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, - isForm: false + table: { + width: 150 + } }, { label: '操作', @@ -243,4 +274,5 @@ export const AreaRules = reactive({ manageMode: [ { required: true, message: '请选择管理精度', trigger: 'change' } ] -}) \ No newline at end of file +}) + diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts index a86ae434c..ff90736b8 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/dock/dock.data.ts @@ -203,13 +203,13 @@ export const Dock = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 150 + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, form: { component: 'DatePicker', @@ -219,19 +219,50 @@ export const Dock = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, - isForm: false + table: { + width: 150 + } }, { label: '操作', @@ -283,4 +314,4 @@ export const DockRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index a4b114c53..2da883598 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -335,14 +335,14 @@ export const Location = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -351,19 +351,50 @@ export const Location = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false + isTable: false, + table: { + width: 150 + } }, { label: '操作', @@ -420,4 +451,4 @@ export const LocationRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts index 8120fc099..2c9834e99 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts @@ -165,14 +165,14 @@ export const Locationgroup = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -181,19 +181,50 @@ export const Locationgroup = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false + isTable: false, + table: { + width: 150 + } }, { label: '操作', @@ -229,4 +260,4 @@ export const LocationgroupRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts index dd969d580..389ad3266 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts @@ -168,11 +168,44 @@ export const Process = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -184,27 +217,25 @@ export const Process = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, - { - label: '备注', - field: 'remark', - sort: 'custom', + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, table: { width: 150 - }, + } }, - { - label: '创建者', - field: 'creator', + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTable: false, - isForm: false }, { label: '操作', @@ -240,4 +271,4 @@ export const ProcessRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts index 1fd952bda..7ea279769 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/productionline.data.ts @@ -186,14 +186,14 @@ export const Productionline = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -202,27 +202,58 @@ export const Productionline = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, - isTable: false, - isForm: false + isForm: false, + isTable: true }, - { - label: '备注', - field: 'remark', + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: 'creator', + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } + }, + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 180 }, - isTable: false, - isForm: false }, { label: '操作', @@ -255,4 +286,4 @@ export const ProductionlineRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts index cdf170b44..ffb93df3e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/warehouse.data.ts @@ -123,14 +123,14 @@ export const Warehouse = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -139,19 +139,50 @@ export const Warehouse = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, - isForm: false + table: { + width: 150 + } }, { label: '操作', @@ -184,4 +215,4 @@ export const WarehouseRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts index ac2dccee5..b7ea81be4 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workshop/workshop.data.ts @@ -91,11 +91,14 @@ export const Workshop = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, - sort: 'custom', form: { component: 'DatePicker', componentProps: { @@ -104,21 +107,55 @@ export const Workshop = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, isForm: false, - isTable: false + isTable: true }, - { - label: '备注', - field: 'remark', + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: 'creator', - sort: 'custom', + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, - isTable: false + isTable: false, + table: { + width: 150 + } + }, + { + label: '备注', + field: 'remark', + sort: 'custom', }, { label: '操作', @@ -148,4 +185,4 @@ export const WorkshopRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index 27ed53762..1f8038226 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -237,11 +237,44 @@ export const Workstation = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -253,27 +286,25 @@ export const Workstation = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, isTable: false, - }, - { - label: '备注', - field: 'remark', - sort: 'custom', table: { width: 150 - }, + } }, - { - label: '创建者', - field: 'creator', + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isForm: false, - isTable: false, }, { label: '操作', diff --git a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts index f33ea742b..f2888fc7f 100644 --- a/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts +++ b/src/views/wms/basicDataManage/itemManage/bom/bom.data.ts @@ -9,7 +9,7 @@ import { Process } from '../../factoryModeling/process/process.data' const { t } = useI18n() // 国际化 -/** +/** * @returns {Array} 基础物料清单 */ export const Bom = useCrudSchemas(reactive([ @@ -217,7 +217,41 @@ export const Bom = useCrudSchemas(reactive([ label: '创建者', field: 'creator', isForm: false, - isTable: false + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } }, { label: '备注', field: 'remark', isTable: false }, { @@ -264,4 +298,4 @@ export const BomRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index c9c072358..3024c7a55 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -8,8 +8,8 @@ import {validateYS} from '@/utils/validator' * @returns {Array} 基础物料信息 */ export const Itembasic = useCrudSchemas(reactive([ - { - label: '代码', + { + label: '代码', field: 'code', sort: 'custom', isSearch: true, @@ -18,8 +18,8 @@ export const Itembasic = useCrudSchemas(reactive([ fixed: 'left' }, }, - { - label: '名称', + { + label: '名称', field: 'name', sort: 'custom', isSearch: true, @@ -27,8 +27,8 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '描述1', + { + label: '描述1', field: 'desc1', sort: 'custom', table: { @@ -36,8 +36,8 @@ export const Itembasic = useCrudSchemas(reactive([ } , // isTableForm:false }, - { - label: '描述2', + { + label: '描述2', field: 'desc2', sort: 'custom', table: { @@ -292,9 +292,9 @@ export const Itembasic = useCrudSchemas(reactive([ width: 100 } , }, - { - label: '结算方式', - field: 'settlementType', + { + label: '结算方式', + field: 'settlementType', dictType: DICT_TYPE.SETTLEMENT_TYPE, dictClass: 'string', sort: 'custom', @@ -303,9 +303,9 @@ export const Itembasic = useCrudSchemas(reactive([ width: 120 } , }, - { - label: '项目', - field: 'project', + { + label: '项目', + field: 'project', sort: 'custom', table: { width: 100 @@ -322,9 +322,9 @@ export const Itembasic = useCrudSchemas(reactive([ width: 120 } , }, - { - label: '有效天数', - field: 'validityDays', + { + label: '有效天数', + field: 'validityDays', sort: 'custom', table: { width: 120 @@ -432,6 +432,37 @@ export const Itembasic = useCrudSchemas(reactive([ label: '创建者', field: 'creator', isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isTable: false, + isDetail: true, + formatter: dateFormatter, + isForm: false, + 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: false }, { label: '备注', field: 'remark', sort: 'custom', isTable: false}, @@ -497,4 +528,4 @@ export const rules = reactive({ { required: true, message: '请选择是否可用', trigger: 'change' }, ], }) -console.log(Itembasic) \ No newline at end of file +console.log(Itembasic) diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts index 465d47ca5..2960978c6 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts @@ -11,8 +11,8 @@ const { t } = useI18n() // 国际化 * @returns {Array} 基础包装信息 */ export const Itempackaging = useCrudSchemas(reactive([ - { - label: '物料代码', + { + label: '物料代码', field: 'itemCode', sort: 'custom', isSearch: true, @@ -82,8 +82,8 @@ export const Itempackaging = useCrudSchemas(reactive([ } } }, - { - label: '包装名称', + { + label: '包装名称', field: 'packName', sort: 'custom', isSearch: true, @@ -95,8 +95,8 @@ export const Itempackaging = useCrudSchemas(reactive([ isForm:false, isDetail:false }, - { - label: '包装数量', + { + label: '包装数量', field: 'packQty', sort: 'custom', isSearch: true, @@ -209,8 +209,9 @@ export const Itempackaging = useCrudSchemas(reactive([ label: '最后更新时间', field: 'updateTime', sort: 'custom', + isDetail: true, isForm: false, - isTable: true, + isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -231,8 +232,9 @@ export const Itempackaging = useCrudSchemas(reactive([ { label: '最后更新者', field: 'updater', + isDetail: true, isForm: false, - isTable: true, + isTable: false, table: { width: 150 } diff --git a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts index 0d3f55203..2a2c7ab1a 100644 --- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/itemwarehouse.data.ts @@ -153,9 +153,60 @@ export const Itemwarehouse = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + 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', + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, 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: false, + table: { + width: 150 + } }, { label: '删除时间', diff --git a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts index 9dba024a8..8572f2373 100644 --- a/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts +++ b/src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts @@ -196,6 +196,46 @@ export const Packageunit = useCrudSchemas(reactive([ formatter: dateFormatter, isForm: false, }, + { + label: '创建者', + field: 'creator', + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, { label: '备注', field: 'remark', @@ -210,6 +250,7 @@ export const Packageunit = useCrudSchemas(reactive([ sort: 'custom', isForm: false, isTable: false, + isDetail: false, table: { width: 180 }, @@ -226,6 +267,7 @@ export const Packageunit = useCrudSchemas(reactive([ label: '删除者', field: 'deleterId', sort: 'custom', + isDetail: false, isForm: false, isTable: false, table: { @@ -237,6 +279,7 @@ export const Packageunit = useCrudSchemas(reactive([ field: 'extraProperties', sort: 'custom', isForm: false, + isDetail: false, isTable: false, table: { width: 150 @@ -247,6 +290,7 @@ export const Packageunit = useCrudSchemas(reactive([ field: 'concurrencyStamp', sort: 'custom', isForm: false, + isDetail: false, isTable: false, table: { width: 150 @@ -261,6 +305,7 @@ export const Packageunit = useCrudSchemas(reactive([ field: 'siteId', sort: 'custom', isForm: false, + isDetail: false, isTable: false, table: { width: 150 @@ -270,6 +315,7 @@ export const Packageunit = useCrudSchemas(reactive([ label: '操作', field: 'action', isForm: false, + isDetail: false, table: { width: 150, fixed: 'right' diff --git a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts index a4c1cbe2a..d742e6692 100644 --- a/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts +++ b/src/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data.ts @@ -229,7 +229,41 @@ export const Productionlineitem = useCrudSchemas(reactive([ label: '创建者', field: 'creator', isForm: false, - isTable: false + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } }, { label: '操作', @@ -260,4 +294,4 @@ export const ProductionlineitemRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts index 3f47c6aaa..6dca2f1d6 100644 --- a/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts +++ b/src/views/wms/basicDataManage/itemManage/stdcostprice/stdcostprice.data.ts @@ -70,7 +70,7 @@ export const Stdcostprice = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }] } } }, @@ -182,7 +182,41 @@ export const Stdcostprice = useCrudSchemas(reactive([ label: '创建者', field: 'creator', isForm: false, - isTable: false + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } }, { label: '备注', @@ -221,4 +255,4 @@ export const StdcostpriceRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts index f8b2e383e..118ac63be 100644 --- a/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts +++ b/src/views/wms/basicDataManage/labelManage/barcode/barcode.data.ts @@ -1,4 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +const { t } = useI18n() // 国际化 // 表单校验 export const BarcodeRules = reactive({ @@ -143,6 +145,70 @@ export const Barcode = useCrudSchemas(reactive([ } }, }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 13d17aeec..14fc57a8d 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -161,7 +161,7 @@ export const Callmaterials = useCrudSchemas(reactive([ }, tableForm: { disabled: true, - type: 'Select' + type: 'Select' }, form: { componentProps: { @@ -271,7 +271,7 @@ export const Callmaterials = useCrudSchemas(reactive([ key:'available', value:'TRUE', isMainValue: false - }] + }] } }, tableForm:{ @@ -295,7 +295,7 @@ export const Callmaterials = useCrudSchemas(reactive([ key:'available', value:'TRUE', isMainValue: false - }] + }] }, }, { @@ -354,48 +354,68 @@ export const Callmaterials = useCrudSchemas(reactive([ // } // } }, - { - label: '创建者id', - field: 'creator', - sort: 'custom', - isForm: false, - table: { - width: 180, - } - }, { label: '创建时间', field: 'createTime', - sort: 'custom', - formatter: dateFormatter, isForm: false, + table: { + width: 180 + }, + formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: '最后更新者id', - field: 'updater', - sort: 'custom', - isForm: false, + label: '创建者', + field: 'creator', table: { - width: 180, - } + width: 130 + }, + isForm: false, + isTable: true }, { label: '最后更新时间', field: 'updateTime', sort: 'custom', - formatter: dateFormatter, + isDetail: true, isForm: false, + isTable: false, + formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, table: { - width: 180, + 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: false, + table: { + width: 150 } }, { diff --git a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts index 86cae88d4..06f17ce22 100644 --- a/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts +++ b/src/views/wms/basicDataManage/labelManage/labeltype/labeltype.data.ts @@ -1,5 +1,6 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' - +import { dateFormatter } from '@/utils/formatTime' +const { t } = useI18n() // 国际化 // 表单校验 export const LabeltypeRules = reactive({ labelCode: [ @@ -178,6 +179,70 @@ export const Labeltype = useCrudSchemas(reactive([ } }, }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts index 43008e207..3cb66d40a 100644 --- a/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts +++ b/src/views/wms/basicDataManage/labelManage/locationLabel/locationLabel.data.ts @@ -91,6 +91,70 @@ export const Package = useCrudSchemas(reactive([ width: 170, } }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index b024a46b7..d8897e8e1 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -101,6 +101,70 @@ export const Package = useCrudSchemas(reactive([ width: 180, } }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -509,4 +573,4 @@ export const PackageRulesInventor = reactive({ productionLineCodePackage: [ { required: true, message: '请选择生产线代码', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts index 7d146bd69..acbfe228d 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/purchasePackage.data.ts @@ -110,6 +110,36 @@ export const Package = useCrudSchemas(reactive([ width: 180, } }, + { + 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: 'action', @@ -604,6 +634,7 @@ export const PackageInventory = useCrudSchemas(reactive([ } } }, + { label: '操作', field: 'action', @@ -665,4 +696,4 @@ export const PackageRulesInventor = reactive({ asnNumber: [ { required: true, message: '请选择发货单号', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts index 75716a2f4..252706b55 100644 --- a/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/utensilPackage/utensilPackage.data.ts @@ -103,6 +103,70 @@ export const Package = useCrudSchemas(reactive([ width: 180, } }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -112,4 +176,4 @@ export const Package = useCrudSchemas(reactive([ fixed: 'right' } } -])) \ No newline at end of file +])) diff --git a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts index ed31a233b..f12d20073 100644 --- a/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts +++ b/src/views/wms/basicDataManage/orderManage/carrier/carrier.data.ts @@ -210,13 +210,13 @@ export const Carrier = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 150 + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, form: { component: 'DatePicker', @@ -226,19 +226,50 @@ export const Carrier = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false, + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, + table: { + width: 150 + } }, { label: '操作', @@ -298,4 +329,4 @@ export const CarrierRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts index 42c9ed7f8..d5425e739 100644 --- a/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts +++ b/src/views/wms/basicDataManage/orderManage/owner/owner.data.ts @@ -209,14 +209,14 @@ export const Owner = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -225,19 +225,50 @@ export const Owner = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false, + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, + table: { + width: 150 + } }, { label: '操作', @@ -298,4 +329,4 @@ export const OwnerRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index a4b7220b0..df23c425a 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -182,14 +182,14 @@ export const Shift = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -198,19 +198,50 @@ export const Shift = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false, + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, + table: { + width: 150 + } }, { label: '操作', diff --git a/src/views/wms/basicDataManage/orderManage/team/team.data.ts b/src/views/wms/basicDataManage/orderManage/team/team.data.ts index c3b374686..05adb9ea6 100644 --- a/src/views/wms/basicDataManage/orderManage/team/team.data.ts +++ b/src/views/wms/basicDataManage/orderManage/team/team.data.ts @@ -140,11 +140,44 @@ export const Team = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -156,16 +189,17 @@ export const Team = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false, + } }, { - label: '创建者', - field: 'creator', - sort: 'custom', + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, isTable: false, + table: { + width: 150 + } }, { label: '操作', diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts index 9376f8797..a92e56d5f 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts @@ -67,7 +67,7 @@ export const Purchaseprice = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false - }] + }] } } }, @@ -165,13 +165,44 @@ export const Purchaseprice = useCrudSchemas(reactive([ { 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: false, - isForm:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - sort: 'custom', table: { width: 180 }, @@ -183,16 +214,16 @@ export const Purchaseprice = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } }, { - label: '创建者', - field: 'creator', + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, isTable: false, - isForm:false, - sort: 'custom', table: { - width: 180 + width: 150 } }, { @@ -235,4 +266,4 @@ export const PurchasepriceRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts index e08c9a14d..2508b2d78 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplier/supplier.data.ts @@ -222,12 +222,10 @@ export const Supplier = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - sort: 'custom', - isTable: false, isForm: false, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat : 'YYYY-MM-DD HH:mm:ss' }, form: { component: 'DatePicker', @@ -237,17 +235,47 @@ export const Supplier = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - table: { - width: 180 } }, { label: '创建者', field: 'creator', + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, isTable: false, + 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: false, + table: { + width: 150 + } }, { label: '操作', @@ -310,4 +338,4 @@ export const SupplierRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts index dd6ae07f3..4f89e559f 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts @@ -262,13 +262,38 @@ export const Supplieritem = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - isTable: true, isForm: false, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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', + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -280,14 +305,14 @@ export const Supplieritem = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } }, { - label: '创建者', - field: 'creator', - isTable: true, + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, - sort: 'custom', + isTable: false, table: { width: 150 } @@ -336,4 +361,4 @@ export const SupplieritemRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts index 38b2b2720..7d383b84d 100644 --- a/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/accountcalendar/accountcalendar.data.ts @@ -42,7 +42,7 @@ export const Accountcalendar = useCrudSchemas(reactive([ valueField: 'value' } }, - + }, }, { @@ -213,11 +213,44 @@ export const Accountcalendar = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -229,27 +262,25 @@ export const Accountcalendar = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, - { - label: '备注', - field: 'remark', - sort: 'custom', + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, table: { width: 150 - }, + } }, - { - label: '创建者', - field: 'creator', + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTable: false, - isForm: false }, { label: '操作', @@ -289,4 +320,4 @@ export const AccountcalendarRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts index 3be3297ed..a0451761d 100644 --- a/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/currencyexchange/currencyexchange.data.ts @@ -122,11 +122,44 @@ export const Currencyexchange = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -138,20 +171,28 @@ export const Currencyexchange = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, isTable: false, + table: { + width: 150 + } }, - { - label: '备注', + { + label: '备注', field: 'remark', sort: 'custom', table: { width: 150 }, }, - { - label: '创建者', + { + label: '创建者', field: 'creator', sort: 'custom', table: { @@ -189,4 +230,4 @@ export const CurrencyexchangeRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts index ff2b24dda..4e41b2ff4 100644 --- a/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/systemcalendar/systemcalendar.data.ts @@ -146,11 +146,44 @@ export const Systemcalendar = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', + isForm: false, + table: { + width: 180 + }, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { width: 180 }, @@ -162,27 +195,25 @@ export const Systemcalendar = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isTable: false, - isForm: false + } }, - { - label: '备注', - field: 'remark', - sort: 'custom', + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, table: { width: 150 - }, + } }, - { - label: '创建者', - field: 'creator', + { + label: '备注', + field: 'remark', sort: 'custom', table: { width: 150 }, - isTable: false, - isForm: false }, { label: '操作', @@ -208,4 +239,4 @@ export const SystemcalendarRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts index 8c2c419f0..0124386fa 100644 --- a/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts +++ b/src/views/wms/buttMesManage/mesBarCode/mesBarCode.data.ts @@ -183,24 +183,67 @@ export const MesBarCode = useCrudSchemas(reactive([ }, { label: '创建时间', - field: 'createTime', - sort: 'custom', - formatter: dateFormatter, - table: { + field: 'createTime', + isForm: false, + table: { width: 180 }, - search: { + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, + 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', } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } }, { label: '备注', diff --git a/src/views/wms/inventoryManage/expectin/expectin.data.ts b/src/views/wms/inventoryManage/expectin/expectin.data.ts index 09cc33140..94ed80b46 100644 --- a/src/views/wms/inventoryManage/expectin/expectin.data.ts +++ b/src/views/wms/inventoryManage/expectin/expectin.data.ts @@ -129,6 +129,39 @@ export const Expectin = useCrudSchemas(reactive([ }, isForm: false }, + { + label: '更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false, + isTable: false + }, + { + label: '更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, ])) // 表单校验 diff --git a/src/views/wms/inventoryManage/expectout/expectout.data.ts b/src/views/wms/inventoryManage/expectout/expectout.data.ts index 7d890f472..2f06595b5 100644 --- a/src/views/wms/inventoryManage/expectout/expectout.data.ts +++ b/src/views/wms/inventoryManage/expectout/expectout.data.ts @@ -137,6 +137,39 @@ export const Expectout = useCrudSchemas(reactive([ }, isForm: false }, + { + label: '更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false, + isTable: false + }, + { + label: '更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, ])) // 表单校验 diff --git a/src/views/wms/inventoryManage/transaction/transaction.data.ts b/src/views/wms/inventoryManage/transaction/transaction.data.ts index b3ec24fd5..739f17ec6 100644 --- a/src/views/wms/inventoryManage/transaction/transaction.data.ts +++ b/src/views/wms/inventoryManage/transaction/transaction.data.ts @@ -33,7 +33,7 @@ export const Transaction = useCrudSchemas(reactive([ width: 150 }, }, - + { label: '业务类型', field: 'businessType', @@ -346,6 +346,39 @@ export const Transaction = useCrudSchemas(reactive([ }, isForm: false }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false, + isTable: false + }, + { + label: '最后更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, ])) // 表单校验 diff --git a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts index c88590085..8b4f71683 100644 --- a/src/views/wms/inventoryManage/transferlog/transferlog.data.ts +++ b/src/views/wms/inventoryManage/transferlog/transferlog.data.ts @@ -386,6 +386,39 @@ export const Transferlog = useCrudSchemas(reactive([ }, isForm: false }, + { + label: '最后更新时间', + field: 'updateTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isForm: false, + isTable: false + }, + { + label: '更新者', + field: 'updater', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable: false + }, ])) // 表单校验 diff --git a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts index 86a93aaba..0cca5fb3e 100644 --- a/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts +++ b/src/views/wms/issueManage/issue/issueJobMain/issueJobMain.data.ts @@ -154,7 +154,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '最后更新时间', field: 'updateTime', @@ -186,7 +186,7 @@ export const IssueJobMain = useCrudSchemas(reactive([ isTable: false, }, - + { label: '优先级', field: 'priority', @@ -350,6 +350,40 @@ export const IssueJobMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, { label: '从库区代码范围', field: 'fromAreaCodes', @@ -941,8 +975,8 @@ export const IssueJobDetail = useCrudSchemas(reactive([ isTable:false, hiddenInMain:true, }, - - + + ])) //表单校验 diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index 8918e8d2a..f40cdef01 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -205,6 +205,27 @@ export const IssueRecordMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, { label: '创建者', field: 'creator', @@ -212,28 +233,41 @@ export const IssueRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { - label: '创建时间', - field: 'createTime', + 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%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } }, // { // label: '代码', @@ -314,7 +348,7 @@ export const IssueRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // form: { - // component: 'Switch', + // component: 'Switch', // value: 'TRUE', // componentProps: { // inactiveValue: 'FALSE', @@ -547,7 +581,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive([ }, isTable:false }, - + { label: '供应商代码', field: 'supplierCode', @@ -620,7 +654,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, }, - + { label: '到库区代码', field: 'toAreaCode', @@ -767,7 +801,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive([ }, hiddenInMain:true, }, - + // { // label: '代码', // field: 'code', @@ -776,7 +810,7 @@ export const IssueRecordDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - + // { // label: '任务明细ID', // field: 'jobDetailId', @@ -834,4 +868,4 @@ export const IssueRecordDetailRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts index 24d212c8a..f5c3345d5 100644 --- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts @@ -39,7 +39,7 @@ const queryParams = { // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 发料申请主表 */ @@ -392,7 +392,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, form: { component: 'DatePicker', componentProps: { @@ -410,7 +410,7 @@ export const IssueRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, isForm: false, }, { @@ -706,8 +706,8 @@ export const IssueRequestDetail = useCrudSchemas(reactive([ } } }, - - + + { label: '计量单位', field: 'uom', diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts index 1a13bd3ec..d4a23798e 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/productionreceiptJobMain.data.ts @@ -305,7 +305,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -322,7 +322,7 @@ export const ProductionreceiptJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '从库区代码范围', @@ -851,7 +851,7 @@ export const ProductionreceiptJobDetail = useCrudSchemas(reactive( }, hiddenInMain: true, }, - + ])) //表单校验 diff --git a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts index 6f37534b6..3aca32bcf 100644 --- a/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreceipt/productionreceiptRecordMain/productionreceiptRecordMain.data.ts @@ -196,6 +196,27 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive }, isTable: false, }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + detai: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + }, { label: '创建者', field: 'creator', @@ -203,28 +224,41 @@ export const ProductionreceiptRecordMain = useCrudSchemas(reactive table: { width: 150 }, - isTable: false, + isTable: true, }, { - label: '创建时间', - field: 'createTime', + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, formatter: dateFormatter, - detai: { + 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', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } }, { label: '从仓库代码', diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts index 63eb8641c..805da1f6f 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/productionreturnJobMain.data.ts @@ -308,7 +308,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -325,7 +325,7 @@ export const ProductionreturnJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '从库区代码范围', @@ -813,7 +813,7 @@ export const ProductionreturnJobDetail = useCrudSchemas(reactive([ } }, }, - + ])) //表单校验 diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts index 89dc20eed..0a86385ae 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts @@ -45,7 +45,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( isTable: false, isSearch: true }, - + { label: '任务单号', field: 'jobNumber', @@ -56,7 +56,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( isTable: false, isSearch: true }, - + { label: '出库事务类型', field: 'outTransactionType', @@ -205,7 +205,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -218,7 +218,7 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -228,6 +228,40 @@ export const ProductionreturnRecordMain = useCrudSchemas(reactive( } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -665,7 +699,7 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -419,7 +419,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive table: { width: 150 }, - isTable: false, + isTable: true, isForm: false }, { @@ -490,7 +490,7 @@ export const ProductionreturnRequestMainRules = reactive({ ], workshopCode: [ { required: true, message: '请选择车间', trigger: 'change' } - ], + ], }) /** @@ -928,7 +928,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { @@ -546,7 +546,7 @@ export const RepleinshJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts index fb29cee65..4bf9a8d6e 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRecordMain/repleinshRecordMain.data.ts @@ -204,7 +204,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -217,7 +217,7 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -227,6 +227,40 @@ export const RepleinshRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -756,4 +790,4 @@ export const RepleinshRecordDetailRules = reactive({ toAreaCode: [ { required: true, message: '请选择到库区代码', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts index 90a245a0c..20712a925 100644 --- a/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts +++ b/src/views/wms/issueManage/repleinsh/repleinshRequestMain/repleinshRequestMain.data.ts @@ -340,7 +340,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -358,7 +358,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -372,6 +372,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + isDetail: true, hiddenInMain:true, isTable: false, form: { @@ -394,6 +395,7 @@ export const RepleinshRequestMain = useCrudSchemas(reactive([ }, hiddenInMain:true, isTable: false, + isDetail: true, isForm: false, }, { @@ -561,7 +563,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ disabled: true } }, - + { label: '单据号', field: 'number', @@ -769,7 +771,7 @@ export const RepleinshRequestDetail = useCrudSchemas(reactive([ isTableForm: false, sortTableDefault:2, }, - + { label: '从货主代码', field: 'fromOwnerCode', diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts index 57dc8d479..75e6b0954 100644 --- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts +++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts @@ -190,7 +190,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( label: '创建者', field: 'creator', sort: 'custom', - isTable: false, + isTable: true, table: { width: 150 }, @@ -206,7 +206,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -216,6 +216,40 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive( } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -479,7 +513,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -507,7 +507,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts index f4489f8d2..d0f2cf6fa 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts @@ -484,7 +484,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -498,7 +498,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -787,6 +787,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: true, isTableForm: false, isForm: false, hiddenInMain: true, @@ -802,6 +803,7 @@ export const ProductionDetail = useCrudSchemas(reactive([ table: { width: 180 }, + isTable: true, hiddenInMain: true, form: { component: 'DatePicker', diff --git a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts index 2841f1470..c607eb498 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainAssembleSparePart/productionMainAssembleSparePart.data.ts @@ -484,7 +484,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -498,7 +498,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -791,11 +791,13 @@ export const ProductionDetail = useCrudSchemas(reactive([ hiddenInMain: true, isTableForm: false, isForm: false, + isTable: true, }, { label: '创建时间', field: 'createTime', formatter: dateFormatter, + isTable: true, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, diff --git a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts index 219d0e5b6..156730cf6 100644 --- a/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMainPredictSparePart/productionMainPredictSparePart.data.ts @@ -485,7 +485,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -499,7 +499,7 @@ export const ProductionMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts index 4ed5e4017..e388beb2f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptJobMain/productreceiptJobMain.data.ts @@ -134,7 +134,7 @@ export const ProductreceiptJobMain = useCrudSchemas(reactive([ } }, }, - + { label: '过期时间', field: 'expiredTime', diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts index 238b9acd5..fcbbb78e5 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/productreceiptRecordMain.data.ts @@ -229,7 +229,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -238,7 +238,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - isTable: false, + isTable: true, sort: 'custom', table: { width: 180 @@ -252,6 +252,40 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -557,7 +591,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, - + { label: '到货主代码', field: 'toOwnerCode', @@ -568,7 +602,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( isTable: false, }, - + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -987,4 +1021,4 @@ export const BackflushRecordDetailbRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index d4d491158..378ccd699 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -51,7 +51,7 @@ const queryParams = { // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 制品收货申请主表 */ @@ -998,7 +998,7 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive tableForm: { type: 'Select' } - + }, { label: '生产日期', @@ -1347,7 +1347,7 @@ export const BackflushRequestDetailbRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], - + }) diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 313d42255..2c9ade555 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -256,6 +256,40 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -561,7 +595,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( } }, }, - + { label: '到货主代码', field: 'toOwnerCode', @@ -571,7 +605,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, isTable: false, }, - + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -620,8 +654,8 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( component: 'InputNumber', } }, - - + + { label: '备注', field: 'remark', diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts index 8aef36f4e..6d33c2859 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts @@ -51,7 +51,7 @@ const queryParams = { // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 制品收货申请主表 */ @@ -392,7 +392,7 @@ export const ProductreceiptRequestMain = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '最后更新时间', field: 'updateTime', @@ -999,7 +999,6 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive tableForm: { type: 'Select' } - }, { label: '生产日期', @@ -1089,13 +1088,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive } }, isTableForm: false, - isForm: false + isForm: false, + isTable: true }, { label: '创建者', field: 'creator', sortTableDefault:1010, sort: 'custom', + isTable: true, table: { width: 150 }, @@ -1347,7 +1348,7 @@ export const BackflushRequestDetailbRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], - + }) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts index 45af7677c..26ad1fd50 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRecordMain/productreceiptscrapRecordMain.data.ts @@ -217,7 +217,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -230,7 +230,7 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -240,6 +240,40 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -574,7 +608,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, isTable: false, }, - + { label: '到库位组代码', field: 'toLocationGroupCode', @@ -650,7 +684,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( }, isTable: false, }, - + // { // label: '任务明细ID', // field: 'jobDetailId', @@ -982,4 +1016,4 @@ export const BackflushRecordDetailbRules = reactive({ creator: [ { required: true, message: '请输入创建者', trigger: 'blur' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts index dc21a639b..7f65ffdc9 100644 --- a/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressJobMain/productredressJobMain.data.ts @@ -376,7 +376,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, isForm: false, }, { @@ -390,7 +390,7 @@ export const ProductredressJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, form: { component: 'DatePicker', componentProps: { @@ -453,7 +453,7 @@ export const ProductredressJobDetailRules = reactive({ }) export const ProductredressJobDetail = useCrudSchemas(reactive([ - + { label: '物料代码', field: 'itemCode', @@ -582,7 +582,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ // }, // isForm: false // }, - + { label: '物品描述1', field: 'itemDesc1', @@ -621,7 +621,7 @@ export const ProductredressJobDetail = useCrudSchemas(reactive([ // width: 150 // }, // }, - + { label: '订单号', field: 'woNumber', diff --git a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts index af0629dc4..6f5459c3d 100644 --- a/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRecordMain/productredressRecordMain.data.ts @@ -271,7 +271,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ field: 'creator', sort: 'custom', isForm: false, - isTable:false, + isTable:true, table: { width: 150 }, @@ -287,7 +287,7 @@ export const ProductredressRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, form: { component: 'DatePicker', componentProps: { @@ -448,8 +448,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( isTable:false, hiddenInMain: true }, - - + + { label: '物品描述1', field: 'itemDesc1', @@ -528,8 +528,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( }, isForm: false }, - - + + { label: 'BOM版本', field: 'bomVersion', @@ -540,8 +540,8 @@ export const ProductredressRecordDetail = useCrudSchemas(reactive( isTable:false, hiddenInMain: true, }, - - + + // { // label: '到货主代码', // field: 'toOwnerCode', diff --git a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts index 1cbe80bad..624c639eb 100644 --- a/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts +++ b/src/views/wms/productionManage/productredress/productredressRequestMain/productredressRequestMain.data.ts @@ -225,7 +225,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ field: 'creator', sort: 'custom', isForm: false, - isTable: false, + isTable: true, table: { width: 150 }, @@ -241,7 +241,7 @@ export const ProductredressRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -307,7 +307,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive // field: 'bomVersion', // sort: 'custom', // }, - + { label: '物料代码', field: 'itemCode', @@ -548,7 +548,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive isTableForm: false, hiddenInMain:true, }, - + { label: '备注', field: 'remark', @@ -633,7 +633,7 @@ export const ProductredressRequestDetail = useCrudSchemas(reactive isTableForm: false, isForm: false }, - + { label: '操作', field: 'action', diff --git a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts index ad8395324..15b7180ce 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRecordMain/productrepairRecordMain.data.ts @@ -204,7 +204,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false + isTable: true }, { label: '创建时间', @@ -217,7 +217,7 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -227,6 +227,40 @@ export const ProductrepairRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', diff --git a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts index b0156b9a8..7c7f9db37 100644 --- a/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts +++ b/src/views/wms/productionManage/productrepair/productrepairRequestMain/productrepairRequestMain.data.ts @@ -45,7 +45,7 @@ const queryParams = { // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 制品返修申请主表 */ @@ -274,7 +274,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -293,7 +293,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isForm: false, }, { @@ -366,7 +366,7 @@ export const ProductrepairRequestMain = useCrudSchemas(reactive([ } } }, - + { label: '最后更新时间', field: 'updateTime', @@ -540,7 +540,7 @@ export const ProductrepairRequestDetaila = useCrudSchemas(reactive isTableForm: false, isForm: false, }, - + { label: '返修工位', field: 'workStationCode', diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index bee914239..773c0eadb 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -227,7 +227,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -240,7 +240,7 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -250,6 +250,40 @@ export const ProductscrapRecordMain = useCrudSchemas(reactive([ } }, }, + { + label: '最后更新时间', + field: 'updateTime', + sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + 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: false, + table: { + width: 150 + } + }, // { // label: '代码', // field: 'code', @@ -534,7 +568,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - + { label: '单据号', field: 'number', @@ -583,7 +617,7 @@ export const ProductscrapRecordDetail = useCrudSchemas(reactive([ }, isTable: false, }, - + { label: '物料描述1', field: 'itemDesc1', diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts index 8b8359079..9f367f2ab 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts @@ -1023,7 +1023,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -1043,7 +1043,7 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, isTableForm: false, isForm: false }, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts index 275882287..3617757b5 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -636,7 +636,38 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ }, sortTableDefault:1001, }, - + + { + 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 + } + ])) //表单校验 @@ -896,7 +927,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ disabled: true } }, - + { label: '供应商计量数量', field: 'supplierQty', @@ -1114,7 +1145,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, isTableForm:true, }, - + ])) //表单校验 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 04789f448..a6304a3fb 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -378,7 +378,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, }, { - + label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, @@ -445,6 +445,70 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, ])) // 表单校验 @@ -763,7 +827,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:24, hiddenInMain:true }, - + { label: '库存状态', field: 'inventoryStatus', @@ -1004,7 +1068,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive // width: 150 // }, // }, - + { label: '项目代码', field: 'projectCode', @@ -1077,7 +1141,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:2000, }, - + { label: '操作', hiddenInMain:true, @@ -1415,7 +1479,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive< disabled: true, } }, - + { label: '包装数量', field: 'packQty', @@ -1432,7 +1496,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive< tableForm: { disabled: true, } - + }, { label: '包装规格', @@ -1452,7 +1516,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive< tableForm: { disabled: true, } - + }, { label: '供应商计量数量', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index a779b1bf2..b5e393dce 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -30,7 +30,7 @@ const userDept = userStore.userSelfInfo.dept // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 采购收货申请主表 */ @@ -301,14 +301,14 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { @@ -317,19 +317,50 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false, - isTable: false, + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, + table: { + width: 150 + } }, { label: '申请时间', @@ -565,7 +596,7 @@ export const PurchasereceiptRequestMainRules = reactive({ * @returns {Array} 采购收货申请子表 */ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ - + { label: '订单号', field: 'poNumber', @@ -1180,7 +1211,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -575,7 +575,7 @@ export const PurchasereturnJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -768,7 +768,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ sortTableDefault: 15, hiddenInMain:true, }, - + { label: '订单号', field: 'poNumber', @@ -952,7 +952,7 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive([ } }, }, - + ])) //表单校验 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts index 8adc8712e..1f1dc0fd1 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts @@ -338,7 +338,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, { label: '创建时间', @@ -351,7 +351,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable: false, + isTable: true, form: { component: 'DatePicker', componentProps: { @@ -435,7 +435,7 @@ export const PurchasereturnRecordMainRules = reactive({ * @returns {Array} 采购退货记录子表 */ export const PurchasereturnRecordDetail = useCrudSchemas(reactive([ - + { label: '从包装号', field: 'fromPackingNumber', @@ -693,7 +693,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( sortTableDefault: 1013, hiddenInMain: true }, - + { label: '物料代码', field: 'itemCode', @@ -864,7 +864,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive( } }, }, - + ])) //表单校验 @@ -902,4 +902,4 @@ export const PurchasereturnRecordDetailRules = reactive({ poline: [ { required: true, message: '请选择订单行', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 13800d463..a4eb4c14b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -32,7 +32,7 @@ const queryParams = { // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + // 采购收货记录展示列 export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive([ @@ -82,7 +82,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive( width: 150 }, }, - + { label: '物料名称', field: 'itemName', @@ -139,8 +139,8 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive( width: 150 }, }, - - + + ])) /** @@ -438,7 +438,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ } } }, - + { label: '原因', field: 'remark', @@ -448,28 +448,50 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + 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', - sort: 'custom', table: { - width: 150 + width: 130 }, isForm: false, - isTable: false, + isTable: true }, { - label: '创建时间', - field: 'createTime', + 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: { @@ -478,8 +500,17 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, isForm: false, + isTable: false, + table: { + width: 150 + } }, { label: '自动提交', @@ -649,7 +680,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择订单行', @@ -729,7 +760,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -747,7 +778,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive width: 150 }, isTableForm:false, - isTable:false, + isTable:false, hiddenInMain: true, tableForm:{ disabled:true @@ -766,7 +797,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive width: 150 }, isTableForm:false, - isTable:false, + isTable:false, hiddenInMain: true, tableForm:{ disabled:true @@ -798,8 +829,8 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive field: 'altBatch', sort: 'custom', table: { - width: 150 - }, + width: 150 + }, hiddenInMain: true, isTableForm: false, isTable: false, @@ -818,7 +849,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, hiddenInMain: true, tableForm:{ disabled:true @@ -841,7 +872,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true, type: 'Select', @@ -907,7 +938,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, form: { componentProps:{ disabled:true @@ -942,7 +973,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, hiddenInMain: true, isTable: false, form: { @@ -1035,7 +1066,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true, type: 'Select', @@ -1054,7 +1085,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1073,7 +1104,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1092,7 +1123,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1125,7 +1156,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } - }, + }, tableForm:{ disabled:true, type: 'FormDate', @@ -1155,7 +1186,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } - }, + }, tableForm:{ disabled:true, type: 'FormDate', @@ -1185,7 +1216,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive dateFormat: 'YYYY-MM-DD', valueFormat: 'x', } - }, + }, isTableForm: false, isTable: false, tableForm:{ @@ -1201,7 +1232,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1220,7 +1251,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1240,7 +1271,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 180 - }, + }, hiddenInMain: true, tableForm:{ disabled:true @@ -1259,7 +1290,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1277,7 +1308,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1309,7 +1340,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + }, tableForm:{ disabled:true }, @@ -1322,7 +1353,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive sort: 'custom', table: { width: 150 - }, + }, tableForm:{ disabled:true }, @@ -1528,7 +1559,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, - isTable: false, + 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: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, + table: { + width: 150 + } }, // { // label: '到仓库代码', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts index de955104a..7f5c9997e 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRecordMain/putawayRecordMain.data.ts @@ -185,35 +185,69 @@ export const PutawayRecordMain = useCrudSchemas(reactive([ }, isTable: false, }, + { + 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', - sort: 'custom', table: { - width: 150 + width: 130 }, - isTable: false, + isForm: false, + isTable: true }, { - label: '创建时间', - field: 'createTime', + 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%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, + } + }, + { + label: '最后更新者', + field: 'updater', + isDetail: true, + isForm: false, + isTable: false, + table: { + width: 150 + } }, // { // label: '代码', @@ -658,7 +692,7 @@ export const PutawayRecordDetail = useCrudSchemas(reactive([ component: 'InputNumber', } }, - + // { // label: '代码', // field: 'code', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts index c3a8be664..bdfe01bf9 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/putaway/putawayRequestMain/putawayRequestMain.data.ts @@ -45,7 +45,7 @@ const requestsettingData = data?.list[0] || {} // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 上架申请主表 */ @@ -203,35 +203,66 @@ export const PutawayRequestMain = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', + isForm: false, table: { width: 180 }, - isTable: false, + formatter: dateFormatter, + detail: { + dateFormat : 'YYYY-MM-DD HH:mm:ss' + }, form: { component: 'DatePicker', componentProps: { - style: { width: '100%' }, + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } - }, - isForm: false + } }, { label: '创建者', field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, + { + label: '最后更新时间', + field: 'updateTime', sort: 'custom', + isDetail: true, + isForm: false, + isTable: false, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, table: { - width: 150 + 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: false, - isForm: false + table: { + width: 150 + } }, { label: '申请时间', @@ -1283,4 +1314,4 @@ export const PutawayRequestDetailChildPackingNumber = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, }, { label: '创建时间', @@ -366,7 +366,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, form: { component: 'DatePicker', componentProps: { @@ -377,7 +377,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, }, { - + label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, @@ -762,7 +762,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:24, hiddenInMain:true }, - + { label: '库存状态', field: 'inventoryStatus', @@ -1003,7 +1003,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive // width: 150 // }, // }, - + { label: '项目代码', field: 'projectCode', @@ -1077,7 +1077,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:2000, }, - + { label: '操作', hiddenInMain:true, @@ -1145,4 +1145,4 @@ export const PurchasereceiptRecordDetailRules = reactive({ visualInspectResult: [ { required: true, message: '请选择目检结果', trigger: 'change' } ], -}) \ No newline at end of file +}) diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts index e42334189..1df29662c 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts @@ -33,7 +33,7 @@ import { PurchaseDetail, PurchaseMain } from '../../supplierdeliver/purchaseMain // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + /** * @returns {Array} 采购收货申请主表 @@ -302,39 +302,6 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( }, isTable: false, }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false, - isTable: false, - }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - isTable: false, - }, { label: '申请时间', field: 'requestTime', @@ -519,6 +486,70 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + 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: false, + 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: false, + table: { + width: 150 + } + }, { label: '操作', field: 'action', @@ -569,7 +600,7 @@ export const PurchasereceiptRequestMainRules = reactive({ * @returns {Array} 采购收货申请子表 */ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ - + { label: '订单号', field: 'poNumber', @@ -1184,7 +1215,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ } } }, - { - label: '创建者', - field: 'creator', - sort: 'custom', - table: { - width: 150 - } - }, - { - label: '创建时间', - field: 'createTime', - isTable: true, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - sort: 'custom', - table: { - width: 180 - } - }, + // { + // label: '创建者', + // field: 'creator', + // sort: 'custom', + // table: { + // width: 150 + // } + // }, + // { + // label: '创建时间', + // field: 'createTime', + // isTable: true, + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // sort: 'custom', + // table: { + // width: 180 + // } + // }, ])) //表单校验 diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts index 2253d7372..6eac7f740 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/purchaseclaimRequestMain.data.ts @@ -18,7 +18,7 @@ const { t } = useI18n() // 国际化 // id 转str 否则form回显匹配不到 userDept.id = userDept.id.toString() const userDeptArray:any = [userDept] - + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { @@ -294,6 +294,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ label: '最后更新者', field: 'updater', isForm:false, + isTable: false, table: { width: 120 } @@ -301,7 +302,7 @@ export const PurchaseclaimRequestMain = useCrudSchemas(reactive([ { label: '最后更新时间', field: 'updateTime', - isTable: true, + isTable: false, formatter: dateFormatter, isForm:false, detail: { @@ -403,7 +404,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - + }, { label: '物料名称', @@ -474,7 +475,7 @@ export const PurchaseclaimRequestDetail = useCrudSchemas(reactive( // disabled:true, // } }, - + { label: '备注', field: 'remark',