From 0a96738cfbc240a8ecb8929ee32dcca804e22d90 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Thu, 16 Apr 2026 19:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E6=9B=B4=E6=96=B0=20M?= =?UTF-8?q?ES=20=E7=8A=B6=E6=80=81=E5=B8=B8=E9=87=8F=E5=92=8C=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 将 MES 设备维护记录状态枚举中的状态值更新为常量引用,增强代码可读性和一致性。同时,新增 MES 单据状态常量,简化状态管理。 --- src/views/mes/pro/feedback/FeedbackForm.vue | 4 +-- .../mes/pro/task/components/ProTaskSelect.vue | 2 +- src/views/mes/qc/ipqc/IpqcForm.vue | 4 +-- src/views/mes/utils/constants.ts | 32 +++++++++---------- 4 files changed, 18 insertions(+), 24 deletions(-) diff --git a/src/views/mes/pro/feedback/FeedbackForm.vue b/src/views/mes/pro/feedback/FeedbackForm.vue index 0a8485f6d..33273dc35 100644 --- a/src/views/mes/pro/feedback/FeedbackForm.vue +++ b/src/views/mes/pro/feedback/FeedbackForm.vue @@ -62,9 +62,7 @@ :workOrderId="formData.workOrderId" :workstationId="formData.workstationId" :statuses="[ - MesProTaskStatusEnum.NORMAL, - MesProTaskStatusEnum.START, - MesProTaskStatusEnum.PAUSE + MesProTaskStatusEnum.PREPARE ]" :disabled="isHeaderReadonly || !formData.workOrderId" placeholder="请选择任务" diff --git a/src/views/mes/pro/task/components/ProTaskSelect.vue b/src/views/mes/pro/task/components/ProTaskSelect.vue index 550a6bd08..a0b52f96e 100644 --- a/src/views/mes/pro/task/components/ProTaskSelect.vue +++ b/src/views/mes/pro/task/components/ProTaskSelect.vue @@ -69,7 +69,7 @@ const props = withDefaults( workOrderId?: number // 可选,打开弹窗时默认按此工单过滤 workstationId?: number // 可选,打开弹窗时默认按此工位过滤 statuses?: number[] // 可选,任务状态列表(IN 查询) - disabled?: boolean // 是否禁用 + m?: boolean // 是否禁用 clearable?: boolean // 是否允许清空 placeholder?: string // 占位文字 }>(), diff --git a/src/views/mes/qc/ipqc/IpqcForm.vue b/src/views/mes/qc/ipqc/IpqcForm.vue index 921cf9e56..c7e427db4 100644 --- a/src/views/mes/qc/ipqc/IpqcForm.vue +++ b/src/views/mes/qc/ipqc/IpqcForm.vue @@ -90,9 +90,7 @@ :workOrderId="formData.workOrderId" :workstationId="formData.workstationId" :statuses="[ - MesProTaskStatusEnum.NORMAL, - MesProTaskStatusEnum.START, - MesProTaskStatusEnum.PAUSE + MesProTaskStatusEnum.PREPARE ]" placeholder="请选择生产任务" class="!w-1/1" diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 30c478eed..7eab07311 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -1,3 +1,13 @@ +/** MES 单据状态常量 */ +export const MesOrderStatusConstants = { + DRAFT: 0, + CONFIRMED: 1, + APPROVING: 2, + APPROVED: 3, + FINISHED: 4, + CANCELLED: 5 +} as const + /** MES 工具状态枚举 */ export const MesToolStatusEnum = { STORE: 1, // 在库 @@ -89,11 +99,9 @@ export const MesProWorkOrderSourceTypeEnum = { /** MES 生产任务状态枚举 */ export const MesProTaskStatusEnum = { - NORMAL: 0, // 草稿 - START: 1, // 进行中 - PAUSE: 2, // 暂停 - FINISHED: 3, // 已完成 - CANCELED: 4 // 已取消 + PREPARE: MesOrderStatusConstants.DRAFT, // 草稿 + FINISHED: MesOrderStatusConstants.FINISHED, // 已完成 + CANCELED: MesOrderStatusConstants.CANCELLED // 已取消 } /** MES 点检保养项目类型枚举(对应字典 mes_dv_subject_type) */ @@ -110,8 +118,8 @@ export const MesDvCheckPlanStatusEnum = { /** MES 设备保养记录状态枚举 */ export const MesDvMaintenRecordStatusEnum = { - PREPARE: 0, // 草稿 - SUBMITTED: 1 // 已提交 + PREPARE: MesOrderStatusConstants.DRAFT, // 草稿 + SUBMITTED: MesOrderStatusConstants.FINISHED // 已提交 } /** MES 设备保养明细结果枚举(对应字典 mes_mainten_status) */ @@ -176,16 +184,6 @@ export const MesQcTypeEnum = { RQC: 4 // 退货检验 } -/** MES 单据状态常量 */ -export const MesOrderStatusConstants = { - DRAFT: 0, - CONFIRMED: 1, - APPROVING: 2, - APPROVED: 3, - FINISHED: 4, - CANCELLED: 5 -} as const - /** MES 维修工单状态枚举 */ export const MesDvRepairStatusEnum = { PREPARE: MesOrderStatusConstants.DRAFT, // 草稿