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
parent
e7a8095a35
commit
e7a066d9c5
|
|
@ -10,51 +10,8 @@ export interface QcTemplateVO {
|
||||||
remark: string // 备注
|
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
|
// MES 质检方案 API
|
||||||
export const QcTemplateApi = {
|
export const QcTemplateApi = {
|
||||||
// ========== 质检方案主表 ==========
|
|
||||||
|
|
||||||
// 查询质检方案分页
|
// 查询质检方案分页
|
||||||
getTemplatePage: async (params: any) => {
|
getTemplatePage: async (params: any) => {
|
||||||
return await request.get({ url: `/mes/qc/template/page`, params })
|
return await request.get({ url: `/mes/qc/template/page`, params })
|
||||||
|
|
@ -88,59 +45,5 @@ export const QcTemplateApi = {
|
||||||
// 导出质检方案 Excel
|
// 导出质检方案 Excel
|
||||||
exportTemplate: async (params: any) => {
|
exportTemplate: async (params: any) => {
|
||||||
return await request.download({ url: `/mes/qc/template/export-excel`, params })
|
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 })
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
import request from '@/config/axios'
|
||||||
|
|
||||||
|
// TODO @AI:indicator/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 })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
import request from '@/config/axios'
|
||||||
|
|
||||||
|
// TODO @AI:item/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 })
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -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_SOURCE_TYPE = 'mes_pro_work_order_source_type', // MES 工单来源类型
|
||||||
MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type', // MES 工单类型
|
MES_PRO_WORK_ORDER_TYPE = 'mes_pro_work_order_type', // MES 工单类型
|
||||||
MES_QC_TYPE = 'mes_qc_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 时间单位
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
<!-- MES 质检方案表单 -->
|
<!-- MES 质检方案表单 -->
|
||||||
<template>
|
<template>
|
||||||
<Dialog :title="dialogTitle" v-model="dialogVisible">
|
<Dialog :title="dialogTitle" v-model="dialogVisible" width="900px">
|
||||||
|
<!-- 基本信息表单 -->
|
||||||
<el-form
|
<el-form
|
||||||
ref="formRef"
|
ref="formRef"
|
||||||
:model="formData"
|
:model="formData"
|
||||||
|
|
@ -66,6 +67,20 @@
|
||||||
</el-col>
|
</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
</el-form>
|
</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>
|
<template #footer>
|
||||||
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
<el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
|
||||||
<el-button @click="dialogVisible = false">取 消</el-button>
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
||||||
|
|
@ -77,6 +92,10 @@
|
||||||
import { getBoolDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
import { getBoolDictOptions, getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
||||||
import { generateRandomStr } from '@/utils'
|
import { generateRandomStr } from '@/utils'
|
||||||
import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
|
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' })
|
defineOptions({ name: 'TemplateForm' })
|
||||||
|
|
||||||
|
|
@ -87,8 +106,9 @@ const dialogVisible = ref(false)
|
||||||
const dialogTitle = ref('')
|
const dialogTitle = ref('')
|
||||||
const formLoading = ref(false)
|
const formLoading = ref(false)
|
||||||
const formType = ref('')
|
const formType = ref('')
|
||||||
|
const activeTab = ref('indicator')
|
||||||
const formData = ref({
|
const formData = ref({
|
||||||
id: undefined,
|
id: undefined as number | undefined,
|
||||||
code: undefined,
|
code: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
types: [] as number[],
|
types: [] as number[],
|
||||||
|
|
@ -113,6 +133,7 @@ const open = async (type: string, id?: number) => {
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
dialogTitle.value = t('action.' + type)
|
dialogTitle.value = t('action.' + type)
|
||||||
formType.value = type
|
formType.value = type
|
||||||
|
activeTab.value = 'indicator'
|
||||||
resetForm()
|
resetForm()
|
||||||
if (id) {
|
if (id) {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,11 @@
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="单位" prop="unitMeasureId">
|
<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>
|
||||||
<el-form-item label="误差上限" prop="thresholdMax">
|
<el-form-item label="误差上限" prop="thresholdMax">
|
||||||
<el-input-number
|
<el-input-number
|
||||||
|
|
@ -61,10 +65,11 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<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 QcIndicatorSelect from '@/views/mes/qc/indicator/components/QcIndicatorSelect.vue'
|
||||||
import MdUnitMeasureSelect from '@/views/mes/md/unitmeasure/components/MdUnitMeasureSelect.vue'
|
import MdUnitMeasureSelect from '@/views/mes/md/unitmeasure/components/MdUnitMeasureSelect.vue'
|
||||||
|
|
||||||
|
// TODO @AI:整个文件的注释风格,参考 user 的 form.vue 那;
|
||||||
defineOptions({ name: 'TemplateIndicatorForm' })
|
defineOptions({ name: 'TemplateIndicatorForm' })
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
|
|
@ -101,7 +106,7 @@ const open = async (type: string, id?: number, templateId?: number) => {
|
||||||
if (id) {
|
if (id) {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
formData.value = await QcTemplateApi.getTemplateIndicator(id)
|
formData.value = await QcTemplateIndicatorApi.getTemplateIndicator(id)
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
|
|
@ -117,10 +122,10 @@ const submitForm = async () => {
|
||||||
try {
|
try {
|
||||||
const data = formData.value as unknown as QcTemplateIndicatorVO
|
const data = formData.value as unknown as QcTemplateIndicatorVO
|
||||||
if (formType.value === 'create') {
|
if (formType.value === 'create') {
|
||||||
await QcTemplateApi.createTemplateIndicator(data)
|
await QcTemplateIndicatorApi.createTemplateIndicator(data)
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
} else {
|
} else {
|
||||||
await QcTemplateApi.updateTemplateIndicator(data)
|
await QcTemplateIndicatorApi.updateTemplateIndicator(data)
|
||||||
message.success(t('common.updateSuccess'))
|
message.success(t('common.updateSuccess'))
|
||||||
}
|
}
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
<el-table-column label="检测工具" align="center" prop="indicatorTool" width="120" />
|
<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="checkMethod" min-width="180" />
|
||||||
<el-table-column label="标准值" align="center" prop="standardValue" width="100" />
|
<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="thresholdMax" width="100" />
|
||||||
<el-table-column label="误差下限" align="center" prop="thresholdMin" width="100" />
|
<el-table-column label="误差下限" align="center" prop="thresholdMin" width="100" />
|
||||||
<el-table-column label="操作" align="center" width="130" fixed="right">
|
<el-table-column label="操作" align="center" width="130" fixed="right">
|
||||||
|
|
@ -57,8 +57,10 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
// TODO @AI:整个文件的注释风格,参考 user 的 index.vue 那;
|
||||||
|
|
||||||
import { DICT_TYPE } from '@/utils/dict'
|
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'
|
import TemplateIndicatorForm from './TemplateIndicatorForm.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'TemplateIndicatorList' })
|
defineOptions({ name: 'TemplateIndicatorList' })
|
||||||
|
|
@ -76,7 +78,7 @@ const getList = async () => {
|
||||||
if (!props.templateId) return
|
if (!props.templateId) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await QcTemplateApi.getTemplateIndicatorPage({
|
const data = await QcTemplateIndicatorApi.getTemplateIndicatorPage({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 100,
|
pageSize: 100,
|
||||||
templateId: props.templateId
|
templateId: props.templateId
|
||||||
|
|
@ -97,7 +99,7 @@ const openForm = (type: string, id?: number) => {
|
||||||
const handleDelete = async (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
await QcTemplateApi.deleteTemplateIndicator(id)
|
await QcTemplateIndicatorApi.deleteTemplateIndicator(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,8 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<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'
|
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'TemplateItemForm' })
|
defineOptions({ name: 'TemplateItemForm' })
|
||||||
|
|
@ -93,7 +94,6 @@ const formRules = reactive({
|
||||||
})
|
})
|
||||||
const formRef = ref()
|
const formRef = ref()
|
||||||
|
|
||||||
|
|
||||||
/** 打开弹窗 */
|
/** 打开弹窗 */
|
||||||
const open = async (type: string, id?: number, templateId?: number) => {
|
const open = async (type: string, id?: number, templateId?: number) => {
|
||||||
dialogVisible.value = true
|
dialogVisible.value = true
|
||||||
|
|
@ -104,7 +104,7 @@ const open = async (type: string, id?: number, templateId?: number) => {
|
||||||
if (id) {
|
if (id) {
|
||||||
formLoading.value = true
|
formLoading.value = true
|
||||||
try {
|
try {
|
||||||
formData.value = await QcTemplateApi.getTemplateItem(id)
|
formData.value = await QcTemplateItemApi.getTemplateItem(id)
|
||||||
} finally {
|
} finally {
|
||||||
formLoading.value = false
|
formLoading.value = false
|
||||||
}
|
}
|
||||||
|
|
@ -120,10 +120,10 @@ const submitForm = async () => {
|
||||||
try {
|
try {
|
||||||
const data = formData.value as unknown as QcTemplateItemVO
|
const data = formData.value as unknown as QcTemplateItemVO
|
||||||
if (formType.value === 'create') {
|
if (formType.value === 'create') {
|
||||||
await QcTemplateApi.createTemplateItem(data)
|
await QcTemplateItemApi.createTemplateItem(data)
|
||||||
message.success(t('common.createSuccess'))
|
message.success(t('common.createSuccess'))
|
||||||
} else {
|
} else {
|
||||||
await QcTemplateApi.updateTemplateItem(data)
|
await QcTemplateItemApi.updateTemplateItem(data)
|
||||||
message.success(t('common.updateSuccess'))
|
message.success(t('common.updateSuccess'))
|
||||||
}
|
}
|
||||||
dialogVisible.value = false
|
dialogVisible.value = false
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,9 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<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'
|
import TemplateItemForm from './TemplateItemForm.vue'
|
||||||
|
|
||||||
defineOptions({ name: 'TemplateItemList' })
|
defineOptions({ name: 'TemplateItemList' })
|
||||||
|
|
@ -75,7 +77,7 @@ const getList = async () => {
|
||||||
if (!props.templateId) return
|
if (!props.templateId) return
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const data = await QcTemplateApi.getTemplateItemPage({
|
const data = await QcTemplateItemApi.getTemplateItemPage({
|
||||||
pageNo: 1,
|
pageNo: 1,
|
||||||
pageSize: 100,
|
pageSize: 100,
|
||||||
templateId: props.templateId
|
templateId: props.templateId
|
||||||
|
|
@ -96,7 +98,7 @@ const openForm = (type: string, id?: number) => {
|
||||||
const handleDelete = async (id: number) => {
|
const handleDelete = async (id: number) => {
|
||||||
try {
|
try {
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
await QcTemplateApi.deleteTemplateItem(id)
|
await QcTemplateItemApi.deleteTemplateItem(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
|
|
|
||||||
|
|
@ -27,14 +27,13 @@
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
/>
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="检测种类" prop="types">
|
<el-form-item label="检测种类" prop="type">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="queryParams.types"
|
v-model="queryParams.type"
|
||||||
placeholder="请选择检测种类"
|
placeholder="请选择检测种类"
|
||||||
clearable
|
clearable
|
||||||
class="!w-240px"
|
class="!w-240px"
|
||||||
>
|
>
|
||||||
<!-- TODO @AI:字典枚举 -->
|
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_TYPE)"
|
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_TYPE)"
|
||||||
:key="dict.value"
|
:key="dict.value"
|
||||||
|
|
@ -89,20 +88,12 @@
|
||||||
:data="list"
|
:data="list"
|
||||||
:stripe="true"
|
:stripe="true"
|
||||||
:show-overflow-tooltip="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="code" width="150" />
|
||||||
<el-table-column label="方案名称" align="center" prop="name" min-width="200" />
|
<el-table-column label="方案名称" align="center" prop="name" min-width="200" />
|
||||||
<el-table-column label="检测种类" align="center" prop="types" min-width="200">
|
<el-table-column label="检测种类" align="center" prop="types" min-width="200">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<!-- TODO @AI:t 改成 type 变量; -->
|
<dict-tag :type="DICT_TYPE.MES_QC_TYPE" :value="scope.row.types" />
|
||||||
<!-- 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>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="是否启用" align="center" prop="enableFlag" width="100">
|
<el-table-column label="是否启用" align="center" prop="enableFlag" width="100">
|
||||||
|
|
@ -148,23 +139,7 @@
|
||||||
/>
|
/>
|
||||||
</ContentWrap>
|
</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" />
|
<TemplateForm ref="formRef" @success="getList" />
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|
@ -173,8 +148,6 @@ import { dateFormatter } from '@/utils/formatTime'
|
||||||
import download from '@/utils/download'
|
import download from '@/utils/download'
|
||||||
import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
|
import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
|
||||||
import TemplateForm from './TemplateForm.vue'
|
import TemplateForm from './TemplateForm.vue'
|
||||||
import TemplateIndicatorList from './TemplateIndicatorList.vue'
|
|
||||||
import TemplateItemList from './TemplateItemList.vue'
|
|
||||||
import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
|
import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
|
||||||
|
|
||||||
defineOptions({ name: 'MesQcTemplate' })
|
defineOptions({ name: 'MesQcTemplate' })
|
||||||
|
|
@ -190,15 +163,12 @@ const queryParams = reactive({
|
||||||
pageSize: 10,
|
pageSize: 10,
|
||||||
code: undefined,
|
code: undefined,
|
||||||
name: undefined,
|
name: undefined,
|
||||||
types: undefined,
|
type: undefined,
|
||||||
enableFlag: undefined
|
enableFlag: undefined
|
||||||
})
|
})
|
||||||
const queryFormRef = ref() // 搜索的表单
|
const queryFormRef = ref() // 搜索的表单
|
||||||
const exportLoading = ref(false) // 导出的加载中
|
const exportLoading = ref(false) // 导出的加载中
|
||||||
|
|
||||||
const currentRow = ref<QcTemplateVO | null>(null) // 当前选中行
|
|
||||||
const activeTab = ref('indicator') // 当前激活标签页
|
|
||||||
|
|
||||||
/** 查询列表 */
|
/** 查询列表 */
|
||||||
const getList = async () => {
|
const getList = async () => {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
|
|
@ -223,11 +193,6 @@ const resetQuery = () => {
|
||||||
handleQuery()
|
handleQuery()
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 行点击切换子表 */
|
|
||||||
const handleCurrentChange = (row: QcTemplateVO | null) => {
|
|
||||||
currentRow.value = row
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 添加/修改操作 */
|
/** 添加/修改操作 */
|
||||||
const formRef = ref()
|
const formRef = ref()
|
||||||
const openForm = (type: string, id?: number) => {
|
const openForm = (type: string, id?: number) => {
|
||||||
|
|
@ -240,10 +205,6 @@ const handleDelete = async (id: number) => {
|
||||||
await message.delConfirm()
|
await message.delConfirm()
|
||||||
await QcTemplateApi.deleteTemplate(id)
|
await QcTemplateApi.deleteTemplate(id)
|
||||||
message.success(t('common.delSuccess'))
|
message.success(t('common.delSuccess'))
|
||||||
// 若删除的是当前选中行,清空子表
|
|
||||||
if (currentRow.value?.id === id) {
|
|
||||||
currentRow.value = null
|
|
||||||
}
|
|
||||||
await getList()
|
await getList()
|
||||||
} catch {}
|
} catch {}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue