diff --git a/src/api/mes/dv/checkrecord/index.ts b/src/api/mes/dv/checkrecord/index.ts new file mode 100644 index 000000000..0c5e43883 --- /dev/null +++ b/src/api/mes/dv/checkrecord/index.ts @@ -0,0 +1,57 @@ +import request from '@/config/axios' + +// MES 设备点检记录 VO +export interface DvCheckRecordVO { + id: number // 编号 + planId: number // 点检计划编号 + planType?: number // 计划类型 + planName?: string // 计划名称 + machineryId: number // 设备编号 + machineryCode?: string // 设备编码 + machineryName?: string // 设备名称 + machineryBrand?: string // 品牌 + machinerySpec?: string // 规格型号 + checkTime: Date // 点检时间 + userId: number // 点检人编号 + nickname?: string // 点检人名称 + status: number // 状态 + remark: string // 备注 +} + +// MES 设备点检记录 API +export const DvCheckRecordApi = { + // 查询设备点检记录分页 + getCheckRecordPage: async (params: any) => { + return await request.get({ url: `/mes/dv/check-record/page`, params }) + }, + + // 查询设备点检记录详情 + getCheckRecord: async (id: number) => { + return await request.get({ url: `/mes/dv/check-record/get?id=` + id }) + }, + + // 新增设备点检记录 + createCheckRecord: async (data: DvCheckRecordVO) => { + return await request.post({ url: `/mes/dv/check-record/create`, data }) + }, + + // 修改设备点检记录 + updateCheckRecord: async (data: DvCheckRecordVO) => { + return await request.put({ url: `/mes/dv/check-record/update`, data }) + }, + + // 提交设备点检记录 + submitCheckRecord: async (id: number) => { + return await request.put({ url: `/mes/dv/check-record/submit?id=` + id }) + }, + + // 删除设备点检记录 + deleteCheckRecord: async (id: number) => { + return await request.delete({ url: `/mes/dv/check-record/delete?id=` + id }) + }, + + // 导出设备点检记录 Excel + exportCheckRecord: async (params: any) => { + return await request.download({ url: `/mes/dv/check-record/export-excel`, params }) + } +} diff --git a/src/api/mes/dv/checkrecord/line/index.ts b/src/api/mes/dv/checkrecord/line/index.ts new file mode 100644 index 000000000..424f63b07 --- /dev/null +++ b/src/api/mes/dv/checkrecord/line/index.ts @@ -0,0 +1,44 @@ +import request from '@/config/axios' + +// MES 设备点检记录明细 VO +export interface DvCheckRecordLineVO { + id: number // 编号 + recordId: number // 点检记录编号 + subjectId: number // 点检项目编号 + subjectCode?: string // 项目编码 + subjectName?: string // 项目名称 + subjectContent?: string // 检查内容 + subjectStandard?: string // 检查标准 + // TODO @AI：number + checkStatus: string // 点检结果 + checkResult?: string // 异常描述 + remark: string // 备注 +} + +// MES 设备点检记录明细 API +export const DvCheckRecordLineApi = { + // 查询设备点检记录明细分页 + getCheckRecordLinePage: async (params: any) => { + return await request.get({ url: `/mes/dv/check-record-line/page`, params }) + }, + + // 查询设备点检记录明细详情 + getCheckRecordLine: async (id: number) => { + return await request.get({ url: `/mes/dv/check-record-line/get?id=` + id }) + }, + + // 新增设备点检记录明细 + createCheckRecordLine: async (data: DvCheckRecordLineVO) => { + return await request.post({ url: `/mes/dv/check-record-line/create`, data }) + }, + + // 修改设备点检记录明细 + updateCheckRecordLine: async (data: DvCheckRecordLineVO) => { + return await request.put({ url: `/mes/dv/check-record-line/update`, data }) + }, + + // 删除设备点检记录明细 + deleteCheckRecordLine: async (id: number) => { + return await request.delete({ url: `/mes/dv/check-record-line/delete?id=` + id }) + } +} diff --git a/src/api/mes/dv/maintenrecord/index.ts b/src/api/mes/dv/maintenrecord/index.ts index d2870bdfc..2caa14ae4 100644 --- a/src/api/mes/dv/maintenrecord/index.ts +++ b/src/api/mes/dv/maintenrecord/index.ts @@ -39,6 +39,11 @@ export const DvMaintenRecordApi = { return await request.put({ url: `/mes/dv/mainten-record/update`, data }) }, + // 提交设备保养记录 + submitMaintenRecord: async (id: number) => { + return await request.put({ url: `/mes/dv/mainten-record/submit?id=` + id }) + }, + // 删除设备保养记录 deleteMaintenRecord: async (id: number) => { return await request.delete({ url: `/mes/dv/mainten-record/delete?id=` + id }) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 153161641..4793c5daa 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -283,4 +283,6 @@ export enum DICT_TYPE { MES_MAINTEN_STATUS = 'mes_mainten_status', // MES 保养结果 MES_DV_REPAIR_STATUS = 'mes_dv_repair_status', // MES 维修工单状态 MES_DV_REPAIR_RESULT = 'mes_dv_repair_result', // MES 维修结果 + MES_DV_CHECK_RECORD_STATUS = 'mes_dv_check_record_status', // MES 点检记录状态 + MES_DV_CHECK_RESULT = 'mes_dv_check_result', // MES 点检结果 } diff --git a/src/views/mes/dv/checkrecord/CheckRecordForm.vue b/src/views/mes/dv/checkrecord/CheckRecordForm.vue new file mode 100644 index 000000000..45f89e7b4 --- /dev/null +++ b/src/views/mes/dv/checkrecord/CheckRecordForm.vue @@ -0,0 +1,147 @@ + + + diff --git a/src/views/mes/dv/checkrecord/CheckRecordLineList.vue b/src/views/mes/dv/checkrecord/CheckRecordLineList.vue new file mode 100644 index 000000000..eaa441770 --- /dev/null +++ b/src/views/mes/dv/checkrecord/CheckRecordLineList.vue @@ -0,0 +1,205 @@ + + + + diff --git a/src/views/mes/dv/checkrecord/index.vue b/src/views/mes/dv/checkrecord/index.vue new file mode 100644 index 000000000..c0a1e967b --- /dev/null +++ b/src/views/mes/dv/checkrecord/index.vue @@ -0,0 +1,230 @@ + + + diff --git a/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue b/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue index c8358f67f..4278fb37c 100644 --- a/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue +++ b/src/views/mes/dv/maintenrecord/MaintenRecordForm.vue @@ -64,6 +64,7 @@ import DvMachinerySelect from '@/views/mes/dv/machinery/components/DvMachinerySe import DvCheckPlanSelect from '@/views/mes/dv/checkplan/components/DvCheckPlanSelect.vue' import UserSelect from '@/views/system/user/components/UserSelect.vue' import MaintenRecordLineList from './MaintenRecordLineList.vue' +import { MesDvMaintenRecordStatusEnum } from '@/views/mes/utils/constants' defineOptions({ name: 'MaintenRecordForm' }) @@ -80,7 +81,7 @@ const formData = ref({ machineryId: undefined, maintenTime: undefined, userId: undefined, - status: 0, + status: MesDvMaintenRecordStatusEnum.PREPARE, remark: '' }) const formRules = reactive({ @@ -141,7 +142,7 @@ const resetForm = () => { machineryId: undefined, maintenTime: undefined, userId: undefined, - status: 0, // TODO @AI：这里要枚举！ + status: MesDvMaintenRecordStatusEnum.PREPARE, remark: '' } formRef.value?.resetFields() diff --git a/src/views/mes/dv/maintenrecord/MaintenRecordLineList.vue b/src/views/mes/dv/maintenrecord/MaintenRecordLineList.vue index 2f4fbc3c9..6fb4e90e2 100644 --- a/src/views/mes/dv/maintenrecord/MaintenRecordLineList.vue +++ b/src/views/mes/dv/maintenrecord/MaintenRecordLineList.vue @@ -36,23 +36,9 @@ - + - - - + @@ -65,7 +51,6 @@ - @@ -73,7 +58,6 @@ -