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

review（mes）：qc-template 的代码实现，功能测试

pull/871/MERGE
YunaiV 2026-02-17 20:43:40 +08:00
parent 0772290be9
commit 416778c8e5
7 changed files with 170 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/api/mes/qc/template/index.ts
View File

@ -1,41 +1,52 @@
import request from '@/config/axios'
// TODO @AI：拆成多个，参考别的 api ts；
// MES 质检方案 VO
export interface QcTemplateVO {
id: number // 编号
code: string // 方案编号
name: string // 方案名称
types: string // 检测种类（逗号分隔：IQC,IPQC,OQC,RQC）
enableFlag: string // 是否启用（Y/N）
types: number[] // 检测种类
enableFlag: boolean // 是否启用
remark: string // 备注
}
// MES 质检方案-检测指标项 VO
// TODO @AI：拆成多个，参考别的 api ts；
export interface QcTemplateIndicatorVO {
id: number // 编号
templateId: number // 质检方案ID
indicatorId: number // 质检指标ID
checkMethod: string // 检测方法/检测要求
checkMethod: string // 检测方法
standardValue: number // 标准值
unit: string // 单位
thresholdMax: number // 误差上限
thresholdMin: number // 误差下限
docUrl: string // 说明图URL
remark: string // 备注
// JOIN mes_qc_indicator
indicatorCode: string // 检测项编码
indicatorName: string // 检测项名称
indicatorType: string // 检测项类型（字典 mes_index_type）
indicatorTool: string // 检测工具
}
// MES 质检方案-产品关联 VO
// TODO @AI：拆成多个，参考别的 api ts；
export interface QcTemplateItemVO {
id: number // 编号
templateId: number // 质检方案ID
itemId: number // 产品物料ID
quantityCheck: number // 最低检测数
quantityUnqualified: number // 最大不合格数（0=不启用）
quantityUnqualified: number // 最大不合格数
criticalRate: number // 最大致命缺陷率（%）
majorRate: number // 最大严重缺陷率（%）
minorRate: number // 最大轻微缺陷率（%）
remark: string // 备注
// JOIN mes_md_item
itemCode: string // 物料编码
itemName: string // 物料名称
specification: string // 规格型号
unitMeasureName: string // 计量单位名称
}
// MES 质检方案 API

116
src/views/mes/qc/template/TemplateForm.vue
View File

@ -1,43 +1,70 @@
<!-- MES 质检方案表单 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<!-- TODO @AI：1 行三个，参考别的模块 -->
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="120px"
label-width="100px"
v-loading="formLoading"
>
<!-- TODO @AI：生成按钮 -->
<el-form-item label="方案编号" prop="code">
<el-input v-model="formData.code" placeholder="请输入方案编号" />
</el-form-item>
<el-form-item label="方案名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入方案名称" />
</el-form-item>
<el-form-item label="检测种类" prop="typesArr">
<!-- TODO @AI：select 多选把？或者直接让它占一整行； -->
<el-checkbox-group v-model="formData.typesArr">
<el-checkbox
v-for="dict in getStrDictOptions(DICT_TYPE.MES_QC_TYPE)"
:key="dict.value"
:label="dict.value"
>
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
<!-- TODO @AI：boolean；字典 -->
<el-form-item label="是否启用" prop="enableFlag">
<el-radio-group v-model="formData.enableFlag">
<el-radio label="Y">启用</el-radio>
<el-radio label="N">停用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
<el-row :gutter="16">
<el-col :span="8">
<el-form-item label="方案编号" prop="code">
<el-input v-model="formData.code" placeholder="请输入方案编号">
<template #append>
<el-button @click="generateCode" :disabled="formType === 'update'">
生成
</el-button>
</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="方案名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入方案名称" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用" prop="enableFlag">
<el-select v-model="formData.enableFlag" placeholder="请选择" class="!w-1/1">
<el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value + ''"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="检测种类" prop="types">
<el-select
v-model="formData.types"
multiple
filterable
placeholder="请选择检测种类"
class="!w-1/1"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -47,7 +74,8 @@
</template>
<script setup lang="ts">
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
import { getBoolDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { generateRandomStr } from '@/utils'
import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
defineOptions({ name: 'TemplateForm' })
@ -63,18 +91,23 @@ const formData = ref({
id: undefined,
code: undefined,
name: undefined,
typesArr: [] as string[], // 前端用数组绑定，提交时 join(',')
enableFlag: 'Y',
types: [] as number[],
enableFlag: true,
remark: undefined
})
const formRules = reactive({
code: [{ required: true, message: '方案编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }],
typesArr: [{ required: true, message: '检测种类不能为空', trigger: 'change', type: 'array', min: 1 }],
types: [{ required: true, message: '检测种类不能为空', trigger: 'change', type: 'array', min: 1 }],
enableFlag: [{ required: true, message: '是否启用不能为空', trigger: 'change' }]
})
const formRef = ref()
/** 生成方案编号 */
const generateCode = () => {
formData.value.code = 'QCT' + generateRandomStr(10)
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
@ -85,10 +118,9 @@ const open = async (type: string, id?: number) => {
formLoading.value = true
try {
const data = await QcTemplateApi.getTemplate(id)
// TODO @AI：后端直接返回数组，前端就不用 split 了；
formData.value = {
...data,
typesArr: data.types ? data.types.split(',') : []
types: data.types ?? []
}
} finally {
formLoading.value = false
@ -103,11 +135,7 @@ const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
// TODO @AI：不用这么 join，后端可以接受数组的；
const data = {
...formData.value,
types: formData.value.typesArr.join(',')
} as unknown as QcTemplateVO
const data = formData.value as unknown as QcTemplateVO
if (formType.value === 'create') {
await QcTemplateApi.createTemplate(data)
message.success(t('common.createSuccess'))
@ -128,8 +156,8 @@ const resetForm = () => {
id: undefined,
code: undefined,
name: undefined,
typesArr: [],
enableFlag: 'Y',
types: [],
enableFlag: true,
remark: undefined
}
formRef.value?.resetFields()

33
src/views/mes/qc/template/TemplateIndicatorForm.vue
View File

@ -8,21 +8,27 @@
label-width="130px"
v-loading="formLoading"
>
<el-form-item label="质检指标ID" prop="indicatorId">
<!-- TODO @AI:可以做了！ -->
<!-- TODO @芋艿：等 qc_indicator 完成后，替换为选择器组件 -->
<el-input-number
<el-form-item label="质检指标" prop="indicatorId">
<!-- TODO @AI：检测项（item-select 方式）、检测工具； -->
<el-select
v-model="formData.indicatorId"
placeholder="请输入质检指标ID"
:min="1"
placeholder="请选择质检指标"
filterable
class="!w-1/1"
/>
>
<el-option
v-for="item in indicatorList"
:key="item.id"
:label="item.code + ' - ' + item.name"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="检测方法/要求" prop="checkMethod">
<el-form-item label="检测方法" prop="checkMethod">
<el-input
type="textarea"
v-model="formData.checkMethod"
placeholder="请输入检测方法/检测要求"
placeholder="请输入检测方法"
:rows="3"
/>
</el-form-item>
@ -35,6 +41,7 @@
/>
</el-form-item>
<el-form-item label="单位" prop="unit">
<!-- TODO @AI：unit api 查询下； -->
<el-input v-model="formData.unit" placeholder="请输入单位" />
</el-form-item>
<el-form-item label="误差上限" prop="thresholdMax">
@ -69,6 +76,7 @@
<script setup lang="ts">
import { QcTemplateApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template'
import { QcIndicatorApi, QcIndicatorVO } from '@/api/mes/qc/indicator'
defineOptions({ name: 'TemplateIndicatorForm' })
@ -92,10 +100,13 @@ const formData = ref({
remark: undefined
})
const formRules = reactive({
indicatorId: [{ required: true, message: '质检指标ID不能为空', trigger: 'blur' }]
indicatorId: [{ required: true, message: '质检指标不能为空', trigger: 'change' }]
})
const formRef = ref()
/** 质检指标精简列表 */
const indicatorList = ref<QcIndicatorVO[]>([])
/** 打开弹窗 */
const open = async (type: string, id?: number, templateId?: number) => {
dialogVisible.value = true
@ -103,6 +114,8 @@ const open = async (type: string, id?: number, templateId?: number) => {
formType.value = type
resetForm()
formData.value.templateId = templateId
// 加载质检指标列表
indicatorList.value = await QcIndicatorApi.getIndicatorSimpleList()
if (id) {
formLoading.value = true
try {

29
src/views/mes/qc/template/TemplateIndicatorList.vue
View File

@ -16,29 +16,19 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- TODO @AI：检测项名称、检测项类型、检测工具，替代质检指标ID -->
<el-table-column label="质检指标ID" align="center" prop="indicatorId" width="120" />
<!-- TODO @AI：所有检测方法/要求，都改成检测方法 -->
<el-table-column label="检测方法/要求" align="center" prop="checkMethod" min-width="180" />
<el-table-column label="检测项编码" align="center" prop="indicatorCode" width="140" />
<el-table-column label="检测项名称" align="center" prop="indicatorName" min-width="150" />
<el-table-column label="检测项类型" align="center" prop="indicatorType" width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_INDEX_TYPE" :value="scope.row.indicatorType" />
</template>
</el-table-column>
<el-table-column label="检测工具" align="center" prop="indicatorTool" width="120" />
<el-table-column label="检测方法" align="center" prop="checkMethod" min-width="180" />
<el-table-column label="标准值" align="center" prop="standardValue" width="100" />
<el-table-column label="单位" align="center" prop="unit" width="80" />
<el-table-column label="误差上限" align="center" prop="thresholdMax" width="100" />
<el-table-column label="误差下限" align="center" prop="thresholdMin" width="100" />
<!-- TODO @AI：说明图，去掉 -->
<el-table-column label="说明图" align="center" prop="docUrl" width="100">
<template #default="scope">
<el-image
v-if="scope.row.docUrl"
:src="scope.row.docUrl"
:preview-src-list="[scope.row.docUrl]"
fit="cover"
style="width: 40px; height: 40px"
/>
<span v-else>-</span>
</template>
</el-table-column>
<!-- TODO @AI：备注，去掉 -->
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
<el-table-column label="操作" align="center" width="130" fixed="right">
<template #default="scope">
<el-button
@ -67,6 +57,7 @@
</template>
<script setup lang="ts">
import { DICT_TYPE } from '@/utils/dict'
import { QcTemplateApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template'
import TemplateIndicatorForm from './TemplateIndicatorForm.vue'

36
src/views/mes/qc/template/TemplateItemForm.vue
View File

@ -8,14 +8,17 @@
label-width="150px"
v-loading="formLoading"
>
<el-form-item label="产品物料ID" prop="itemId">
<!-- TODO @芋艿：后续替换为 md_item 物料选择器 -->
<el-input-number
v-model="formData.itemId"
placeholder="请输入产品物料ID"
:min="1"
class="!w-1/1"
/>
<el-form-item label="产品物料" prop="itemId">
<!-- TODO @AI：item select 选择； -->
<el-select v-model="formData.itemId" placeholder="请选择产品物料" filterable class="!w-1/1">
<el-option
v-for="item in itemList"
:key="item.id"
:label="item.code + ' - ' + item.name"
:value="item.id"
/>
</el-select>
<!-- TODO @AI：产品物料编码、产品物料名称、规格型号 -->
</el-form-item>
<el-form-item label="最低检测数" prop="quantityCheck">
<el-input-number
@ -62,9 +65,6 @@
class="!w-1/1"
/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@ -75,6 +75,7 @@
<script setup lang="ts">
import { QcTemplateApi, QcTemplateItemVO } from '@/api/mes/qc/template'
import { MdItemApi, MdItemVO } from '@/api/mes/md/item'
defineOptions({ name: 'TemplateItemForm' })
@ -93,15 +94,17 @@ const formData = ref({
quantityUnqualified: 0,
criticalRate: 0,
majorRate: 0,
minorRate: 100,
remark: undefined
minorRate: 100
})
const formRules = reactive({
itemId: [{ required: true, message: '产品物料ID不能为空', trigger: 'blur' }],
itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }],
quantityCheck: [{ required: true, message: '最低检测数不能为空', trigger: 'blur' }]
})
const formRef = ref()
/** 物料精简列表 */
const itemList = ref<MdItemVO[]>([])
/** 打开弹窗 */
const open = async (type: string, id?: number, templateId?: number) => {
dialogVisible.value = true
@ -109,6 +112,8 @@ const open = async (type: string, id?: number, templateId?: number) => {
formType.value = type
resetForm()
formData.value.templateId = templateId
// 加载物料列表
itemList.value = await MdItemApi.getItemSimpleList()
if (id) {
formLoading.value = true
try {
@ -151,8 +156,7 @@ const resetForm = () => {
quantityUnqualified: 0,
criticalRate: 0,
majorRate: 0,
minorRate: 100,
remark: undefined
minorRate: 100
}
formRef.value?.resetFields()
}

9
src/views/mes/qc/template/TemplateItemList.vue
View File

@ -16,10 +16,11 @@
<!-- 列表 -->
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<!-- TODO @AI：去掉「产品物料ID」，替换成产品物料编码、产品物料名称、规格型号； -->
<el-table-column label="产品物料ID" align="center" prop="itemId" width="120" />
<el-table-column label="物料编码" align="center" prop="itemCode" width="130" />
<el-table-column label="物料名称" align="center" prop="itemName" min-width="150" />
<el-table-column label="规格型号" align="center" prop="specification" min-width="130" />
<el-table-column label="计量单位" align="center" prop="unitMeasureName" width="100" />
<el-table-column label="最低检测数" align="center" prop="quantityCheck" width="110" />
<!-- TODO @AI：单位 -->
<el-table-column label="最大不合格数" align="center" prop="quantityUnqualified" width="120">
<template #default="scope">
{{ scope.row.quantityUnqualified === 0 ? '不启用' : scope.row.quantityUnqualified }}
@ -28,8 +29,6 @@
<el-table-column label="最大致命缺陷率(%)" align="center" prop="criticalRate" width="150" />
<el-table-column label="最大严重缺陷率(%)" align="center" prop="majorRate" width="150" />
<el-table-column label="最大轻微缺陷率(%)" align="center" prop="minorRate" width="150" />
<!-- TODO @AI:备注，去掉 -->
<el-table-column label="备注" align="center" prop="remark" min-width="120" />
<el-table-column label="操作" align="center" width="130" fixed="right">
<template #default="scope">
<el-button

50
src/views/mes/qc/template/index.vue
View File

@ -36,7 +36,7 @@
>
<!-- TODO @AI：字典枚举 -->
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.MES_QC_TYPE)"
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@ -50,8 +50,12 @@
clearable
class="!w-240px"
>
<el-option label="启用" value="Y" />
<el-option label="停用" value="N" />
<el-option
v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
:key="dict.value as unknown as string"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
@ -90,27 +94,20 @@
>
<el-table-column label="方案编号" align="center" prop="code" width="150" />
<el-table-column label="方案名称" align="center" prop="name" min-width="200" />
<!-- TODO @AI：业务类型，改成这个。数据库字典、后端字段的，都改下 -->
<el-table-column label="检测种类" align="center" prop="types" min-width="200">
<template #default="scope">
<template v-if="scope.row.types">
<el-tag
v-for="t in scope.row.types.split(',')"
:key="t"
size="small"
class="mr-5px"
>
<!-- TODO @AI：t 改成 type 变量； -->
<!-- TODO @AI：el-tag：里面也支持数组的； -->
<template v-if="scope.row.types && scope.row.types.length">
<el-tag v-for="t in scope.row.types" :key="t" size="small" class="mr-5px">
<dict-tag :type="DICT_TYPE.MES_QC_TYPE" :value="t" />
</el-tag>
</template>
</template>
</el-table-column>
<!-- TODO @AI：改成 boolean 类型了 -->
<el-table-column label="是否启用" align="center" prop="enableFlag" width="100">
<template #default="scope">
<el-tag :type="scope.row.enableFlag === 'Y' ? 'success' : 'danger'">
{{ scope.row.enableFlag === 'Y' ? '启用' : '停用' }}
</el-tag>
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enableFlag" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="150" />
@ -153,15 +150,18 @@
<!-- 子表标签页：检测指标项 + 产品关联 -->
<!-- TODO @AI：是不是不用这个？？？有点奇怪； -->
<ContentWrap v-if="currentRow">
<el-tabs v-model="activeTab">
<el-tab-pane label="检测指标项" name="indicator">
<TemplateIndicatorList :template-id="currentRow.id" />
</el-tab-pane>
<el-tab-pane label="产品关联" name="item">
<TemplateItemList :template-id="currentRow.id" />
</el-tab-pane>
</el-tabs>
<ContentWrap>
<template v-if="currentRow">
<el-tabs v-model="activeTab">
<el-tab-pane label="检测指标项" name="indicator">
<TemplateIndicatorList :template-id="currentRow.id" />
</el-tab-pane>
<el-tab-pane label="产品关联" name="item">
<TemplateItemList :template-id="currentRow.id" />
</el-tab-pane>
</el-tabs>
</template>
<el-empty v-else description="请先在上方列表选择一条质检方案" />
</ContentWrap>
<!-- 表单弹窗：添加/修改 -->
@ -175,7 +175,7 @@ import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
import TemplateForm from './TemplateForm.vue'
import TemplateIndicatorList from './TemplateIndicatorList.vue'
import TemplateItemList from './TemplateItemList.vue'
import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'MesQcTemplate' })