diff --git a/src/api/mes/qc/indicatorresult/index.ts b/src/api/mes/qc/indicatorresult/index.ts index 4a0cb3957..e169ccf92 100644 --- a/src/api/mes/qc/indicatorresult/index.ts +++ b/src/api/mes/qc/indicatorresult/index.ts @@ -1,7 +1,7 @@ import request from '@/config/axios' // MES 检验结果 VO -export interface QcResultVO { +export interface QcIndicatorResultVO { id: number // 编号 code: string // 样品编号 qcId: number // 关联质检单ID @@ -18,28 +18,22 @@ export interface QcResultVO { itemSpecification: string // 规格型号 unitName: string // 单位名称 // 子表 - items: QcResultDetailVO[] // 检验结果明细列表 + items: QcIndicatorResultDetailVO[] // 检验结果明细列表 } // MES 检验结果明细 VO -export interface QcResultDetailVO { +export interface QcIndicatorResultDetailVO { id: number // 编号 resultId: number // 关联检验结果ID indicatorId: number // 检测指标ID - toolId: number // 检测工具ID - unitMeasureId: number // 计量单位ID - valueType: number // 质检值类型 - valueSpecification: string // 值属性 - valueFloat: number // 浮点值 - valueInteger: number // 整数值 - valueText: string // 文字值 - valueDict: string // 字典项值 - valueFile: string // 文件值 + value: string // 检测值(统一存为字符串) remark: string // 备注 // 关联查询字段 indicatorCode: string // 检测指标编码 indicatorName: string // 检测指标名称 indicatorType: string // 检测指标类型 + valueType: number // 质检值类型(关联查询) + valueSpecification: string // 值属性(关联查询) toolName: string // 检测工具名称 checkMethod: string // 检测方法 standardValue: number // 标准值 @@ -49,34 +43,34 @@ export interface QcResultDetailVO { } // MES 检验结果 API -export const QcResultApi = { +export const QcIndicatorResultApi = { // 查询检验结果分页 getResultPage: async (params: any) => { - return await request.get({ url: `/mes/qc/result/page`, params }) + return await request.get({ url: `/mes/qc/indicator-result/page`, params }) }, // 查询检验结果详情(含明细) getResult: async (id: number) => { - return await request.get({ url: `/mes/qc/result/get?id=` + id }) + return await request.get({ url: `/mes/qc/indicator-result/get?id=` + id }) }, // 新增检验结果 createResult: async (data: any) => { - return await request.post({ url: `/mes/qc/result/create`, data }) + return await request.post({ url: `/mes/qc/indicator-result/create`, data }) }, // 修改检验结果 updateResult: async (data: any) => { - return await request.put({ url: `/mes/qc/result/update`, data }) + return await request.put({ url: `/mes/qc/indicator-result/update`, data }) }, // 删除检验结果 deleteResult: async (id: number) => { - return await request.delete({ url: `/mes/qc/result/delete?id=` + id }) + return await request.delete({ url: `/mes/qc/indicator-result/delete?id=` + id }) }, // 获取空值检测项模板(新建结果时用) getDetailTemplate: async (qcId: number, qcType: number) => { - return await request.get({ url: `/mes/qc/result/detail-template`, params: { qcId, qcType } }) + return await request.get({ url: `/mes/qc/indicator-result/detail-template`, params: { qcId, qcType } }) } } diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 10e90f0ae..5c313ea4a 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -264,7 +264,7 @@ export enum DICT_TYPE { MES_TM_MAINTEN_TYPE = 'mes_tm_mainten_type', // MES 保养维护类型 MES_DV_MACHINERY_STATUS = 'mes_dv_machinery_status', // MES 设备状态 MES_DV_SUBJECT_TYPE = 'mes_dv_subject_type', // MES 点检保养项目类型 - MES_INDEX_TYPE = 'mes_index_type', // MES 检测项类型 + MES_INDICATOR_TYPE = 'mes_indicator_type', // MES 检测项类型 MES_QC_RESULT_TYPE = 'mes_qc_result_type', // MES 质检结果值类型 MES_DEFECT_LEVEL = 'mes_defect_level', // MES 缺陷等级 MES_PRO_WORK_ORDER_STATUS = 'mes_pro_work_order_status', // MES 生产工单状态 diff --git a/src/views/mes/qc/defect/DefectForm.vue b/src/views/mes/qc/defect/DefectForm.vue index 39770da1a..9ac2870b8 100644 --- a/src/views/mes/qc/defect/DefectForm.vue +++ b/src/views/mes/qc/defect/DefectForm.vue @@ -28,7 +28,7 @@ class="!w-1/1" > diff --git a/src/views/mes/qc/indicator/IndicatorForm.vue b/src/views/mes/qc/indicator/IndicatorForm.vue index 059d3d836..e7f5652bf 100644 --- a/src/views/mes/qc/indicator/IndicatorForm.vue +++ b/src/views/mes/qc/indicator/IndicatorForm.vue @@ -20,9 +20,8 @@ - - - + 图片/照片 文件 - - @@ -83,6 +79,7 @@ import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator' import { generateRandomStr } from '@/utils' +import { MesQcResultValueType } from '@/views/mes/utils/constants' defineOptions({ name: 'IndicatorForm' }) diff --git a/src/views/mes/qc/indicator/index.vue b/src/views/mes/qc/indicator/index.vue index fd3385542..73e43d2a1 100644 --- a/src/views/mes/qc/indicator/index.vue +++ b/src/views/mes/qc/indicator/index.vue @@ -35,7 +35,7 @@ class="!w-240px" > diff --git a/src/views/mes/qc/indicatorresult/ResultForm.vue b/src/views/mes/qc/indicatorresult/components/QcIndicatorResultForm.vue similarity index 57% rename from src/views/mes/qc/indicatorresult/ResultForm.vue rename to src/views/mes/qc/indicatorresult/components/QcIndicatorResultForm.vue index 5d755bdd0..e64fabc2f 100644 --- a/src/views/mes/qc/indicatorresult/ResultForm.vue +++ b/src/views/mes/qc/indicatorresult/components/QcIndicatorResultForm.vue @@ -1,10 +1,16 @@ -