From bfa5fbe9ef84822799a92912a16f0d6c6740b440 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 22 Mar 2024 10:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95=E6=A3=80?= =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deviceSpotInspectionRecordMain.data.ts | 27 ++ .../deviceSpotInspectionRecordMain/index.vue | 5 +- .../deviceMaintainOrderMain.data.ts | 3 +- src/views/eam/device/problemSolving/index.vue | 396 ++++++++++-------- .../item/itemApplyMain/itemApplyMain.data.ts | 6 + src/views/eam/item/replaceItemDes/index.vue | 15 +- .../replaceItemDes/replaceItemDes.data.ts | 5 +- .../moldMaintainOrderMain.data.ts | 2 +- 8 files changed, 260 insertions(+), 199 deletions(-) diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts index 4b175a8..b22e49e 100644 --- a/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts +++ b/src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts @@ -8,6 +8,7 @@ import { ItemSearchTable } from '../../basic/item/item.data' import * as ItemApi from '@/api/eam/basic/item' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import * as UserApi from '@/api/system/user' +import { fa } from 'element-plus/es/locale' // 邮箱账号的列表 const factoryList = await selectAllFactoryArea() const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({}) @@ -16,6 +17,13 @@ const userListAll = await UserApi.getSimpleUserList() const deviceListNoPage = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) const deviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE).filter(item => item.value == 'DEVICE') const deviceDeviceTypeList = getStrDictOptions(DICT_TYPE.APP_DEVICE_MOLD_TYPE) +const isConformList = [{ + label:'是', + value:'TRUE' +},{ + label:'否', + value:'FALSE' +}] // 表单校验 export const DeviceSpotInspectionRecordMainRules = reactive({ deviceNumber: [required], @@ -81,6 +89,7 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive { return userListAll.find((account) => account.id == cellValue)?.nickname }, + isDetail:false, form: { component: 'Select', api: () => userList, @@ -93,6 +102,18 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive { + return isConformList.find((account) => account.value == cellValue)?.label + }, }, { diff --git a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue index c6a3c43..b76ae63 100644 --- a/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue +++ b/src/views/eam/device/deviceSpotInspectionRecordMain/index.vue @@ -106,6 +106,7 @@ import * as DeviceSpotInspectionRecordMainApi from '@/api/eam/device/deviceSpotI import * as DeviceSpotInspectionRecordDetailApi from '@/api/eam/device/deviceSpotInspectionRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' import { useUserStore } from '@/store/modules/user' +import * as UserApi from '@/api/system/user' defineOptions({ name: 'DeviceSpotInspectionRecordMain' }) const message = useMessage() // 消息弹窗 @@ -288,7 +289,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,'DeviceSpotInspectionRecordMain') } diff --git a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts index 654011b..cf4c08e 100644 --- a/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts +++ b/src/views/eam/device/devicemaintainjob/deviceMaintainOrderMain.data.ts @@ -186,10 +186,11 @@ export const DeviceMaintainOrderMain = useCrudSchemas(reactive([ detail:{ dateFormat:'YYYY-MM-DD HH:mm:ss' } + }, { label: '完成时间', - field: 'finishedTime', + field: 'completionTime', sort: 'custom', isSearch: false, table: { diff --git a/src/views/eam/device/problemSolving/index.vue b/src/views/eam/device/problemSolving/index.vue index 66303da..bc88d44 100644 --- a/src/views/eam/device/problemSolving/index.vue +++ b/src/views/eam/device/problemSolving/index.vue @@ -1,231 +1,269 @@