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

🐛 fix(system)：修复租户 get-by-website 接口不支持端口的问题 

🐛 fix(mes)：修复常见缺陷的「检测项类型」错用独立字典的问题

「常见缺陷」与「检测项设置」的「检测项类型」语义一致，应共用同一份字典；DefectForm 与列表页统一改为 MES_INDICATOR_TYPE，并清理未使用的 MES_DEFECT_TYPE 常量。
feat/mes
YunaiV 2026-05-02 00:35:16 +08:00
parent 2e65691737
commit 418f0c4f52
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/dict.ts
View File

@ -268,7 +268,6 @@ export enum DICT_TYPE {
MES_INDICATOR_TYPE = 'mes_indicator_type', // MES 检测项类型 MES_INDICATOR_TYPE = 'mes_indicator_type', // MES 检测项类型
MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型 MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型
MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级 MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级
MES_DEFECT_TYPE = 'mes_defect_type', // MES 缺陷检测项类型
MES_PRO_WORK_ORDER_STATUS = 'mes_pro_work_order_status', // MES 生产工单状态 MES_PRO_WORK_ORDER_STATUS = 'mes_pro_work_order_status', // MES 生产工单状态
MES_PRO_WORK_ORDER_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型 MES_PRO_WORK_ORDER_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型
MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type', // MES 工单类型 MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type', // MES 工单类型

2
src/views/mes/qc/defect/DefectForm.vue
View File

@ -21,7 +21,7 @@
<el-form-item label="检测项类型" prop="type"> <el-form-item label="检测项类型" prop="type">
<el-select v-model="formData.type" placeholder="请选择检测项类型" clearable class="!w-1/1"> <el-select v-model="formData.type" placeholder="请选择检测项类型" clearable class="!w-1/1">
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DEFECT_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"

4
src/views/mes/qc/defect/index.vue
View File

@ -37,7 +37,7 @@
class="!w-240px" class="!w-240px"
> >
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DEFECT_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
:key="dict.value" :key="dict.value"
:label="dict.label" :label="dict.label"
:value="dict.value" :value="dict.value"
@ -90,7 +90,7 @@
<el-table-column label="缺陷描述" align="center" prop="name" min-width="200" /> <el-table-column label="缺陷描述" align="center" prop="name" min-width="200" />
<el-table-column label="检测项类型" align="center" prop="type" width="120"> <el-table-column label="检测项类型" align="center" prop="type" width="120">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_DEFECT_TYPE" :value="scope.row.type" /> <dict-tag :type="DICT_TYPE.MES_INDICATOR_TYPE" :value="scope.row.type" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="缺陷等级" align="center" prop="level" width="120"> <el-table-column label="缺陷等级" align="center" prop="level" width="120">