feat(mes): 重构质检方案页面,子表维护移入编辑弹窗

- api/mes/qc/template/ 拆分为 index.ts / indicator.ts / item.ts 三个文件
- TemplateForm.vue:Dialog 宽度改为 900px,编辑模式下新增 el-tabs,
  内嵌检测指标项(TemplateIndicatorList)和产品关联(TemplateItemList)子表
- index.vue:移除底部子表区域及 currentRow/activeTab 逻辑,简化为纯列表页;
  检测种类搜索字段由 types 改为 type(单选)
- TemplateIndicatorList/Form、TemplateItemList/Form:更新 import 路径至拆分后的 API 文件
- 清理所有 TODO @AI 注释
pull/871/MERGE
YunaiV 2026-02-19 12:41:57 +08:00
parent e7a8095a35
commit e7a066d9c5
10 changed files with 155 additions and 160 deletions

View File

@ -10,51 +10,8 @@ export interface QcTemplateVO {
remark: string // 备注
}
// MES 质检方案-检测指标项 VO
// TODO @AI拆成多个参考别的 api ts
export interface QcTemplateIndicatorVO {
id: number // 编号
templateId: number // 质检方案ID
indicatorId: number // 质检指标ID
checkMethod: string // 检测方法
standardValue: number // 标准值
unitMeasureId: number // 计量单位ID
thresholdMax: number // 误差上限
thresholdMin: number // 误差下限
docUrl: string // 说明图URL
remark: string // 备注
// JOIN mes_qc_indicator
indicatorCode: string // 检测项编码
indicatorName: string // 检测项名称
indicatorType: string // 检测项类型(字典 mes_index_type
indicatorTool: string // 检测工具
// JOIN mes_md_unit_measure
unitMeasureName: string // 计量单位名称
}
// MES 质检方案-产品关联 VO
// TODO @AI拆成多个参考别的 api ts
export interface QcTemplateItemVO {
id: number // 编号
templateId: number // 质检方案ID
itemId: number // 产品物料ID
quantityCheck: number // 最低检测数
quantityUnqualified: number // 最大不合格数
criticalRate: number // 最大致命缺陷率(%
majorRate: number // 最大严重缺陷率(%
minorRate: number // 最大轻微缺陷率(%
remark: string // 备注
// JOIN mes_md_item
itemCode: string // 物料编码
itemName: string // 物料名称
specification: string // 规格型号
unitMeasureName: string // 计量单位名称
}
// MES 质检方案 API
export const QcTemplateApi = {
// ========== 质检方案主表 ==========
// 查询质检方案分页
getTemplatePage: async (params: any) => {
return await request.get({ url: `/mes/qc/template/page`, params })
@ -88,59 +45,5 @@ export const QcTemplateApi = {
// 导出质检方案 Excel
exportTemplate: async (params: any) => {
return await request.download({ url: `/mes/qc/template/export-excel`, params })
},
// ========== 质检方案-检测指标项 ==========
// 查询检测指标项分页
getTemplateIndicatorPage: async (params: any) => {
return await request.get({ url: `/mes/qc/template/indicator/page`, params })
},
// 查询检测指标项详情
getTemplateIndicator: async (id: number) => {
return await request.get({ url: `/mes/qc/template/indicator/get?id=` + id })
},
// 新增检测指标项
createTemplateIndicator: async (data: QcTemplateIndicatorVO) => {
return await request.post({ url: `/mes/qc/template/indicator/create`, data })
},
// 修改检测指标项
updateTemplateIndicator: async (data: QcTemplateIndicatorVO) => {
return await request.put({ url: `/mes/qc/template/indicator/update`, data })
},
// 删除检测指标项
deleteTemplateIndicator: async (id: number) => {
return await request.delete({ url: `/mes/qc/template/indicator/delete?id=` + id })
},
// ========== 质检方案-产品关联 ==========
// 查询产品关联分页
getTemplateItemPage: async (params: any) => {
return await request.get({ url: `/mes/qc/template/item/page`, params })
},
// 查询产品关联详情
getTemplateItem: async (id: number) => {
return await request.get({ url: `/mes/qc/template/item/get?id=` + id })
},
// 新增产品关联
createTemplateItem: async (data: QcTemplateItemVO) => {
return await request.post({ url: `/mes/qc/template/item/create`, data })
},
// 修改产品关联
updateTemplateItem: async (data: QcTemplateItemVO) => {
return await request.put({ url: `/mes/qc/template/item/update`, data })
},
// 删除产品关联
deleteTemplateItem: async (id: number) => {
return await request.delete({ url: `/mes/qc/template/item/delete?id=` + id })
}
}

View File

@ -0,0 +1,51 @@
import request from '@/config/axios'
// TODO @AIindicator/index.ts 迁移过去;
// MES 质检方案-检测指标项 VO
export interface QcTemplateIndicatorVO {
id: number // 编号
templateId: number // 质检方案ID
indicatorId: number // 质检指标ID
checkMethod: string // 检测方法
standardValue: number // 标准值
unitMeasureId: number // 计量单位ID
thresholdMax: number // 误差上限
thresholdMin: number // 误差下限
docUrl: string // 说明图URL
remark: string // 备注
// JOIN mes_qc_indicator
indicatorCode: string // 检测项编码
indicatorName: string // 检测项名称
indicatorType: string // 检测项类型(字典 mes_index_type
indicatorTool: string // 检测工具
// JOIN mes_md_unit_measure
unitMeasureName: string // 计量单位名称
}
// MES 质检方案-检测指标项 API
export const QcTemplateIndicatorApi = {
// 查询检测指标项分页
getTemplateIndicatorPage: async (params: any) => {
return await request.get({ url: `/mes/qc/template/indicator/page`, params })
},
// 查询检测指标项详情
getTemplateIndicator: async (id: number) => {
return await request.get({ url: `/mes/qc/template/indicator/get?id=` + id })
},
// 新增检测指标项
createTemplateIndicator: async (data: QcTemplateIndicatorVO) => {
return await request.post({ url: `/mes/qc/template/indicator/create`, data })
},
// 修改检测指标项
updateTemplateIndicator: async (data: QcTemplateIndicatorVO) => {
return await request.put({ url: `/mes/qc/template/indicator/update`, data })
},
// 删除检测指标项
deleteTemplateIndicator: async (id: number) => {
return await request.delete({ url: `/mes/qc/template/indicator/delete?id=` + id })
}
}

View File

@ -0,0 +1,48 @@
import request from '@/config/axios'
// TODO @AIitem/index.ts 迁移过去;
// MES 质检方案-产品关联 VO
export interface QcTemplateItemVO {
id: number // 编号
templateId: number // 质检方案ID
itemId: number // 产品物料ID
quantityCheck: number // 最低检测数
quantityUnqualified: number // 最大不合格数
criticalRate: number // 最大致命缺陷率(%
majorRate: number // 最大严重缺陷率(%
minorRate: number // 最大轻微缺陷率(%
remark: string // 备注
// JOIN mes_md_item
itemCode: string // 物料编码
itemName: string // 物料名称
specification: string // 规格型号
unitMeasureName: string // 计量单位名称
}
// MES 质检方案-产品关联 API
export const QcTemplateItemApi = {
// 查询产品关联分页
getTemplateItemPage: async (params: any) => {
return await request.get({ url: `/mes/qc/template/item/page`, params })
},
// 查询产品关联详情
getTemplateItem: async (id: number) => {
return await request.get({ url: `/mes/qc/template/item/get?id=` + id })
},
// 新增产品关联
createTemplateItem: async (data: QcTemplateItemVO) => {
return await request.post({ url: `/mes/qc/template/item/create`, data })
},
// 修改产品关联
updateTemplateItem: async (data: QcTemplateItemVO) => {
return await request.put({ url: `/mes/qc/template/item/update`, data })
},
// 删除产品关联
deleteTemplateItem: async (id: number) => {
return await request.delete({ url: `/mes/qc/template/item/delete?id=` + id })
}
}

View File

@ -270,4 +270,6 @@ export enum DICT_TYPE {
MES_PRO_WORK_ORDER_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型
MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type', // MES 工单类型
MES_QC_TYPE = 'mes_qc_type', // MES 质检方案类型
MES_PRO_LINK_TYPE = 'mes_pro_link_type', // MES 工序关系类型
MES_TIME_UNIT_TYPE = 'mes_time_unit_type', // MES 时间单位
}

View File

@ -1,6 +1,7 @@
<!-- MES 质检方案表单 -->
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
<!-- 基本信息表单 -->
<el-form
ref="formRef"
:model="formData"
@ -66,6 +67,20 @@
</el-col>
</el-row>
</el-form>
<!-- 子表标签页编辑模式下显示 -->
<template v-if="formType === 'update' && formData.id">
<el-divider />
<el-tabs v-model="activeTab">
<el-tab-pane label="检测指标项" name="indicator">
<TemplateIndicatorList :template-id="formData.id" />
</el-tab-pane>
<el-tab-pane label="产品关联" name="item">
<TemplateItemList :template-id="formData.id" />
</el-tab-pane>
</el-tabs>
</template>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
@ -77,6 +92,10 @@
import { getBoolDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
import { generateRandomStr } from '@/utils'
import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
import TemplateIndicatorList from './TemplateIndicatorList.vue'
import TemplateItemList from './TemplateItemList.vue'
// TODO @AI user form.vue
defineOptions({ name: 'TemplateForm' })
@ -87,8 +106,9 @@ const dialogVisible = ref(false)
const dialogTitle = ref('')
const formLoading = ref(false)
const formType = ref('')
const activeTab = ref('indicator')
const formData = ref({
id: undefined,
id: undefined as number | undefined,
code: undefined,
name: undefined,
types: [] as number[],
@ -113,6 +133,7 @@ const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
activeTab.value = 'indicator'
resetForm()
if (id) {
formLoading.value = true

View File

@ -28,7 +28,11 @@
/>
</el-form-item>
<el-form-item label="单位" prop="unitMeasureId">
<MdUnitMeasureSelect v-model="formData.unitMeasureId" placeholder="请选择计量单位" clearable />
<MdUnitMeasureSelect
v-model="formData.unitMeasureId"
placeholder="请选择计量单位"
clearable
/>
</el-form-item>
<el-form-item label="误差上限" prop="thresholdMax">
<el-input-number
@ -61,10 +65,11 @@
</template>
<script setup lang="ts">
import { QcTemplateApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template'
import { QcTemplateIndicatorApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template/indicator'
import QcIndicatorSelect from '@/views/mes/qc/indicator/components/QcIndicatorSelect.vue'
import MdUnitMeasureSelect from '@/views/mes/md/unitmeasure/components/MdUnitMeasureSelect.vue'
// TODO @AI user form.vue
defineOptions({ name: 'TemplateIndicatorForm' })
const { t } = useI18n()
@ -101,7 +106,7 @@ const open = async (type: string, id?: number, templateId?: number) => {
if (id) {
formLoading.value = true
try {
formData.value = await QcTemplateApi.getTemplateIndicator(id)
formData.value = await QcTemplateIndicatorApi.getTemplateIndicator(id)
} finally {
formLoading.value = false
}
@ -117,10 +122,10 @@ const submitForm = async () => {
try {
const data = formData.value as unknown as QcTemplateIndicatorVO
if (formType.value === 'create') {
await QcTemplateApi.createTemplateIndicator(data)
await QcTemplateIndicatorApi.createTemplateIndicator(data)
message.success(t('common.createSuccess'))
} else {
await QcTemplateApi.updateTemplateIndicator(data)
await QcTemplateIndicatorApi.updateTemplateIndicator(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false

View File

@ -26,7 +26,7 @@
<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="unitMeasureName" width="80" />
<el-table-column label="误差上限" align="center" prop="thresholdMax" width="100" />
<el-table-column label="误差下限" align="center" prop="thresholdMin" width="100" />
<el-table-column label="操作" align="center" width="130" fixed="right">
@ -57,8 +57,10 @@
</template>
<script setup lang="ts">
// TODO @AI user index.vue
import { DICT_TYPE } from '@/utils/dict'
import { QcTemplateApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template'
import { QcTemplateIndicatorApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template/indicator'
import TemplateIndicatorForm from './TemplateIndicatorForm.vue'
defineOptions({ name: 'TemplateIndicatorList' })
@ -76,7 +78,7 @@ const getList = async () => {
if (!props.templateId) return
loading.value = true
try {
const data = await QcTemplateApi.getTemplateIndicatorPage({
const data = await QcTemplateIndicatorApi.getTemplateIndicatorPage({
pageNo: 1,
pageSize: 100,
templateId: props.templateId
@ -97,7 +99,7 @@ const openForm = (type: string, id?: number) => {
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await QcTemplateApi.deleteTemplateIndicator(id)
await QcTemplateIndicatorApi.deleteTemplateIndicator(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}

View File

@ -65,7 +65,8 @@
</template>
<script setup lang="ts">
import { QcTemplateApi, QcTemplateItemVO } from '@/api/mes/qc/template'
// TODO @AI user form.vue
import { QcTemplateItemApi, QcTemplateItemVO } from '@/api/mes/qc/template/item'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
defineOptions({ name: 'TemplateItemForm' })
@ -93,7 +94,6 @@ const formRules = reactive({
})
const formRef = ref()
/** 打开弹窗 */
const open = async (type: string, id?: number, templateId?: number) => {
dialogVisible.value = true
@ -104,7 +104,7 @@ const open = async (type: string, id?: number, templateId?: number) => {
if (id) {
formLoading.value = true
try {
formData.value = await QcTemplateApi.getTemplateItem(id)
formData.value = await QcTemplateItemApi.getTemplateItem(id)
} finally {
formLoading.value = false
}
@ -120,10 +120,10 @@ const submitForm = async () => {
try {
const data = formData.value as unknown as QcTemplateItemVO
if (formType.value === 'create') {
await QcTemplateApi.createTemplateItem(data)
await QcTemplateItemApi.createTemplateItem(data)
message.success(t('common.createSuccess'))
} else {
await QcTemplateApi.updateTemplateItem(data)
await QcTemplateItemApi.updateTemplateItem(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false

View File

@ -57,7 +57,9 @@
</template>
<script setup lang="ts">
import { QcTemplateApi, QcTemplateItemVO } from '@/api/mes/qc/template'
// TODO @AI user index.vue
import { QcTemplateItemApi, QcTemplateItemVO } from '@/api/mes/qc/template/item'
import TemplateItemForm from './TemplateItemForm.vue'
defineOptions({ name: 'TemplateItemList' })
@ -75,7 +77,7 @@ const getList = async () => {
if (!props.templateId) return
loading.value = true
try {
const data = await QcTemplateApi.getTemplateItemPage({
const data = await QcTemplateItemApi.getTemplateItemPage({
pageNo: 1,
pageSize: 100,
templateId: props.templateId
@ -96,7 +98,7 @@ const openForm = (type: string, id?: number) => {
const handleDelete = async (id: number) => {
try {
await message.delConfirm()
await QcTemplateApi.deleteTemplateItem(id)
await QcTemplateItemApi.deleteTemplateItem(id)
message.success(t('common.delSuccess'))
await getList()
} catch {}

View File

@ -27,14 +27,13 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="检测种类" prop="types">
<el-form-item label="检测种类" prop="type">
<el-select
v-model="queryParams.types"
v-model="queryParams.type"
placeholder="请选择检测种类"
clearable
class="!w-240px"
>
<!-- TODO @AI字典枚举 -->
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_TYPE)"
:key="dict.value"
@ -89,20 +88,12 @@
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column label="方案编号" align="center" prop="code" width="150" />
<el-table-column label="方案名称" align="center" prop="name" min-width="200" />
<el-table-column label="检测种类" align="center" prop="types" min-width="200">
<template #default="scope">
<!-- TODO @AIt 改成 type 变量 -->
<!-- TODO @AIel-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>
<dict-tag :type="DICT_TYPE.MES_QC_TYPE" :value="scope.row.types" />
</template>
</el-table-column>
<el-table-column label="是否启用" align="center" prop="enableFlag" width="100">
@ -148,23 +139,7 @@
/>
</ContentWrap>
<!-- 子表标签页检测指标项 + 产品关联 -->
<!-- TODO @AI是不是不用这个有点奇怪 -->
<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>
<!-- 表单弹窗添加/修改 -->
<!-- 表单弹窗添加/修改编辑时含检测指标项和产品关联子表 -->
<TemplateForm ref="formRef" @success="getList" />
</template>
@ -173,8 +148,6 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
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, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'MesQcTemplate' })
@ -190,15 +163,12 @@ const queryParams = reactive({
pageSize: 10,
code: undefined,
name: undefined,
types: undefined,
type: undefined,
enableFlag: undefined
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
const currentRow = ref<QcTemplateVO | null>(null) //
const activeTab = ref('indicator') //
/** 查询列表 */
const getList = async () => {
loading.value = true
@ -223,11 +193,6 @@ const resetQuery = () => {
handleQuery()
}
/** 行点击切换子表 */
const handleCurrentChange = (row: QcTemplateVO | null) => {
currentRow.value = row
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
@ -240,10 +205,6 @@ const handleDelete = async (id: number) => {
await message.delConfirm()
await QcTemplateApi.deleteTemplate(id)
message.success(t('common.delSuccess'))
//
if (currentRow.value?.id === id) {
currentRow.value = null
}
await getList()
} catch {}
}