From 5596ee712d63c28c125f635cfdda30be60f99ffe Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Wed, 5 Jun 2024 17:33:36 +0800 Subject: [PATCH] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=B7=A5=E5=8D=95=20=E4=B8=BB=E5=AD=90=E8=81=94?= =?UTF-8?q?=E5=8A=A8=20=E5=89=8D=E5=90=8E=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentRepairJobDetail/index.ts | 59 + src/api/eam/equipmentRepairJobMain/index.ts | 93 ++ src/utils/dict.ts | 6 +- .../basicFaultCause/basicFaultCause.data.ts | 2 +- .../eam/basicFaultType/basicFaultType.data.ts | 2 +- .../equipmentMaintenanceMain.data.ts | 2 + .../eam/equipmentMaintenanceMain/index.vue | 35 - .../equipmentRepairJobDetail.data.ts | 145 +++ .../eam/equipmentRepairJobDetail/index.vue | 244 ++++ .../EquipmentRepairJobDetail.vue | 1086 +++++++++++++++++ .../equipmentRepairJobMain.data.ts | 668 ++++++++++ .../eam/equipmentRepairJobMain/index.vue | 320 +++++ .../equipmentReportRepairRequest.data.ts | 2 +- .../equipmentReportRepairRequest/index.vue | 3 +- 14 files changed, 2627 insertions(+), 40 deletions(-) create mode 100644 src/api/eam/equipmentRepairJobDetail/index.ts create mode 100644 src/api/eam/equipmentRepairJobMain/index.ts create mode 100644 src/views/eam/equipmentRepairJobDetail/equipmentRepairJobDetail.data.ts create mode 100644 src/views/eam/equipmentRepairJobDetail/index.vue create mode 100644 src/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue create mode 100644 src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts create mode 100644 src/views/eam/equipmentRepairJobMain/index.vue diff --git a/src/api/eam/equipmentRepairJobDetail/index.ts b/src/api/eam/equipmentRepairJobDetail/index.ts new file mode 100644 index 000000000..efe6bdaa8 --- /dev/null +++ b/src/api/eam/equipmentRepairJobDetail/index.ts @@ -0,0 +1,59 @@ +import request from '@/config/axios' + +export interface EquipmentRepairJobDetailVO { + id: number + number: string + masterId: number + describing: string + faultCause: string + workOut: string + maintenances: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询维修工单子列表 +export const getEquipmentRepairJobDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-repair-job-detail/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-repair-job-detail/page`, params }) + } +} + +// 查询维修工单子详情 +export const getEquipmentRepairJobDetail = async (id: number) => { + return await request.get({ url: `/eam/equipment-repair-job-detail/get?id=` + id }) +} + +// 新增维修工单子 +export const createEquipmentRepairJobDetail = async (data: EquipmentRepairJobDetailVO) => { + return await request.post({ url: `/eam/equipment-repair-job-detail/create`, data }) +} + +// 修改维修工单子 +export const updateEquipmentRepairJobDetail = async (data: EquipmentRepairJobDetailVO) => { + return await request.put({ url: `/eam/equipment-repair-job-detail/update`, data }) +} + +// 删除维修工单子 +export const deleteEquipmentRepairJobDetail = async (id: number) => { + return await request.delete({ url: `/eam/equipment-repair-job-detail/delete?id=` + id }) +} + +// 导出维修工单子 Excel +export const exportEquipmentRepairJobDetail = async (params) => { + return await request.download({ url: `/eam/equipment-repair-job-detail/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-repair-job-detail/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/eam/equipmentRepairJobMain/index.ts b/src/api/eam/equipmentRepairJobMain/index.ts new file mode 100644 index 000000000..471f98905 --- /dev/null +++ b/src/api/eam/equipmentRepairJobMain/index.ts @@ -0,0 +1,93 @@ +import request from '@/config/axios' +import {EquipmentReportRepairRequestVO} from "@/api/eam/equipmentReportRepairRequest"; + +export interface EquipmentRepairJobMainVO { + id: number + number: string + type: string + repairNumber: string + sources: string + maintenanceDesc: string + urgency: string + level: string + equipmentCode: string + shutDown: boolean + startTime: Date + endTime: Date + totalMinutes: number + verifyer: number + verifyContent: string + verifyTime: Date + maintenancer: number + maintenancePhone: string + completeResult: string + completionTime: Date + maintenanceTime: Date + repairTime: Date + repairer: number + faultType: string + status: string + autoOrder: string + autoPerform: string + autoVerify: string + directCreateRecord: string + classType: string + factoryAreaCode: string + workshopCode: string + lineCode: string + processCode: string + workstationCode: string + departmentCode: string + remark: string + siteId: string + available: string + deletionTime: Date + deleterId: byte[] + concurrencyStamp: number +} + +// 查询维修工单主列表 +export const getEquipmentRepairJobMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/eam/equipment-repair-job-main/senior', data }) + } else { + return await request.get({ url: `/eam/equipment-repair-job-main/page`, params }) + } +} + +// 查询维修工单主详情 +export const getEquipmentRepairJobMain = async (id: number) => { + return await request.get({ url: `/eam/equipment-repair-job-main/get?id=` + id }) +} + +// 新增维修工单主 +export const createEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => { + return await request.post({ url: `/eam/equipment-repair-job-main/create`, data }) +} + +// 修改维修工单主 +export const updateEquipmentRepairJobMain = async (data: EquipmentRepairJobMainVO) => { + return await request.put({ url: `/eam/equipment-repair-job-main/update`, data }) +} + +// 删除维修工单主 +export const deleteEquipmentRepairJobMain = async (id: number) => { + return await request.delete({ url: `/eam/equipment-repair-job-main/delete?id=` + id }) +} + +// 导出维修工单主 Excel +export const exportEquipmentRepairJobMain = async (params) => { + return await request.download({ url: `/eam/equipment-repair-job-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/eam/equipment-repair-job-main/get-import-template' }) +} + +// 修改维修工单状态 +export const updateEquipmentRepairOrder = async (data: EquipmentRepairJobMainVO) => { + return await request.post({ url: `/eam/equipment-repair-job-main/updateOrder`, data }) +} diff --git a/src/utils/dict.ts b/src/utils/dict.ts index bee45f6c3..67b6c1bc0 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -356,6 +356,10 @@ export enum DICT_TYPE { MAINTENANCE_CYCLE ='maintenance_cycle', // 保养周期 EAM_ORDER_STATUS = 'eam_order_status',// 保养工单状态 EAM_PLAN_STATUS = 'eam_plan_status', // 保养计划状态 - EAM_REPAIR_STATUS = 'eam_repair_status', // 报修状态 + EAM_REPAIR_REPORT_STATUS = 'eam_repair_report_status', // 报修状态 + EAM_MAINTENANCE_SOURCES = 'eam_maintenance_sources', // 维保数据来源 + EAM_MAINTENANCE_URGENCY = 'eam_maintenance_urgency', // 维保紧急程度 + EAM_MAINTENANCE_LEVEL = 'eam_maintenance_level', // 维保维修级别 + EAM_REPAIR_STATUS = 'eam_repair_status', // 维修状态 OFF_BACK_STATUS = 'off_back_status' } diff --git a/src/views/eam/basicFaultCause/basicFaultCause.data.ts b/src/views/eam/basicFaultCause/basicFaultCause.data.ts index 3dc367434..b2861cce7 100644 --- a/src/views/eam/basicFaultCause/basicFaultCause.data.ts +++ b/src/views/eam/basicFaultCause/basicFaultCause.data.ts @@ -31,7 +31,7 @@ export const BasicFaultCause = useCrudSchemas(reactive([ }, }, { - label: '设备编码', + label: '编码', field: 'code', sort: 'custom', isSearch: true, diff --git a/src/views/eam/basicFaultType/basicFaultType.data.ts b/src/views/eam/basicFaultType/basicFaultType.data.ts index 8fe42a032..dd36093d0 100644 --- a/src/views/eam/basicFaultType/basicFaultType.data.ts +++ b/src/views/eam/basicFaultType/basicFaultType.data.ts @@ -18,7 +18,7 @@ export const BasicFaultType = useCrudSchemas(reactive([ isDetail:false, }, { - label: '设备编码', + label: '编码', field: 'code', sort: 'custom', isSearch: true, diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts index cd1c845de..6f9553762 100644 --- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts +++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts @@ -89,6 +89,8 @@ export const EquipmentMaintenanceMain = useCrudSchemas(reactive([ label: '故障类型枚举', field: 'faultType', sort: 'custom', + dictType: DICT_TYPE.FAILURE_REASON, + dictClass: 'string', isSearch: true, isSearch: false, }, diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue index 4db1801b9..e4219bc6d 100644 --- a/src/views/eam/equipmentMaintenanceMain/index.vue +++ b/src/views/eam/equipmentMaintenanceMain/index.vue @@ -353,39 +353,6 @@ const handleFinish = async (row) => { //打开提交表单 finishForm2Ref.value.open('update', row); - - //let res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig(); - //系统配置需要验证 - // if(res.remark === 'TRUE'){ - // try { - // - // - // // // 二次确认 - // // await message.delConfirm('是否完成所选中工单?'); - // // const params = ref({ - // // id: '', - // // status:'', - // // }) - // // params.value.id = row.id - // // params.value.status = '5' - // // // 发起 - // // await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) - // // message.success(t('工单已完成')) - // // // 刷新列表 - // // await getList() - // } catch {} - // } - // //系统配置不需要验证 - // if(res.remark === 'FALSE'){ - // try { - // // 二次确认 - // await message.delConfirm('是否完成所选中工单?'); - // - // //打开提交表单 - // finishForm2Ref.value.open('update', row); - // - // } catch {} - // } } /** 验证按钮操作 */ @@ -406,8 +373,6 @@ const handleValidate = async (row) => { await getList() }) - - } /** 启用 */ diff --git a/src/views/eam/equipmentRepairJobDetail/equipmentRepairJobDetail.data.ts b/src/views/eam/equipmentRepairJobDetail/equipmentRepairJobDetail.data.ts new file mode 100644 index 000000000..cae967cf5 --- /dev/null +++ b/src/views/eam/equipmentRepairJobDetail/equipmentRepairJobDetail.data.ts @@ -0,0 +1,145 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' + +// 表单校验 +export const EquipmentRepairJobDetailRules = reactive({ + number: [required], + masterId: [required], + concurrencyStamp: [required], +}) + +export const EquipmentRepairJobDetail = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '维修工单号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '主表id', + field: 'masterId', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '故障描述', + field: 'describing', + sort: 'custom', + isSearch: true, + }, + { + label: '故障原因关联基础数据', + field: 'faultCause', + sort: 'custom', + isSearch: true, + }, + { + label: '解决措施', + field: 'workOut', + sort: 'custom', + isSearch: true, + }, + { + label: '维修人员字符串多个', + field: 'maintenances', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: true, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: true, + }, + { + label: '是否可用默认TRUE', + field: 'available', + sort: 'custom', + isSearch: true, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: true, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: true, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: true, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/equipmentRepairJobDetail/index.vue b/src/views/eam/equipmentRepairJobDetail/index.vue new file mode 100644 index 000000000..bdfae4458 --- /dev/null +++ b/src/views/eam/equipmentRepairJobDetail/index.vue @@ -0,0 +1,244 @@ + + + diff --git a/src/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue b/src/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue new file mode 100644 index 000000000..7626c0627 --- /dev/null +++ b/src/views/eam/equipmentRepairJobMain/EquipmentRepairJobDetail.vue @@ -0,0 +1,1086 @@ + + + + + diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts new file mode 100644 index 000000000..4be0eadb5 --- /dev/null +++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts @@ -0,0 +1,668 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter } from '@/utils/formatTime' +import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; +import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; +import {BasicFaultCause} from "@/views/eam/basicFaultCause/basicFaultCause.data"; +import * as ItemApi from "@/api/eam/basicFaultCause"; +import {getBasicFaultCausePage} from "@/api/eam/basicFaultCause"; + +// 表单校验 +export const EquipmentRepairJobMainRules = reactive({ + number: [required], + type: [required], + sources: [required], + urgency: [required], + level: [required], + equipmentCode: [required], + totalMinutes: [required], + faultType: [required], + status: [required], +}) + +export const EquipmentRepairJobMain = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '维修工单号', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '设备类别', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', + isSearch: true, + }, + { + label: '报修工单号', + field: 'repairNumber', + sort: 'custom', + isSearch: true, + }, + { + label: '来源字典', + field: 'sources', + sort: 'custom', + dictType: DICT_TYPE.EAM_MAINTENANCE_SOURCES, + dictClass: 'string', + isSearch: false, + }, + { + label: '维修描述', + field: 'maintenanceDesc', + sort: 'custom', + isSearch: false, + }, + { + label: '紧急程度', + field: 'urgency', + sort: 'custom', + dictType: DICT_TYPE.EAM_MAINTENANCE_URGENCY, + dictClass: 'string', + isSearch: true, + }, + { + label: '维修级别', + field: 'level', + sort: 'custom', + dictType: DICT_TYPE.EAM_MAINTENANCE_LEVEL, + dictClass: 'string', + isSearch: true, + }, + { + label: '设备编号', + field: 'equipmentCode', + sort: 'custom', + isSearch: true, + isForm: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchTitle: '设备信息', // 查询弹窗标题 + searchListPlaceholder: '请选择 设备编号', // 输入框占位文本 + searchAllSchemas: EquipmentAccounts.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: EquipmentItemApi.getEquipmentAccountsPage, // 查询弹窗所需分页方法 + multiple:true, + searchCondition: [{ + key: 'status', + value: 'NORMAL', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } + }, + { + label: '是否停机', + field: 'shutDown', + sort: 'custom', + dictType: DICT_TYPE.INFRA_BOOLEAN_STRING, + dictClass: 'string', + isSearch: true, + form: { + component: 'Radio' + } + }, + { + label: '维修开始时间', + field: 'startTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '维修结束时间', + field: 'endTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '维修时长', + field: 'totalMinutes', + sort: 'custom', + isSearch: false, + }, + { + label: '验证人', + field: 'verifyer', + sort: 'custom', + isSearch: false, + }, + { + label: '验证内容', + field: 'verifyContent', + sort: 'custom', + isSearch: false, + }, + { + label: '验证时间', + field: 'verifyTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '执行人', + field: 'maintenancer', + sort: 'custom', + isSearch: false, + }, + { + label: '维修人联系电话', + field: 'maintenancePhone', + sort: 'custom', + isSearch: false, + }, + { + label: '结果', + field: 'completeResult', + sort: 'custom', + isSearch: true, + }, + { + label: '完成时间', + field: 'completionTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '执行时间', + field: 'maintenanceTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '报修时间', + field: 'repairTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '报修人', + field: 'repairer', + sort: 'custom', + isSearch: false, + }, + { + label: '故障类型', + field: 'faultType', + dictType: DICT_TYPE.FAILURE_REASON, + dictClass: 'string', + sort: 'custom', + isSearch: true, + }, + { + label: '流程状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.EAM_REPAIR_STATUS, + dictClass: 'string', + isSearch: true, + }, + // { + // label: '自动接单', + // field: 'autoOrder', + // sort: 'custom', + // isSearch: true, + // }, + // { + // label: '自动执行', + // field: 'autoPerform', + // sort: 'custom', + // isSearch: true, + // }, + // { + // label: '自动验证', + // field: 'autoVerify', + // sort: 'custom', + // isSearch: true, + // }, + { + label: '直接生成记录', + field: 'directCreateRecord', + sort: 'custom', + isSearch: false, + }, + { + label: '班组类型', + field: 'classType', + sort: 'custom', + isSearch: false, + }, + // { + // label: '所属厂区编号', + // field: 'factoryAreaCode', + // sort: 'custom', + // isSearch: true, + // }, + { + label: '车间编号', + field: 'workshopCode', + sort: 'custom', + isSearch: false, + }, + // { + // label: '产线编号', + // field: 'lineCode', + // sort: 'custom', + // isSearch: true, + // }, + // { + // label: '工序编号', + // field: 'processCode', + // sort: 'custom', + // isSearch: true, + // }, + // { + // label: '工位编号', + // field: 'workstationCode', + // sort: 'custom', + // isSearch: true, + // }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + 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')] + } + }, + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用默认TRUE', + field: 'available', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) + +// 表单校验 +export const EquipmentRepairJobDetailRules = reactive({ + number: [required], + masterId: [required], + concurrencyStamp: [required], +}) + +export const EquipmentRepairJobDetail = useCrudSchemas(reactive([ + { + label: 'id', + field: 'id', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '维修工单号', + field: 'number', + sort: 'custom', + isSearch: true, + form:{ + componentProps: { + disabled: true + } + } + }, + { + label: '主表id', + field: 'masterId', + sort: 'custom', + isSearch: true, + form:{ + componentProps: { + disabled: true + } + }, + }, + { + label: '故障描述', + field: 'describing', + sort: 'custom', + isSearch: true, + }, + { + label: '故障原因', + field: 'faultCause', + sort: 'custom', + isSearch: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择 故障原因', + searchTitle: '故障原因', // 查询弹窗标题 + searchAllSchemas: BasicFaultCause.allSchemas, // 查询弹窗所需类 + searchField: 'code', // 查询弹窗赋值字段 + searchPage: ItemApi.getBasicFaultCausePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }] + } + }, + }, + { + label: '解决措施', + field: 'workOut', + sort: 'custom', + isSearch: true, + }, + { + label: '维修人员字符串多个', + field: 'maintenances', + sort: 'custom', + isSearch: true, + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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')] + } + }, + isForm: false, + }, + { + label: '部门id', + field: 'departmentCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + isSearch: true, + }, + { + label: '地点ID', + field: 'siteId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '是否可用默认TRUE', + field: 'available', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '删除时间', + field: 'deletionTime', + sort: 'custom', + formatter: dateFormatter, + isSearch: false, + isTable: false, + isForm: false, + isDetail: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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '删除人id', + field: 'deleterId', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + }, + { + label: '并发乐观锁', + field: 'concurrencyStamp', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: false, + isDetail:false, + form: { + component: 'InputNumber', + value: 0 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 150, + fixed: 'right' + } + } +])) diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue new file mode 100644 index 000000000..2d5d60699 --- /dev/null +++ b/src/views/eam/equipmentRepairJobMain/index.vue @@ -0,0 +1,320 @@ + + + diff --git a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts index 9785ed4d6..c20a61e45 100644 --- a/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts +++ b/src/views/eam/equipmentReportRepairRequest/equipmentReportRepairRequest.data.ts @@ -144,7 +144,7 @@ export const EquipmentReportRepairRequest = useCrudSchemas(reactive { }) params.value.id = id params.value.status = '5' - await EquipmentReportRepairRequestApi.updateEquipmentReportRepairOrder(params.value) + await EquipmentReportRepairRequestApi.createEquipmentWeixiuOrder(params.value) message.success(t('common.updateSuccess')) // 刷新列表 await getList()