feat(mes): 清理 qc-template TODO,补全注释风格与表单布局

- TemplateForm/TemplateIndicatorForm/TemplateItemForm/TemplateIndicatorList/TemplateItemList:注释风格对齐(ref 行内注释、函数步骤注释、defineExpose/defineEmits 说明)
- TemplateIndicatorForm:表单布局调整为多行 el-row/el-col(质检指标+标准值 / 计量单位+误差上下限 / 检测方法 / 说明图 / 备注)
- TemplateItemForm:表单布局调整为多行(产品物料 / 最低检测数+最大不合格数 / 致命+严重+轻微缺陷率 / 备注),补充缺失的备注字段
- index.vue:搜索项检测种类改为单值 Integer 查询
pull/871/MERGE
YunaiV 2026-02-19 12:57:00 +08:00
parent e7a066d9c5
commit 20c6876f2c
5 changed files with 240 additions and 156 deletions

View File

@ -95,18 +95,16 @@ import { QcTemplateApi, QcTemplateVO } from '@/api/mes/qc/template'
import TemplateIndicatorList from './TemplateIndicatorList.vue' import TemplateIndicatorList from './TemplateIndicatorList.vue'
import TemplateItemList from './TemplateItemList.vue' import TemplateItemList from './TemplateItemList.vue'
// TODO @AI user form.vue
defineOptions({ name: 'TemplateForm' }) defineOptions({ name: 'TemplateForm' })
const { t } = useI18n() const { t } = useI18n() //
const message = useMessage() const message = useMessage() //
const dialogVisible = ref(false) const dialogVisible = ref(false) //
const dialogTitle = ref('') const dialogTitle = ref('') //
const formLoading = ref(false) const formLoading = ref(false) // 12
const formType = ref('') const formType = ref('') // create - update -
const activeTab = ref('indicator') const activeTab = ref('indicator') // Tab
const formData = ref({ const formData = ref({
id: undefined as number | undefined, id: undefined as number | undefined,
code: undefined, code: undefined,
@ -118,10 +116,12 @@ const formData = ref({
const formRules = reactive({ const formRules = reactive({
code: [{ required: true, message: '方案编号不能为空', trigger: 'blur' }], code: [{ required: true, message: '方案编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }], name: [{ required: true, message: '方案名称不能为空', trigger: 'blur' }],
types: [{ 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' }] enableFlag: [{ required: true, message: '是否启用不能为空', trigger: 'change' }]
}) })
const formRef = ref() const formRef = ref() // Ref
/** 生成方案编号 */ /** 生成方案编号 */
const generateCode = () => { const generateCode = () => {
@ -135,6 +135,7 @@ const open = async (type: string, id?: number) => {
formType.value = type formType.value = type
activeTab.value = 'indicator' activeTab.value = 'indicator'
resetForm() resetForm()
//
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
@ -148,12 +149,16 @@ const open = async (type: string, id?: number) => {
} }
} }
} }
defineExpose({ open }) defineExpose({ open }) // open
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) const emit = defineEmits(['success']) // success
const submitForm = async () => { const submitForm = async () => {
await formRef.value.validate() //
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as unknown as QcTemplateVO const data = formData.value as unknown as QcTemplateVO
@ -165,6 +170,7 @@ const submitForm = async () => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false dialogVisible.value = false
//
emit('success') emit('success')
} finally { } finally {
formLoading.value = false formLoading.value = false

View File

@ -1,61 +1,92 @@
<!-- 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"
:rules="formRules" :rules="formRules"
label-width="130px" label-width="100px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="质检指标" prop="indicatorId"> <el-row :gutter="16">
<QcIndicatorSelect v-model="formData.indicatorId" placeholder="请选择质检指标" /> <el-col :span="12">
</el-form-item> <el-form-item label="质检指标" prop="indicatorId">
<el-form-item label="检测方法" prop="checkMethod"> <QcIndicatorSelect
<el-input v-model="formData.indicatorId"
type="textarea" placeholder="请选择质检指标"
v-model="formData.checkMethod" class="!w-1/1"
placeholder="请输入检测方法" />
:rows="3" </el-form-item>
/> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="标准值" prop="standardValue"> <el-form-item label="标准值" prop="standardValue">
<el-input-number <el-input-number
v-model="formData.standardValue" v-model="formData.standardValue"
placeholder="请输入标准值" placeholder="请输入标准值"
:precision="4" :precision="4"
class="!w-1/1" class="!w-1/1"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="unitMeasureId"> </el-col>
<MdUnitMeasureSelect </el-row>
v-model="formData.unitMeasureId" <el-row :gutter="16">
placeholder="请选择计量单位" <el-col :span="8">
clearable <el-form-item label="计量单位" prop="unitMeasureId">
/> <MdUnitMeasureSelect
</el-form-item> v-model="formData.unitMeasureId"
<el-form-item label="误差上限" prop="thresholdMax"> placeholder="请选择计量单位"
<el-input-number clearable
v-model="formData.thresholdMax" class="!w-1/1"
placeholder="请输入误差上限" />
:precision="4" </el-form-item>
class="!w-1/1" </el-col>
/> <el-col :span="8">
</el-form-item> <el-form-item label="误差上限" prop="thresholdMax">
<el-form-item label="误差下限" prop="thresholdMin"> <el-input-number
<el-input-number v-model="formData.thresholdMax"
v-model="formData.thresholdMin" placeholder="请输入"
placeholder="请输入误差下限" :precision="4"
:precision="4" class="!w-1/1"
class="!w-1/1" />
/> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="说明图URL" prop="docUrl"> <el-col :span="8">
<el-input v-model="formData.docUrl" placeholder="请输入说明图URL" /> <el-form-item label="误差下限" prop="thresholdMin">
</el-form-item> <el-input-number
<el-form-item label="备注" prop="remark"> v-model="formData.thresholdMin"
<el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" /> placeholder="请输入"
</el-form-item> :precision="4"
class="!w-1/1"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="检测方法" prop="checkMethod">
<el-input
type="textarea"
v-model="formData.checkMethod"
placeholder="请输入检测方法"
:rows="3"
/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="说明图URL" prop="docUrl">
<el-input v-model="formData.docUrl" placeholder="请输入说明图URL" />
</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> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
@ -69,16 +100,15 @@ import { QcTemplateIndicatorApi, QcTemplateIndicatorVO } from '@/api/mes/qc/temp
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() //
const message = useMessage() const message = useMessage() //
const dialogVisible = ref(false) const dialogVisible = ref(false) //
const dialogTitle = ref('') const dialogTitle = ref('') //
const formLoading = ref(false) const formLoading = ref(false) // 12
const formType = ref('') const formType = ref('') // create - update -
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
templateId: undefined as number | undefined, templateId: undefined as number | undefined,
@ -94,7 +124,7 @@ const formData = ref({
const formRules = reactive({ const formRules = reactive({
indicatorId: [{ required: true, message: '质检指标不能为空', trigger: 'change' }] indicatorId: [{ required: true, message: '质检指标不能为空', trigger: 'change' }]
}) })
const formRef = ref() const formRef = ref() // Ref
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, templateId?: number) => { const open = async (type: string, id?: number, templateId?: number) => {
@ -103,6 +133,7 @@ const open = async (type: string, id?: number, templateId?: number) => {
formType.value = type formType.value = type
resetForm() resetForm()
formData.value.templateId = templateId formData.value.templateId = templateId
//
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
@ -112,12 +143,16 @@ const open = async (type: string, id?: number, templateId?: number) => {
} }
} }
} }
defineExpose({ open }) defineExpose({ open }) // open
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) const emit = defineEmits(['success']) // success
const submitForm = async () => { const submitForm = async () => {
await formRef.value.validate() //
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as unknown as QcTemplateIndicatorVO const data = formData.value as unknown as QcTemplateIndicatorVO
@ -129,6 +164,7 @@ const submitForm = async () => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false dialogVisible.value = false
//
emit('success') emit('success')
} finally { } finally {
formLoading.value = false formLoading.value = false

View File

@ -57,8 +57,6 @@
</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 { QcTemplateIndicatorApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template/indicator' import { QcTemplateIndicatorApi, QcTemplateIndicatorVO } from '@/api/mes/qc/template/indicator'
import TemplateIndicatorForm from './TemplateIndicatorForm.vue' import TemplateIndicatorForm from './TemplateIndicatorForm.vue'
@ -67,11 +65,11 @@ defineOptions({ name: 'TemplateIndicatorList' })
const props = defineProps<{ templateId: number }>() const props = defineProps<{ templateId: number }>()
const message = useMessage() const message = useMessage() //
const { t } = useI18n() const { t } = useI18n() //
const loading = ref(false) const loading = ref(false) //
const list = ref<QcTemplateIndicatorVO[]>([]) const list = ref<QcTemplateIndicatorVO[]>([]) //
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
@ -89,23 +87,26 @@ const getList = async () => {
} }
} }
/** 打开表单 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {
formRef.value.open(type, id, props.templateId) formRef.value.open(type, id, props.templateId)
} }
/** 删除 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
//
await message.delConfirm() await message.delConfirm()
//
await QcTemplateIndicatorApi.deleteTemplateIndicator(id) await QcTemplateIndicatorApi.deleteTemplateIndicator(id)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
//
await getList() await getList()
} catch {} } catch {}
} }
/** 监听 templateId 变化,重新加载 */ /** 监听 templateId 变化,重新加载列表 */
watch( watch(
() => props.templateId, () => props.templateId,
() => getList(), () => getList(),

View File

@ -1,61 +1,94 @@
<!-- 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"
:rules="formRules" :rules="formRules"
label-width="150px" label-width="120px"
v-loading="formLoading" v-loading="formLoading"
> >
<el-form-item label="产品物料" prop="itemId"> <el-row>
<MdItemSelect v-model="formData.itemId" placeholder="请选择产品物料" /> <el-col :span="24">
</el-form-item> <el-form-item label="产品物料" prop="itemId">
<el-form-item label="最低检测数" prop="quantityCheck"> <MdItemSelect v-model="formData.itemId" placeholder="请选择产品物料" class="!w-1/1" />
<el-input-number </el-form-item>
v-model="formData.quantityCheck" </el-col>
placeholder="请输入最低检测数" </el-row>
:min="1" <el-row :gutter="16">
class="!w-1/1" <el-col :span="8">
/> <el-form-item label="最低检测数" prop="quantityCheck">
</el-form-item> <el-input-number
<el-form-item label="最大不合格数" prop="quantityUnqualified"> v-model="formData.quantityCheck"
<el-input-number placeholder="请输入最低检测数"
v-model="formData.quantityUnqualified" :min="1"
placeholder="0表示不启用" class="!w-1/1"
:min="0" />
class="!w-1/1" </el-form-item>
/> </el-col>
</el-form-item> <el-col :span="8">
<el-form-item label="最大致命缺陷率(%)" prop="criticalRate"> <el-form-item label="最大不合格数" prop="quantityUnqualified">
<el-input-number <el-tooltip content="超出最大不合格数后整批判定不合格0表示不启用" placement="top">
v-model="formData.criticalRate" <el-input-number
placeholder="0表示不允许" v-model="formData.quantityUnqualified"
:min="0" placeholder="0表示不启用"
:max="100" :min="0"
:precision="2" class="!w-1/1"
class="!w-1/1" />
/> </el-tooltip>
</el-form-item> </el-form-item>
<el-form-item label="最大严重缺陷率(%)" prop="majorRate"> </el-col>
<el-input-number </el-row>
v-model="formData.majorRate" <el-row :gutter="16">
placeholder="0表示不允许" <el-col :span="8">
:min="0" <el-form-item label="致命缺陷率(%)" prop="criticalRate">
:max="100" <el-tooltip content="缺陷比例超出后整批判定不合格0表示不允许出现" placement="top">
:precision="2" <el-input-number
class="!w-1/1" v-model="formData.criticalRate"
/> placeholder="0表示不允许"
</el-form-item> :min="0"
<el-form-item label="最大轻微缺陷率(%)" prop="minorRate"> :max="100"
<el-input-number :precision="2"
v-model="formData.minorRate" class="!w-1/1"
:min="0" />
:max="100" </el-tooltip>
:precision="2" </el-form-item>
class="!w-1/1" </el-col>
/> <el-col :span="8">
</el-form-item> <el-form-item label="严重缺陷率(%)" prop="majorRate">
<el-tooltip content="缺陷比例超出后整批判定不合格0表示不允许出现" placement="top">
<el-input-number
v-model="formData.majorRate"
placeholder="0表示不允许"
:min="0"
:max="100"
:precision="2"
class="!w-1/1"
/>
</el-tooltip>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="轻微缺陷率(%)" prop="minorRate">
<el-tooltip content="缺陷比例超出后整批判定不合格0表示不允许出现" placement="top">
<el-input-number
v-model="formData.minorRate"
:min="0"
:max="100"
:precision="2"
class="!w-1/1"
/>
</el-tooltip>
</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> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
@ -65,19 +98,18 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
// TODO @AI user form.vue
import { QcTemplateItemApi, QcTemplateItemVO } from '@/api/mes/qc/template/item' 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' })
const { t } = useI18n() const { t } = useI18n() //
const message = useMessage() const message = useMessage() //
const dialogVisible = ref(false) const dialogVisible = ref(false) //
const dialogTitle = ref('') const dialogTitle = ref('') //
const formLoading = ref(false) const formLoading = ref(false) // 12
const formType = ref('') const formType = ref('') // create - update -
const formData = ref({ const formData = ref({
id: undefined, id: undefined,
templateId: undefined as number | undefined, templateId: undefined as number | undefined,
@ -86,13 +118,14 @@ const formData = ref({
quantityUnqualified: 0, quantityUnqualified: 0,
criticalRate: 0, criticalRate: 0,
majorRate: 0, majorRate: 0,
minorRate: 100 minorRate: 100,
remark: undefined
}) })
const formRules = reactive({ const formRules = reactive({
itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }], itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }],
quantityCheck: [{ required: true, message: '最低检测数不能为空', trigger: 'blur' }] quantityCheck: [{ required: true, message: '最低检测数不能为空', trigger: 'blur' }]
}) })
const formRef = ref() const formRef = ref() // Ref
/** 打开弹窗 */ /** 打开弹窗 */
const open = async (type: string, id?: number, templateId?: number) => { const open = async (type: string, id?: number, templateId?: number) => {
@ -101,6 +134,7 @@ const open = async (type: string, id?: number, templateId?: number) => {
formType.value = type formType.value = type
resetForm() resetForm()
formData.value.templateId = templateId formData.value.templateId = templateId
//
if (id) { if (id) {
formLoading.value = true formLoading.value = true
try { try {
@ -110,12 +144,16 @@ const open = async (type: string, id?: number, templateId?: number) => {
} }
} }
} }
defineExpose({ open }) defineExpose({ open }) // open
/** 提交表单 */ /** 提交表单 */
const emit = defineEmits(['success']) const emit = defineEmits(['success']) // success
const submitForm = async () => { const submitForm = async () => {
await formRef.value.validate() //
if (!formRef) return
const valid = await formRef.value.validate()
if (!valid) return
//
formLoading.value = true formLoading.value = true
try { try {
const data = formData.value as unknown as QcTemplateItemVO const data = formData.value as unknown as QcTemplateItemVO
@ -127,6 +165,7 @@ const submitForm = async () => {
message.success(t('common.updateSuccess')) message.success(t('common.updateSuccess'))
} }
dialogVisible.value = false dialogVisible.value = false
//
emit('success') emit('success')
} finally { } finally {
formLoading.value = false formLoading.value = false
@ -143,7 +182,8 @@ const resetForm = () => {
quantityUnqualified: 0, quantityUnqualified: 0,
criticalRate: 0, criticalRate: 0,
majorRate: 0, majorRate: 0,
minorRate: 100 minorRate: 100,
remark: undefined
} }
formRef.value?.resetFields() formRef.value?.resetFields()
} }

View File

@ -57,8 +57,6 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
// TODO @AI user index.vue
import { QcTemplateItemApi, QcTemplateItemVO } from '@/api/mes/qc/template/item' import { QcTemplateItemApi, QcTemplateItemVO } from '@/api/mes/qc/template/item'
import TemplateItemForm from './TemplateItemForm.vue' import TemplateItemForm from './TemplateItemForm.vue'
@ -66,11 +64,11 @@ defineOptions({ name: 'TemplateItemList' })
const props = defineProps<{ templateId: number }>() const props = defineProps<{ templateId: number }>()
const message = useMessage() const message = useMessage() //
const { t } = useI18n() const { t } = useI18n() //
const loading = ref(false) const loading = ref(false) //
const list = ref<QcTemplateItemVO[]>([]) const list = ref<QcTemplateItemVO[]>([]) //
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
@ -88,23 +86,26 @@ const getList = async () => {
} }
} }
/** 打开表单 */ /** 添加/修改操作 */
const formRef = ref() const formRef = ref()
const openForm = (type: string, id?: number) => { const openForm = (type: string, id?: number) => {
formRef.value.open(type, id, props.templateId) formRef.value.open(type, id, props.templateId)
} }
/** 删除 */ /** 删除按钮操作 */
const handleDelete = async (id: number) => { const handleDelete = async (id: number) => {
try { try {
//
await message.delConfirm() await message.delConfirm()
//
await QcTemplateItemApi.deleteTemplateItem(id) await QcTemplateItemApi.deleteTemplateItem(id)
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
//
await getList() await getList()
} catch {} } catch {}
} }
/** 监听 templateId 变化,重新加载 */ /** 监听 templateId 变化,重新加载列表 */
watch( watch(
() => props.templateId, () => props.templateId,
() => getList(), () => getList(),