From 1d01b221e679448264c0264369412eaaf475db7b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 9 Apr 2026 22:46:32 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(mes):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=B1=BB=E5=9E=8B=E4=B8=BA=E6=95=B4?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/qc/indicator/index.ts                           | 2 +-
 src/api/mes/qc/ipqc/line/index.ts                           | 2 +-
 src/api/mes/qc/iqc/line/index.ts                            | 2 +-
 src/api/mes/qc/oqc/line/index.ts                            | 2 +-
 src/api/mes/qc/rqc/line/index.ts                            | 2 +-
 src/api/mes/qc/template/indicator/index.ts                  | 2 +-
 src/views/mes/qc/indicator/IndicatorForm.vue                | 4 ++--
 .../mes/qc/indicator/components/QcIndicatorSelectDialog.vue | 6 +++---
 src/views/mes/qc/indicator/index.vue                        | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/api/mes/qc/indicator/index.ts b/src/api/mes/qc/indicator/index.ts
index bad7ca44d..7108304ec 100644
--- a/src/api/mes/qc/indicator/index.ts
+++ b/src/api/mes/qc/indicator/index.ts
@@ -5,7 +5,7 @@ export interface QcIndicatorVO {
   id: number // 编号
   code: string // 检测项编码
   name: string // 检测项名称
-  type: string // 检测项类型
+  type: number // 检测项类型
   tool: string // 检测工具
   resultType: number // 结果值类型
   resultSpecification: string // 结果值属性
diff --git a/src/api/mes/qc/ipqc/line/index.ts b/src/api/mes/qc/ipqc/line/index.ts
index b72487f12..511262a5b 100644
--- a/src/api/mes/qc/ipqc/line/index.ts
+++ b/src/api/mes/qc/ipqc/line/index.ts
@@ -7,7 +7,7 @@ export interface QcIpqcLineVO {
   indicatorId: number // 检测指标 ID
   indicatorCode: string // 检测指标编码（关联查询）
   indicatorName: string // 检测指标名称（关联查询）
-  indicatorType: string // 检测指标类型（关联查询）
+  indicatorType: number // 检测指标类型（关联查询）
   toolId: number // 检测工具 ID
   toolName: string // 检测工具名称（关联查询）
   checkMethod: string // 检测方法
diff --git a/src/api/mes/qc/iqc/line/index.ts b/src/api/mes/qc/iqc/line/index.ts
index 4479aad66..c9cec9b89 100644
--- a/src/api/mes/qc/iqc/line/index.ts
+++ b/src/api/mes/qc/iqc/line/index.ts
@@ -7,7 +7,7 @@ export interface QcIqcLineVO {
   indicatorId: number // 检测指标 ID
   indicatorCode: string // 检测指标编码（关联查询）
   indicatorName: string // 检测指标名称（关联查询）
-  indicatorType: string // 检测指标类型（关联查询）
+  indicatorType: number // 检测指标类型（关联查询）
   tool: string // 检测工具
   checkMethod: string // 检测方法
   standardValue: number // 标准值
diff --git a/src/api/mes/qc/oqc/line/index.ts b/src/api/mes/qc/oqc/line/index.ts
index 419a62948..f1bc2c7e8 100644
--- a/src/api/mes/qc/oqc/line/index.ts
+++ b/src/api/mes/qc/oqc/line/index.ts
@@ -7,7 +7,7 @@ export interface QcOqcLineVO {
   indicatorId: number // 检测指标 ID
   indicatorCode: string // 检测指标编码（关联查询）
   indicatorName: string // 检测指标名称（关联查询）
-  indicatorType: string // 检测指标类型（关联查询）
+  indicatorType: number // 检测指标类型（关联查询）
   checkMethod: string // 检测方法
   standardValue: number // 标准值
   unitMeasureId: number // 计量单位 ID
diff --git a/src/api/mes/qc/rqc/line/index.ts b/src/api/mes/qc/rqc/line/index.ts
index dccf7eb26..476c058bb 100644
--- a/src/api/mes/qc/rqc/line/index.ts
+++ b/src/api/mes/qc/rqc/line/index.ts
@@ -7,7 +7,7 @@ export interface QcRqcLineVO {
   indicatorId: number // 检测指标 ID
   indicatorCode: string // 检测指标编码（关联查询）
   indicatorName: string // 检测指标名称（关联查询）
-  indicatorType: string // 检测指标类型（关联查询）
+  indicatorType: number // 检测指标类型（关联查询）
   tool: string // 检测工具
   checkMethod: string // 检测方法
   standardValue: number // 标准值
diff --git a/src/api/mes/qc/template/indicator/index.ts b/src/api/mes/qc/template/indicator/index.ts
index faf2e7b2b..91ce5b4be 100644
--- a/src/api/mes/qc/template/indicator/index.ts
+++ b/src/api/mes/qc/template/indicator/index.ts
@@ -15,7 +15,7 @@ export interface QcTemplateIndicatorVO {
   // JOIN mes_qc_indicator
   indicatorCode: string // 检测项编码
   indicatorName: string // 检测项名称
-  indicatorType: string // 检测项类型（字典 mes_index_type）
+  indicatorType: number // 检测项类型
   indicatorTool: string // 检测工具
   // JOIN mes_md_unit_measure
   unitMeasureName: string // 计量单位名称
diff --git a/src/views/mes/qc/indicator/IndicatorForm.vue b/src/views/mes/qc/indicator/IndicatorForm.vue
index bea898b22..c9a9a9431 100644
--- a/src/views/mes/qc/indicator/IndicatorForm.vue
+++ b/src/views/mes/qc/indicator/IndicatorForm.vue
@@ -21,7 +21,7 @@
       <el-form-item label="检测项类型" prop="type">
         <el-select v-model="formData.type" placeholder="请选择检测项类型" clearable class="!w-1/1">
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -94,7 +94,7 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { getStrDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator'
 import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
 import { getSimpleDictTypeList, DictTypeVO } from '@/api/system/dict/dict.type'
diff --git a/src/views/mes/qc/indicator/components/QcIndicatorSelectDialog.vue b/src/views/mes/qc/indicator/components/QcIndicatorSelectDialog.vue
index af90d9b17..7654c4e64 100644
--- a/src/views/mes/qc/indicator/components/QcIndicatorSelectDialog.vue
+++ b/src/views/mes/qc/indicator/components/QcIndicatorSelectDialog.vue
@@ -21,7 +21,7 @@
             @change="handleQuery"
           >
             <el-option
-              v-for="dict in getStrDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
+              v-for="dict in getIntDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -105,7 +105,7 @@
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator'
 
 defineOptions({ name: 'QcIndicatorSelectDialog' })
@@ -173,7 +173,7 @@ const queryParams = reactive({
   pageNo: 1, // 页码
   pageSize: 10, // 每页条数
   name: undefined as string | undefined, // 检测项名称
-  type: undefined as string | undefined // 检测项类型
+  type: undefined as number | undefined // 检测项类型
 })
 
 /** 查询指标列表 */
diff --git a/src/views/mes/qc/indicator/index.vue b/src/views/mes/qc/indicator/index.vue
index da6184264..d57dd2d47 100644
--- a/src/views/mes/qc/indicator/index.vue
+++ b/src/views/mes/qc/indicator/index.vue
@@ -35,7 +35,7 @@
           class="!w-240px"
         >
           <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_INDICATOR_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -144,7 +144,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator'
 import IndicatorForm from './IndicatorForm.vue'
-import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
 defineOptions({ name: 'MesQcIndicator' })