From aee4e4bdb834ccf84d6a3a1f98f5050aabc8d23c Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Tue, 25 Jun 2024 09:05:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/device/deviceRepair/index.ts | 1 + src/api/eam/device/techRepair/index.ts | 1 + src/api/eam/mold/moldRepair/index.ts | 1 + .../device/deviceRepair/deviceRepair.data.ts | 45 ++++--- .../deviceMaintenanceMain.data.ts | 121 +++++++++++++++++- .../eam/device/devicemaintenancejob/index.vue | 7 +- .../eam/device/techRepair/techRepair.data.ts | 45 ++++--- .../eam/device/techmaintenancejob/index.vue | 7 +- .../techMaintenanceMain.data.ts | 110 +++++++++++++++- .../eam/mold/moldRepair/moldRepair.data.ts | 70 +++++++--- .../eam/mold/moldmaintenancejob/index.vue | 5 + .../moldMaintenanceMain.data.ts | 109 +++++++++++++++- 12 files changed, 464 insertions(+), 58 deletions(-) diff --git a/src/api/eam/device/deviceRepair/index.ts b/src/api/eam/device/deviceRepair/index.ts index 1751735..5a9679d 100644 --- a/src/api/eam/device/deviceRepair/index.ts +++ b/src/api/eam/device/deviceRepair/index.ts @@ -17,6 +17,7 @@ export interface DeviceRepairVO { // 查询报修申请列表 export const getDeviceRepairPage = async (params) => { + params.type = 'DEVICE' if (params.isSearch) { delete params.isSearch const data = { ...params } diff --git a/src/api/eam/device/techRepair/index.ts b/src/api/eam/device/techRepair/index.ts index ce1d3a9..ceba717 100644 --- a/src/api/eam/device/techRepair/index.ts +++ b/src/api/eam/device/techRepair/index.ts @@ -17,6 +17,7 @@ export interface DeviceRepairVO { // 查询报修申请列表 export const getDeviceRepairPage = async (params) => { + params.type = 'TECH' if (params.isSearch) { delete params.isSearch const data = { ...params } diff --git a/src/api/eam/mold/moldRepair/index.ts b/src/api/eam/mold/moldRepair/index.ts index 0af3d79..028f2b4 100644 --- a/src/api/eam/mold/moldRepair/index.ts +++ b/src/api/eam/mold/moldRepair/index.ts @@ -16,6 +16,7 @@ export interface MoldRepairVO { // 查询报修申请列表 export const getMoldRepairPage = async (params) => { + params.type = 'MOLD' if (params.isSearch) { delete params.isSearch const data = { ...params } diff --git a/src/views/eam/device/deviceRepair/deviceRepair.data.ts b/src/views/eam/device/deviceRepair/deviceRepair.data.ts index 8a01957..385598c 100644 --- a/src/views/eam/device/deviceRepair/deviceRepair.data.ts +++ b/src/views/eam/device/deviceRepair/deviceRepair.data.ts @@ -85,20 +85,20 @@ export const DeviceRepair = useCrudSchemas(reactive([ formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return deviceMoldTypeList.find((account) => account.value == cellValue)?.label }, - isSearch: true, - search: { - component: 'Select', - componentProps: { - options: deviceMoldTypeList, - optionsAlias: { - labelField: 'label', - valueField: 'value' - }, - // disabled: true, - filterable: true, - placeholder: "请选择类型" - } - }, + isSearch: false, + // search: { + // component: 'Select', + // componentProps: { + // options: deviceMoldTypeList, + // optionsAlias: { + // labelField: 'label', + // valueField: 'value' + // }, + // // disabled: true, + // filterable: true, + // placeholder: "请选择类型" + // } + // }, form: { component: 'Select', componentProps: { @@ -107,10 +107,11 @@ export const DeviceRepair = useCrudSchemas(reactive([ labelField: 'label', valueField: 'value' }, - // disabled: true, + disabled: true, filterable: true, placeholder: "请选择设备" - } + }, + value: 'DEVICE', }, }, { @@ -182,6 +183,18 @@ export const DeviceRepair = useCrudSchemas(reactive([ }, }, }, + { + label: '报修时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + table: { + width: '200', + }, + }, // { // label: '故障类型', // field: 'faultType', diff --git a/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts b/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts index dc0d9cb..cb06ab5 100644 --- a/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts +++ b/src/views/eam/device/devicemaintenancejob/deviceMaintenanceMain.data.ts @@ -1,4 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' import { selectAllFactoryArea } from '@/api/system/dept' import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts' import { useUserStore } from '@/store/modules/user' @@ -151,7 +152,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ } }, { - label: '维修人', + label: '接单人', field: 'maintenance', sort: 'custom', isDetail: false, @@ -191,7 +192,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ } }, { - label: '维修人', + label: '接单人', field: 'maintenanceDetail', sort: 'custom', isDetail: true, @@ -203,6 +204,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '接单时间', + field: 'receivingTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '接单时间', + field: 'receivingTimeDetail', + sort: 'custom', + isSearch: false, + isDetail: true, + isTableForm: false, + isForm: false, + isTable: false, + table: { + width: '200', + }, + }, { label: '类型', field: 'type', @@ -216,6 +243,17 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ }, // dictType: DICT_TYPE.APP_DEVICE_MOLD_TYPE, isSearch: true, + search: { + component: 'Select', + componentProps: { + options: deviceMoldTypeList, + optionsAlias: { + labelField: 'label', + valueField: 'value' + }, + filterable: true, + }, + }, form: { component: 'Select', componentProps: { @@ -323,6 +361,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.ORDER_COMPLETE_RESULT, dictClass: 'string', }, + { + label: '完成时间', + field: 'completionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '完成时间', + field: 'completionTimeDetail', + sort: 'custom', + isTable: false, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + table: { + width: '200', + }, + }, { label: '报修人', field: 'declarer', @@ -373,6 +437,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '确认时间', + field: 'applyTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '确认时间', + field: 'applyTimeDetail', + sort: 'custom', + isTable: false, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + table: { + width: '200', + }, + }, { label: '验证人', field: 'verifyer', @@ -423,7 +513,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, - + { + label: '验证时间', + field: 'verifyTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '验证时间', + field: 'verifyTimeDetail', + sort: 'custom', + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + isTable: false, + table: { + width: '200', + }, + }, { label: '操作', field: 'action', diff --git a/src/views/eam/device/devicemaintenancejob/index.vue b/src/views/eam/device/devicemaintenancejob/index.vue index c7ecf04..97f38a6 100644 --- a/src/views/eam/device/devicemaintenancejob/index.vue +++ b/src/views/eam/device/devicemaintenancejob/index.vue @@ -236,6 +236,7 @@ import * as ItemApi from '@/api/eam/basic/item' import { emit } from 'process' import { verify } from 'crypto' import { watch } from 'vue'; +import dayjs from 'dayjs' const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD') defineOptions({ name: 'DeviceMaintenanceMain' }) @@ -776,7 +777,7 @@ const detailRef = ref() const openDetail = async (row: any, titleName: any, titleValue: any) => { const userListAll = await UserApi.getSimpleUserList() const factoryList = await selectAllFactoryArea() -const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) + const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) row.typeDetail = deviceMoldTypeList.find((account) => account.value == row.type)?.label row.deviceNumberDetail = deviceListAll.find((account) => account.number == row.deviceNumber)?.name @@ -784,6 +785,10 @@ const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname + row.receivingTimeDetail = dayjs(row.receivingTime).format('YYYY-MM-DD HH:mm:ss'); + row.completionTimeDetail = dayjs(row.completionTime).format('YYYY-MM-DD HH:mm:ss'); + row.applyTimeDetail = dayjs(row.applyTime).format('YYYY-MM-DD HH:mm:ss'); + row.verifyTimeDetail = dayjs(row.verifyTime).format('YYYY-MM-DD HH:mm:ss'); row.classes = row.classes+'' operatRecord.value = row; detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain') diff --git a/src/views/eam/device/techRepair/techRepair.data.ts b/src/views/eam/device/techRepair/techRepair.data.ts index c6af868..6cfb16a 100644 --- a/src/views/eam/device/techRepair/techRepair.data.ts +++ b/src/views/eam/device/techRepair/techRepair.data.ts @@ -85,20 +85,20 @@ export const DeviceRepair = useCrudSchemas(reactive([ formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return deviceMoldTypeList.find((account) => account.value == cellValue)?.label }, - isSearch: true, - search: { - component: 'Select', - componentProps: { - options: deviceMoldTypeList, - optionsAlias: { - labelField: 'label', - valueField: 'value' - }, - // disabled: true, - filterable: true, - placeholder: "请选择类型" - } - }, + isSearch: false, + // search: { + // component: 'Select', + // componentProps: { + // options: deviceMoldTypeList, + // optionsAlias: { + // labelField: 'label', + // valueField: 'value' + // }, + // // disabled: true, + // filterable: true, + // placeholder: "请选择类型" + // }, + // }, form: { component: 'Select', componentProps: { @@ -107,10 +107,11 @@ export const DeviceRepair = useCrudSchemas(reactive([ labelField: 'label', valueField: 'value' }, - // disabled: true, + disabled: true, filterable: true, placeholder: "请选择类型" - } + }, + value: 'TECH' }, }, { @@ -182,6 +183,18 @@ export const DeviceRepair = useCrudSchemas(reactive([ }, }, }, + { + label: '报修时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + table: { + width: '200', + }, + }, // { // label: '故障类型', // field: 'faultType', diff --git a/src/views/eam/device/techmaintenancejob/index.vue b/src/views/eam/device/techmaintenancejob/index.vue index b06c93b..3977f4e 100644 --- a/src/views/eam/device/techmaintenancejob/index.vue +++ b/src/views/eam/device/techmaintenancejob/index.vue @@ -236,6 +236,7 @@ import * as ItemApi from '@/api/eam/basic/item' import { emit } from 'process' import { verify } from 'crypto' import { watch } from 'vue'; +import dayjs from 'dayjs' const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value != 'MOLD') defineOptions({ name: 'TechMaintenanceMain' }) @@ -755,7 +756,7 @@ const detailRef = ref() const openDetail = async (row: any, titleName: any, titleValue: any) => { const userListAll = await UserApi.getSimpleUserList() const factoryList = await selectAllFactoryArea() -const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) + const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) row.typeDetail = deviceMoldTypeList.find((account) => account.value == row.type)?.label row.deviceNumberDetail = deviceListAll.find((account) => account.number == row.deviceNumber)?.name @@ -763,6 +764,10 @@ const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname + row.receivingTimeDetail = dayjs(row.receivingTime).format('YYYY-MM-DD HH:mm:ss'); + row.completionTimeDetail = dayjs(row.completionTime).format('YYYY-MM-DD HH:mm:ss'); + row.applyTimeDetail = dayjs(row.applyTime).format('YYYY-MM-DD HH:mm:ss'); + row.verifyTimeDetail = dayjs(row.verifyTime).format('YYYY-MM-DD HH:mm:ss'); row.classes = row.classes+'' operatRecord.value = row; detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintenanceMain') diff --git a/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts b/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts index 60e6d02..5414f44 100644 --- a/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts +++ b/src/views/eam/device/techmaintenancejob/techMaintenanceMain.data.ts @@ -7,6 +7,7 @@ import * as ItemApi from '@/api/eam/basic/item' import * as UserApi from '@/api/system/user' import { getStrDictOptions } from '@/utils/dict' import { selecUserByType } from '@/api/system/dept' +import { dateFormatter } from '@/utils/formatTime' const userStore = useUserStore() const factoryList = await selectAllFactoryArea() const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({}) @@ -151,7 +152,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ } }, { - label: '维修人', + label: '接单人', field: 'maintenance', sort: 'custom', isDetail: false, @@ -191,7 +192,7 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ } }, { - label: '维修人', + label: '接单人', field: 'maintenanceDetail', sort: 'custom', isDetail: true, @@ -203,6 +204,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '接单时间', + field: 'receivingTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '接单时间', + field: 'receivingTimeDetail', + sort: 'custom', + isSearch: false, + isDetail: true, + isTableForm: false, + isForm: false, + isTable: false, + table: { + width: '200', + }, + }, { label: '类型', field: 'type', @@ -335,6 +362,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.ORDER_COMPLETE_RESULT, dictClass: 'string', }, + { + label: '完成时间', + field: 'completionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '完成时间', + field: 'completionTimeDetail', + sort: 'custom', + isTable: false, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + table: { + width: '200', + }, + }, { label: '报修人', field: 'declarer', @@ -385,6 +438,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '确认时间', + field: 'applyTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '确认时间', + field: 'applyTimeDetail', + sort: 'custom', + isTable: false, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + table: { + width: '200', + }, + }, { label: '验证人', field: 'verifyer', @@ -435,7 +514,32 @@ export const DeviceMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, - + { + label: '验证时间', + field: 'verifyTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '验证时间', + field: 'verifyTimeDetail', + sort: 'custom', + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + isTable: false, + table: { + width: '200', + }, + }, { label: '操作', field: 'action', diff --git a/src/views/eam/mold/moldRepair/moldRepair.data.ts b/src/views/eam/mold/moldRepair/moldRepair.data.ts index 579e79c..d7a8db0 100644 --- a/src/views/eam/mold/moldRepair/moldRepair.data.ts +++ b/src/views/eam/mold/moldRepair/moldRepair.data.ts @@ -88,20 +88,20 @@ export const MoldRepair = useCrudSchemas(reactive([ formatter: (_: Recordable, __: TableColumn, cellValue: number) => { return deviceMoldTypeList.find((account) => account.value == cellValue)?.label }, - isSearch: true, - search: { - component: 'Select', - componentProps: { - options: deviceMoldTypeList, - optionsAlias: { - labelField: 'label', - valueField: 'value' - }, - // disabled: true, - filterable: true, - placeholder: "请选择类型" - } - }, + isSearch: false, + // search: { + // component: 'Select', + // componentProps: { + // options: deviceMoldTypeList, + // optionsAlias: { + // labelField: 'label', + // valueField: 'value' + // }, + // // disabled: true, + // filterable: true, + // placeholder: "请选择类型" + // } + // }, form: { component: 'Select', componentProps: { @@ -110,10 +110,11 @@ export const MoldRepair = useCrudSchemas(reactive([ labelField: 'label', valueField: 'value' }, - // disabled: true, + disabled: true, filterable: true, placeholder: "请选择类型" - } + }, + value: 'MOLD' }, }, { @@ -151,6 +152,7 @@ export const MoldRepair = useCrudSchemas(reactive([ }, } }, + { label: '报修人电话', field: 'declarerPhone', @@ -159,6 +161,42 @@ export const MoldRepair = useCrudSchemas(reactive([ width: '150', }, }, + { + label: '报修人', + field: 'declarer', + sort: 'custom', + table: { + width: '150', + }, + isForm: false, + isDetail: false, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userListAll.find((account) => account.id == cellValue)?.nickname + }, + search: { + component: 'Select', + componentProps: { + options: userListAll, + optionsAlias: { + labelField: 'nickname', + valueField: 'id' + }, + filterable: true, + }, + }, + }, + { + label: '报修时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + table: { + width: '200', + }, + }, // { // label: '故障类型', // field: 'faultType', diff --git a/src/views/eam/mold/moldmaintenancejob/index.vue b/src/views/eam/mold/moldmaintenancejob/index.vue index 0795ce5..f05fee2 100644 --- a/src/views/eam/mold/moldmaintenancejob/index.vue +++ b/src/views/eam/mold/moldmaintenancejob/index.vue @@ -230,6 +230,7 @@ import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts' import * as MoldAccountsApi from '@/api/eam/mold/moldAccounts' import * as UserApi from '@/api/system/user' import { selectAllFactoryArea } from '@/api/system/dept' +import dayjs from 'dayjs' const deviceMoldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) const moldTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'MOLD') defineOptions({ name: 'MoldMaintenanceMain' }) @@ -547,6 +548,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any) => { row.maintenanceDetail = userListAll.find((account) => account.id == row.maintenance)?.nickname row.declarerDetail = userListAll.find((account) => account.id == row.declarer)?.nickname row.verifyerDetail = userListAll.find((account) => account.id == row.verifyer)?.nickname + row.receivingTimeDetail = dayjs(row.receivingTime).format('YYYY-MM-DD HH:mm:ss'); + row.completionTimeDetail = dayjs(row.completionTime).format('YYYY-MM-DD HH:mm:ss'); + row.applyTimeDetail = dayjs(row.applyTime).format('YYYY-MM-DD HH:mm:ss'); + row.verifyTimeDetail = dayjs(row.verifyTime).format('YYYY-MM-DD HH:mm:ss'); row.classes = row.classes+'' operatRecord.value = row; detailRef.value.openDetail(row, titleName, titleValue,'MoldMaintenanceMain') diff --git a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts index 9ab1c4a..9c827be 100644 --- a/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts +++ b/src/views/eam/mold/moldmaintenancejob/moldMaintenanceMain.data.ts @@ -7,6 +7,7 @@ import { ItemSearchTable } from '../../basic/item/item.data' import * as ItemApi from '@/api/eam/basic/item' import * as UserApi from '@/api/system/user' import { getStrDictOptions } from '@/utils/dict' +import { dateFormatter } from '@/utils/formatTime' const userListAll = await UserApi.getSimpleUserList() console.log(userListAll) const userStore = useUserStore() @@ -201,7 +202,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ isTableForm: false, }, { - label: '维修人', + label: '接单人', field: 'maintenance', sort: 'custom', table: { @@ -241,7 +242,7 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ } }, { - label: '维修人', + label: '接单人', field: 'maintenanceDetail', sort: 'custom', isDetail: true, @@ -250,6 +251,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ isTable: false, isTableForm: false, }, + { + label: '接单时间', + field: 'receivingTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '接单时间', + field: 'receivingTimeDetail', + sort: 'custom', + isSearch: false, + isDetail: true, + isTableForm: false, + isForm: false, + isTable: false, + table: { + width: '200', + }, + }, { label: '班次', field: 'classes', @@ -331,6 +358,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.ORDER_COMPLETE_RESULT, dictClass: 'string', }, + { + label: '完成时间', + field: 'completionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '完成时间', + field: 'completionTimeDetail', + sort: 'custom', + isTable: false, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + table: { + width: '200', + }, + }, { label: '报修人', field: 'declarer', @@ -381,6 +434,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '确认时间', + field: 'applyTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '确认时间', + field: 'applyTimeDetail', + sort: 'custom', + isTable: false, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + table: { + width: '200', + }, + }, { label: '验证人', field: 'verifyer', @@ -431,6 +510,32 @@ export const MoldMaintenanceMain = useCrudSchemas(reactive([ width: 150 } }, + { + label: '验证时间', + field: 'verifyTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: false, + table: { + width: '200', + }, + }, + { + label: '验证时间', + field: 'verifyTimeDetail', + sort: 'custom', + isSearch: false, + isTableForm: false, + isForm: false, + isDetail: true, + isTable: false, + table: { + width: '200', + }, + }, { label: '操作', field: 'action',