From 6056a53d04131db57fff338a3cc95354fd878462 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 21 Mar 2024 14:34:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=92=8C=E6=8E=A5=E5=8D=95=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Descriptions/src/Descriptions.vue | 2 +- .../deviceMaintainOrderMain.data.ts | 32 +++++----- .../eam/device/devicemaintainjob/index.vue | 5 +- src/views/eam/mold/moldmaintainjob/index.vue | 2 + .../moldMaintainOrderMain.data.ts | 61 ++++++------------- 5 files changed, 43 insertions(+), 59 deletions(-) diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 56540d6..0c3cd20 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -36,7 +36,7 @@ const props = defineProps({ default: () => ({}) } }) - +console.log('schema',props.schema) const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('descriptions') diff --git a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts index da4e5dd..654011b 100644 --- a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts +++ b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts @@ -8,6 +8,8 @@ import { validateNum100, validateNum } from '@/utils/validator' const factoryList = await selectAllFactoryArea() const userList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: 1 }) const dutyUserList = await selecUserByType({ classType: 'DEVICE', factoryAreaNumber: '', flag: null }) +import * as UserApi from '@/api/system/user' + // 表单校验 export const DeviceMaintainOrderMainRules = reactive({ @@ -151,27 +153,23 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ table: { width: '150', }, + isDetail:false }, { - label: '接单时间', - field: 'receiveTime', + label: '接单人员', + field: 'maintenanceName', sort: 'custom', isSearch: false, table: { width: '150', }, - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, + isForm:false, + isDetail:true, + isTable:false, }, { - label: '完成时间', - field: 'finishedTime', + label: '接单时间', + field: 'receiveTime', sort: 'custom', isSearch: false, table: { @@ -185,10 +183,13 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail:{ + dateFormat:'YYYY-MM-DD HH:mm:ss' + } }, { - label: '验证时间', - field: 'verifyTime', + label: '完成时间', + field: 'finishedTime', sort: 'custom', isSearch: false, table: { @@ -202,6 +203,9 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail:{ + dateFormat:'YYYY-MM-DD HH:mm:ss' + } }, { label: '操作', diff --git a/src/views/eam/device/devicemaintainjob/index.vue b/src/views/eam/device/devicemaintainjob/index.vue index 2d27088..5e33f91 100644 --- a/src/views/eam/device/devicemaintainjob/index.vue +++ b/src/views/eam/device/devicemaintainjob/index.vue @@ -111,6 +111,7 @@ import * as DeviceMaintainOrderMainApi from '@/api/eam/device/deviceMaintainOrde import * as DeviceMaintainOrderDetailApi from '@/api/eam/device/deviceMaintainOrderDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { useUserStore } from '@/store/modules/user' +import * as UserApi from '@/api/system/user' defineOptions({ name: 'DeviceMaintainOrderMain' }) const message = useMessage() // 消息弹窗 @@ -286,7 +287,9 @@ const openForm = (type: string, row?: any) => { /** 详情操作 */ const detailRef = ref() -const openDetail = (row: any, titleName: any, titleValue: any) => { +const openDetail =async (row: any, titleName: any, titleValue: any) => { + const userListAll = await UserApi.getSimpleUserList() + row.maintenanceName = userListAll.find((account) => account.id == row.maintenance)?.nickname detailRef.value.openDetail(row, titleName, titleValue,'DeviceMaintainOrderMain') } diff --git a/src/views/eam/mold/moldmaintainjob/index.vue b/src/views/eam/mold/moldmaintainjob/index.vue index 087c9f4..6aec960 100644 --- a/src/views/eam/mold/moldmaintainjob/index.vue +++ b/src/views/eam/mold/moldmaintainjob/index.vue @@ -286,6 +286,8 @@ const openForm = (type: string, row?: any) => { /** 详情操作 */ const detailRef = ref() const openDetail = async (row: any, titleName: any, titleValue: any) => { + const userListAll = await UserApi.getSimpleUserList() + row.maintenanceName = userListAll.find((account) => account.id == row.maintenance)?.nickname const factoryList = await selectAllFactoryArea() row.factoryAreaNumber1 = factoryList.find((account) => account.id == row.factoryAreaNumber)?.name detailRef.value.openDetail(row, titleName, titleValue,'MoldMaintainOrderMain') diff --git a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts index 91134fb..b4b0daa 100644 --- a/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts +++ b/src/views/eam/mold/moldmaintainjob/moldMaintainOrderMain.data.ts @@ -143,41 +143,23 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive([ table: { width: '150', }, + isDetail:false }, { - label: '接单时间', - field: 'receiveTime', - sort: 'custom', - isSearch: false, - table: { - width: '150', - }, - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, - }, - { - label: '工程师', - field: 'engineer', + label: '接单人员', + field: 'maintenanceName', sort: 'custom', isSearch: false, table: { width: '150', }, - form: { - component: 'InputNumber', - value: 0 - }, + isForm:false, + isDetail:true, + isTable:false, }, - { - label: '指派时间', - field: 'assignTime', + label: '接单时间', + field: 'receiveTime', sort: 'custom', isSearch: false, table: { @@ -191,7 +173,11 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, + detail:{ + dateFormat:'YYYY-MM-DD HH:mm:ss' + } }, + { label: '完成时间', field: 'finishedTime', @@ -208,23 +194,9 @@ export const MoldMaintainOrderMain = useCrudSchemas(reactive([ valueFormat: 'x' } }, - }, - { - label: '验证时间', - field: 'verifyTime', - sort: 'custom', - isSearch: false, - table: { - width: '150', - }, - formatter: dateFormatter, - form: { - component: 'DatePicker', - componentProps: { - type: 'datetime', - valueFormat: 'x' - } - }, + detail:{ + dateFormat:'YYYY-MM-DD HH:mm:ss' + } }, // { @@ -442,6 +414,9 @@ export const MoldMaintainOrderDetail = useCrudSchemas(reactive([ type: 'datetime', valueFormat: 'x' } + }, + detail:{ + dateFormat:'YYYY-MM-DD HH:mm:ss' } }, {