yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor(mes): 新增 mes_order_status 字典，替代 mes_qc_iqc_status 

- 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
pull/871/MERGE
YunaiV 2026-02-24 05:16:41 +08:00
parent d7d22b8a8f
commit 81bee7693f
6 changed files with 19 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/utils/dict.ts
View File

@ -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 物料接收单状态
}

2
src/views/mes/qc/ipqc/index.vue
View File

@ -138,7 +138,7 @@
<el-table-column label="检测人员" align="center" prop="inspectorNickname" width="100" />
<el-table-column label="单据状态" align="center" prop="status" width="80">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_QC_IQC_STATUS" :value="scope.row.status" />
<dict-tag :type="DICT_TYPE.MES_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" fixed="right">

12
src/views/mes/qc/iqc/index.vue
View File

@ -152,7 +152,7 @@
<el-table-column label="检测人员" align="center" prop="inspectorNickname" width="100" />
<el-table-column label="单据状态" align="center" prop="status" width="90">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_QC_IQC_STATUS" :value="scope.row.status" />
<dict-tag :type="DICT_TYPE.MES_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" fixed="right">
@ -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"
>
编辑
</el-button>
@ -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"
>
完成
</el-button>
@ -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"
>
查看报表
</el-button>
@ -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"
>
删除
</el-button>
@ -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' })

2
src/views/mes/qc/oqc/index.vue
View File

@ -146,7 +146,7 @@
<el-table-column label="检测人员" align="center" prop="inspectorNickname" width="100" />
<el-table-column label="单据状态" align="center" prop="status" width="80">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_QC_IQC_STATUS" :value="scope.row.status" />
<dict-tag :type="DICT_TYPE.MES_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" fixed="right">

2
src/views/mes/qc/rqc/index.vue
View File

@ -149,7 +149,7 @@
<el-table-column label="检测人员" align="center" prop="inspectorNickname" width="100" />
<el-table-column label="单据状态" align="center" prop="status" width="80">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_QC_IQC_STATUS" :value="scope.row.status" />
<dict-tag :type="DICT_TYPE.MES_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="180" fixed="right">

30
src/views/mes/utils/constants.ts
View File

@ -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 生产报工状态枚举 */