diff --git a/src/views/eam/basic/deviceItem/deviceItem.data.ts b/src/views/eam/basic/deviceItem/deviceItem.data.ts index 6f8d19b..edc8531 100644 --- a/src/views/eam/basic/deviceItem/deviceItem.data.ts +++ b/src/views/eam/basic/deviceItem/deviceItem.data.ts @@ -12,7 +12,7 @@ export const DeviceItemRules = reactive({ export const DeviceItem = useCrudSchemas(reactive([ { - label: '设备台账编号', + label: '设备台账名称', field: 'deviceNumber', sort: 'custom', isSearch: true, diff --git a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts index fccbdee..aa4e690 100644 --- a/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts +++ b/src/views/eam/item/itemOrderMain/itemOrderMain.data.ts @@ -49,13 +49,37 @@ export const ItemOrderMain = useCrudSchemas( sort: 'custom', isSearch: false, isForm: false, - table: {} + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + } }, { label: '创建时间', field: 'createTime', - sort: 'custom', formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + }, isForm: false, table: {}, detail: { diff --git a/src/views/eam/item/replaceItemDes/index.vue b/src/views/eam/item/replaceItemDes/index.vue index b9e55ca..1292333 100644 --- a/src/views/eam/item/replaceItemDes/index.vue +++ b/src/views/eam/item/replaceItemDes/index.vue @@ -15,9 +15,9 @@ total: tableObject.total }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort"> -