From 298ad41d5bb373d5641d0bfd21f8f789300eafd7 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 21 Feb 2026 21:03:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(mes):=20=E9=87=8D=E6=9E=84=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E7=B1=BB=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E7=AD=89=E7=BA=A7=E5=AD=97=E6=AE=B5=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=B8=BA=E6=95=B4=E6=95=B0=EF=BC=8C=E4=BC=98=E5=8C=96=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E8=AE=B0=E5=BD=95=E5=86=85=E8=81=94=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/mes/qc/defect/index.ts | 2 +- src/views/mes/qc/defect/DefectForm.vue | 4 +- src/views/mes/qc/defect/index.vue | 4 +- .../components/DefectRecordInlineList.vue | 231 +++++++++++++++ src/views/mes/qc/iqc/IqcDefectList.vue | 268 ------------------ src/views/mes/qc/iqc/IqcForm.vue | 27 +- src/views/mes/qc/iqc/IqcLineList.vue | 53 ++-- src/views/mes/qc/iqc/index.vue | 1 + .../mes/qc/template/TemplateIndicatorList.vue | 2 +- .../mes/qc/template/TemplateItemList.vue | 2 +- .../template/components/QcTemplateSelect.vue | 81 ++++++ src/views/mes/utils/constants.ts | 8 + 12 files changed, 368 insertions(+), 315 deletions(-) create mode 100644 src/views/mes/qc/defect/record/components/DefectRecordInlineList.vue delete mode 100644 src/views/mes/qc/iqc/IqcDefectList.vue create mode 100644 src/views/mes/qc/template/components/QcTemplateSelect.vue diff --git a/src/api/mes/qc/defect/index.ts b/src/api/mes/qc/defect/index.ts index f1eed2a6e..fd6a58414 100644 --- a/src/api/mes/qc/defect/index.ts +++ b/src/api/mes/qc/defect/index.ts @@ -6,7 +6,7 @@ export interface QcDefectVO { code: string // 缺陷编码 name: string // 缺陷描述 type: string // 检测项类型 - level: string // 缺陷等级 + level: number // 缺陷等级 remark: string // 备注 } diff --git a/src/views/mes/qc/defect/DefectForm.vue b/src/views/mes/qc/defect/DefectForm.vue index 07209d1a5..39770da1a 100644 --- a/src/views/mes/qc/defect/DefectForm.vue +++ b/src/views/mes/qc/defect/DefectForm.vue @@ -43,7 +43,7 @@ class="!w-1/1" > diff --git a/src/views/mes/qc/iqc/IqcDefectList.vue b/src/views/mes/qc/iqc/IqcDefectList.vue deleted file mode 100644 index 9c0eafd88..000000000 --- a/src/views/mes/qc/iqc/IqcDefectList.vue +++ /dev/null @@ -1,268 +0,0 @@ - - - - diff --git a/src/views/mes/qc/iqc/IqcForm.vue b/src/views/mes/qc/iqc/IqcForm.vue index 510dff668..9ca6bba28 100644 --- a/src/views/mes/qc/iqc/IqcForm.vue +++ b/src/views/mes/qc/iqc/IqcForm.vue @@ -12,7 +12,7 @@ - + @@ -21,12 +21,12 @@ - - + + @@ -200,22 +200,12 @@ - - - - - + @@ -229,8 +219,8 @@ 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 IqcLineList from './IqcLineList.vue' -import IqcDefectList from './IqcDefectList.vue' +// TODO @AI:参考 /Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/system/user/UserForm.vue 写变量、方法注释; defineOptions({ name: 'IqcForm' }) const { t } = useI18n() @@ -243,6 +233,7 @@ const formType = ref('') const activeTab = ref('line') // 模板列表 +// TODO @AI:/Users/yunai/Java/yudao-all-in-one/yudao-ui-admin-vue3/src/views/mes/qc/template 封装一个 components 下的 select 组件; const templateList = ref([]) const formData = ref({ @@ -268,7 +259,6 @@ const formData = ref({ inspectDate: undefined, inspectorUserId: undefined, remark: undefined, - status: 0, // 缺陷统计(只读) criticalRate: 0, majorRate: 0, @@ -356,7 +346,6 @@ const resetForm = () => { inspectDate: undefined, inspectorUserId: undefined, remark: undefined, - status: 0, // TODO @AI:默认值,不用填写; criticalRate: 0, majorRate: 0, minorRate: 0, diff --git a/src/views/mes/qc/iqc/IqcLineList.vue b/src/views/mes/qc/iqc/IqcLineList.vue index f30f9f726..da9254627 100644 --- a/src/views/mes/qc/iqc/IqcLineList.vue +++ b/src/views/mes/qc/iqc/IqcLineList.vue @@ -21,51 +21,59 @@ + + - - - - + + diff --git a/src/views/mes/qc/iqc/index.vue b/src/views/mes/qc/iqc/index.vue index b1525aaeb..80142f7b8 100644 --- a/src/views/mes/qc/iqc/index.vue +++ b/src/views/mes/qc/iqc/index.vue @@ -204,6 +204,7 @@ diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index 914e6fc2d..dbf7803ad 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -130,6 +130,14 @@ export const MesDvCheckResultEnum = { ABNORMAL: 2 // 异常 } +/** MES 质检类型枚举 */ +export const MesQcTypeEnum = { + IQC: 1, // 来料检验 + IPQC: 2, // 过程检验 + OQC: 3, // 出货检验 + RQC: 4 // 退货检验 +} + /** MES 来料检验单(IQC)状态枚举 */ export const MesQcIqcStatusEnum = { PREPARE: 0, // 草稿