From 81bee7693f651e2f7198bc52ac724f1fb60e9f05 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 24 Feb 2026 05:16:41 +0800 Subject: [PATCH] =?UTF-8?q?refactor(mes):=20=E6=96=B0=E5=A2=9E=20mes=5Ford?= =?UTF-8?q?er=5Fstatus=20=E5=AD=97=E5=85=B8=EF=BC=8C=E6=9B=BF=E4=BB=A3=20m?= =?UTF-8?q?es=5Fqc=5Fiqc=5Fstatus?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - dict.ts：MES_QC_IQC_STATUS → MES_ORDER_STATUS，删除 @AI TODO - constants.ts：4 个独立 QC 状态枚举（IQC/IPQC/OQC/RQC）合并为统一的 MesOrderStatusEnum（草稿/已确认/审批中/已审批/已完成/已取消） - iqc/ipqc/oqc/rqc index.vue：字典类型引用更新为 MES_ORDER_STATUS - iqc/index.vue：状态判断由 MesQcIqcStatusEnum.PREPARE → MesOrderStatusEnum.DRAFT --- src/utils/dict.ts | 4 ++-- src/views/mes/qc/ipqc/index.vue | 2 +- src/views/mes/qc/iqc/index.vue | 12 ++++++------ src/views/mes/qc/oqc/index.vue | 2 +- src/views/mes/qc/rqc/index.vue | 2 +- src/views/mes/utils/constants.ts | 30 ++++++++---------------------- 6 files changed, 19 insertions(+), 33 deletions(-) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 96b0cd501..364dc7cad 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -274,7 +274,7 @@ export enum DICT_TYPE { MES_PRO_LINK_TYPE = 'mes_pro_link_type', // MES 工序关系类型 MES_PRO_TASK_STATUS = 'mes_pro_task_status', // MES 生产任务状态 MES_TIME_UNIT_TYPE = 'mes_time_unit_type', // MES 时间单位 - MES_QC_IQC_STATUS = 'mes_qc_iqc_status', // MES 检验单状态 + MES_ORDER_STATUS = 'mes_order_status', // MES 单据状态 MES_QC_CHECK_RESULT = 'mes_qc_check_result', // MES 检测结果 MES_QC_SOURCE_DOC_TYPE = 'mes_qc_source_doc_type', // MES 来源单据类型 MES_IPQC_TYPE = 'mes_ipqc_type', // MES IPQC 检验类型 @@ -293,5 +293,5 @@ export enum DICT_TYPE { MES_PRO_ANDON_LEVEL = 'mes_pro_andon_level', // MES 安灯级别 MES_RQC_TYPE = 'mes_rqc_type', // MES 退货检验类型 MES_WM_ARRIVAL_NOTICE_STATUS = 'mes_wm_arrival_notice_status', // MES 到货通知单状态 - MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status', // MES 物料接收单状态 + MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status' // MES 物料接收单状态 } diff --git a/src/views/mes/qc/ipqc/index.vue b/src/views/mes/qc/ipqc/index.vue index 85283a0f6..572e5274c 100644 --- a/src/views/mes/qc/ipqc/index.vue +++ b/src/views/mes/qc/ipqc/index.vue @@ -138,7 +138,7 @@ diff --git a/src/views/mes/qc/iqc/index.vue b/src/views/mes/qc/iqc/index.vue index de11ee875..ed7f9a0d7 100644 --- a/src/views/mes/qc/iqc/index.vue +++ b/src/views/mes/qc/iqc/index.vue @@ -152,7 +152,7 @@ @@ -162,7 +162,7 @@ type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:qc-iqc:update']" - v-if="scope.row.status === MesQcIqcStatusEnum.PREPARE" + v-if="scope.row.status === MesOrderStatusEnum.DRAFT" > 编辑 @@ -171,7 +171,7 @@ type="success" @click="handleComplete(scope.row.id)" v-hasPermi="['mes:qc-iqc:update']" - v-if="scope.row.status === MesQcIqcStatusEnum.PREPARE" + v-if="scope.row.status === MesOrderStatusEnum.DRAFT" > 完成 @@ -180,7 +180,7 @@ link type="primary" @click="openForm('update', scope.row.id)" - v-if="scope.row.status !== MesQcIqcStatusEnum.PREPARE" + v-if="scope.row.status !== MesOrderStatusEnum.DRAFT" > 查看报表 @@ -189,7 +189,7 @@ type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:qc-iqc:delete']" - v-if="scope.row.status === MesQcIqcStatusEnum.PREPARE" + v-if="scope.row.status === MesOrderStatusEnum.DRAFT" > 删除 @@ -218,7 +218,7 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue' import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue' import UserSelect from '@/views/system/user/components/UserSelect.vue' -import { MesQcIqcStatusEnum } from '@/views/mes/utils/constants' +import { MesOrderStatusEnum } from '@/views/mes/utils/constants' defineOptions({ name: 'MesQcIqc' }) diff --git a/src/views/mes/qc/oqc/index.vue b/src/views/mes/qc/oqc/index.vue index 67e1e5553..86c5365c9 100644 --- a/src/views/mes/qc/oqc/index.vue +++ b/src/views/mes/qc/oqc/index.vue @@ -146,7 +146,7 @@ diff --git a/src/views/mes/qc/rqc/index.vue b/src/views/mes/qc/rqc/index.vue index bf5f62abb..d016a18cf 100644 --- a/src/views/mes/qc/rqc/index.vue +++ b/src/views/mes/qc/rqc/index.vue @@ -149,7 +149,7 @@ diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 215268425..f84bd24f6 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -147,28 +147,14 @@ export const MesQcTypeEnum = { RQC: 4 // 退货检验 } -/** MES 来料检验单（IQC）状态枚举 */ -export const MesQcIqcStatusEnum = { - PREPARE: 0, // 草稿 - FINISHED: 1 // 已完成 -} - -/** MES 过程检验单（IPQC）状态枚举 */ -export const MesQcIpqcStatusEnum = { - PREPARE: 0, // 草稿 - FINISHED: 1 // 已完成 -} - -/** MES 出货检验单（OQC）状态枚举 */ -export const MesQcOqcStatusEnum = { - PREPARE: 0, // 草稿 - FINISHED: 1 // 已完成 -} - -/** MES 退货检验单（RQC）状态枚举 */ -export const MesQcRqcStatusEnum = { - PREPARE: 0, // 草稿 - FINISHED: 1 // 已完成 +/** MES 单据状态枚举 */ +export const MesOrderStatusEnum = { + DRAFT: 0, // 草稿 + CONFIRMED: 1, // 已确认 + APPROVING: 2, // 审批中 + APPROVED: 3, // 已审批 + FINISHED: 4, // 已完成 + CANCELLED: 5 // 已取消 } /** MES 生产报工状态枚举 */