feat(mes): 修改检测项类型为整数类型

pull/871/MERGE
YunaiV 2026-04-09 22:46:32 +08:00
parent 302ca05052
commit 1d01b221e6
9 changed files with 13 additions and 13 deletions

View File

@ -5,7 +5,7 @@ export interface QcIndicatorVO {
id: number // 编号
code: string // 检测项编码
name: string // 检测项名称
type: string // 检测项类型
type: number // 检测项类型
tool: string // 检测工具
resultType: number // 结果值类型
resultSpecification: string // 结果值属性

View File

@ -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 // 检测方法

View File

@ -7,7 +7,7 @@ export interface QcIqcLineVO {
indicatorId: number // 检测指标 ID
indicatorCode: string // 检测指标编码(关联查询)
indicatorName: string // 检测指标名称(关联查询)
indicatorType: string // 检测指标类型(关联查询)
indicatorType: number // 检测指标类型(关联查询)
tool: string // 检测工具
checkMethod: string // 检测方法
standardValue: number // 标准值

View File

@ -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

View File

@ -7,7 +7,7 @@ export interface QcRqcLineVO {
indicatorId: number // 检测指标 ID
indicatorCode: string // 检测指标编码(关联查询)
indicatorName: string // 检测指标名称(关联查询)
indicatorType: string // 检测指标类型(关联查询)
indicatorType: number // 检测指标类型(关联查询)
tool: string // 检测工具
checkMethod: string // 检测方法
standardValue: number // 标准值

View File

@ -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 // 计量单位名称

View File

@ -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'

View File

@ -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 //
})
/** 查询指标列表 */

View File

@ -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' })