feat(mes): 优化 RQC 前端交互,添加缺陷统计显示

主要变更:
  - RqcForm 添加缺陷情况显示区域和 detail 模式支持
  - 检验单编号改为链接,点击可查看详情(对齐 IQC)
  - 删除 sourceDocCode 字段,rqcType 改为 type
  - RQC Line 的 toolId/toolName 改为 tool 字段
  - 新增成功后自动切换到编辑模式,可继续编辑子表
pull/871/MERGE
YunaiV 2026-02-25 19:24:30 +08:00
parent 44aa77e79f
commit 2fc5362a7e
6 changed files with 135 additions and 81 deletions

View File

@ -8,9 +8,8 @@ export interface QcRqcVO {
templateId: number // 检验模板 ID
sourceDocId: number // 来源单据 ID
sourceDocType: string // 来源单据类型
sourceDocCode: string // 来源单据编号
sourceLineId: number // 来源单据行 ID
rqcType: number // 检验类型
type: number // 检验类型
itemId: number // 产品物料 ID
itemCode: string // 产品物料编码(关联查询)
itemName: string // 产品物料名称(关联查询)
@ -26,6 +25,13 @@ export interface QcRqcVO {
inspectorNickname: string // 检测人员昵称(关联查询)
status: number // 状态
remark: string // 备注
// 缺陷统计
criticalQuantity: number // 致命缺陷数量
majorQuantity: number // 严重缺陷数量
minorQuantity: number // 轻微缺陷数量
criticalRate: number // 致命缺陷率(%
majorRate: number // 严重缺陷率(%
minorRate: number // 轻微缺陷率(%
}
// MES 退货检验单 API

View File

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

View File

@ -293,5 +293,5 @@ export enum DICT_TYPE {
MES_PRO_ANDON_LEVEL = 'mes_pro_andon_level', // MES 安灯级别
MES_RQC_TYPE = 'mes_rqc_type', // MES 退货检验类型
MES_WM_ARRIVAL_NOTICE_STATUS = 'mes_wm_arrival_notice_status', // MES 到货通知单状态
MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status' // MES 物料接收单状态
MES_WM_ITEM_RECEIPT_STATUS = 'mes_wm_item_receipt_status', // MES 物料接收单状态
}

View File

@ -8,6 +8,7 @@
:rules="formRules"
label-width="120px"
v-loading="formLoading"
:disabled="isDetail"
>
<el-row :gutter="16">
<el-col :span="8">
@ -26,21 +27,14 @@
<el-input v-model="formData.name" placeholder="请输入检验单名称" />
</el-form-item>
</el-col>
<!-- TODO @AI不用前端选择后端自己计算出来 -->
<el-col :span="8">
<el-form-item label="质检方案" prop="templateId">
<QcTemplateSelect v-model="formData.templateId" class="!w-1/1" />
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="left">物料信息</el-divider>
<el-row :gutter="16">
<el-col :span="8">
<!-- TODO @AI应该有 3 个类型字典要加下生产退料检验委外退料检验销售退货检验 -->
<el-form-item label="检验类型" prop="rqcType">
<el-form-item label="检验类型" prop="type">
<el-select
v-model="formData.rqcType"
v-model="formData.type"
placeholder="请选择检验类型"
clearable
class="!w-1/1"
@ -58,7 +52,12 @@
<!-- TODO @芋艿暂时不处理来源单据编号 -->
<el-col :span="8">
<el-form-item label="产品物料" prop="itemId">
<MdItemSelect v-model="formData.itemId" placeholder="请选择产品物料" class="!w-1/1" />
<MdItemSelect
v-model="formData.itemId"
placeholder="请选择产品物料"
class="!w-1/1"
:disabled="isFromPendingTask"
/>
</el-form-item>
</el-col>
<el-col :span="8">
@ -150,10 +149,47 @@
</el-form-item>
</el-col>
</el-row>
<!-- 缺陷统计只读 -->
<el-divider content-position="left">缺陷情况</el-divider>
<el-row :gutter="16">
<el-col :span="8">
<el-form-item label="致命缺陷数">
<el-input :model-value="formData.criticalQuantity" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="严重缺陷数">
<el-input :model-value="formData.majorQuantity" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="轻微缺陷数">
<el-input :model-value="formData.minorQuantity" disabled />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="16">
<el-col :span="8">
<el-form-item label="致命缺陷率">
<el-input :model-value="formData.criticalRate + '%'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="严重缺陷率">
<el-input :model-value="formData.majorRate + '%'" disabled />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="轻微缺陷率">
<el-input :model-value="formData.minorRate + '%'" disabled />
</el-form-item>
</el-col>
</el-row>
</el-form>
<!-- 子表标签页编辑模式下显示 -->
<template v-if="formType === 'update' && formData.id">
<!-- 子表标签页编辑/详情模式下显示 -->
<template v-if="(formType === 'update' || formType === 'detail') && formData.id">
<el-divider />
<el-tabs v-model="activeTab">
<el-tab-pane label="检验项" name="line">
@ -166,7 +202,9 @@
</template>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="submitForm" type="primary" :disabled="formLoading" v-if="!isDetail">
</el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
@ -178,7 +216,6 @@ import { generateRandomStr } from '@/utils'
import { QcRqcApi, QcRqcVO } from '@/api/mes/qc/rqc'
import MdItemSelect from '@/views/mes/md/item/components/MdItemSelect.vue'
import UserSelect from '@/views/system/user/components/UserSelect.vue'
import QcTemplateSelect from '@/views/mes/qc/template/components/QcTemplateSelect.vue'
import RqcLineList from './RqcLineList.vue'
import QcIndicatorResultList from '@/views/mes/qc/indicatorresult/components/QcIndicatorResultList.vue'
import { MesQcTypeEnum } from '@/views/mes/utils/constants'
@ -189,10 +226,21 @@ const { t } = useI18n() // 国际化
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formType = ref('') // create - update - detail -
const activeTab = ref('line') //
const dialogTitle = computed(() => {
const titles = {
create: '新增退货检验单',
update: '修改退货检验单',
detail: '查看退货检验单'
}
return titles[formType.value] || t('action.' + formType.value)
}) // formType
const isDetail = computed(() => formType.value === 'detail') //
const isFromPendingTask = computed(
() => formType.value === 'create' && formData.value.sourceDocId != null
) //
const formData = ref({
id: undefined as number | undefined,
@ -201,9 +249,8 @@ const formData = ref({
templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceLineId: undefined,
rqcType: undefined,
type: undefined,
itemId: undefined,
batchCode: undefined,
checkQuantity: undefined,
@ -212,14 +259,25 @@ const formData = ref({
checkResult: undefined,
inspectDate: undefined,
inspectorUserId: undefined,
remark: undefined
remark: undefined,
//
criticalRate: 0,
majorRate: 0,
minorRate: 0,
criticalQuantity: 0,
majorQuantity: 0,
minorQuantity: 0
})
// TODO @AI
const formRules = reactive({
code: [{ required: true, message: '检验单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '检验单名称不能为空', trigger: 'blur' }],
templateId: [{ required: true, message: '检验模板不能为空', trigger: 'change' }],
itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }]
type: [{ required: true, message: '检验类型不能为空', trigger: 'change' }],
itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }],
checkQuantity: [{ required: true, message: '检测数量不能为空', trigger: 'blur' }],
qualifiedQuantity: [{ required: true, message: '合格品数量不能为空', trigger: 'blur' }],
unqualifiedQuantity: [{ required: true, message: '不合格数量不能为空', trigger: 'blur' }],
inspectDate: [{ required: true, message: '检测日期不能为空', trigger: 'change' }],
inspectorUserId: [{ required: true, message: '检测人员不能为空', trigger: 'change' }]
})
const formRef = ref() // Ref
@ -229,13 +287,12 @@ const generateCode = () => {
}
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
const open = async (type: string, id?: number, data?: QcRqcVO) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
activeTab.value = 'line'
resetForm()
//
// /
if (id) {
formLoading.value = true
try {
@ -243,6 +300,9 @@ const open = async (type: string, id?: number) => {
} finally {
formLoading.value = false
}
} else if (data) {
// pending inspect
Object.assign(formData.value, data)
}
}
defineExpose({ open }) // open
@ -259,13 +319,15 @@ const submitForm = async () => {
try {
const data = formData.value as unknown as QcRqcVO
if (formType.value === 'create') {
await QcRqcApi.createRqc(data)
const res = await QcRqcApi.createRqc(data)
message.success(t('common.createSuccess'))
// id
formData.value.id = res
formType.value = 'update'
} else {
await QcRqcApi.updateRqc(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
@ -282,9 +344,8 @@ const resetForm = () => {
templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
sourceLineId: undefined,
rqcType: undefined,
type: undefined,
itemId: undefined,
batchCode: undefined,
checkQuantity: undefined,
@ -293,7 +354,13 @@ const resetForm = () => {
checkResult: undefined,
inspectDate: undefined,
inspectorUserId: undefined,
remark: undefined
remark: undefined,
criticalRate: 0,
majorRate: 0,
minorRate: 0,
criticalQuantity: 0,
majorQuantity: 0,
minorQuantity: 0
}
formRef.value?.resetFields()
}

View File

@ -9,7 +9,7 @@
<dict-tag :type="DICT_TYPE.MES_INDICATOR_TYPE" :value="scope.row.indicatorType" />
</template>
</el-table-column>
<el-table-column label="检测工具" align="center" prop="toolName" width="120" />
<el-table-column label="检测工具" align="center" prop="tool" 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="unitMeasureName" width="80" />

View File

@ -18,25 +18,24 @@
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI来源类型应该是个字典并且要按照 rqc 做下过滤 -->
<!--
TODO @芋艿暂时不用处理等后面接完 source 业务
<el-form-item label="来源单据类型" prop="sourceDocType">
<el-input
<el-select
v-model="queryParams.sourceDocType"
placeholder="请输入来源单据类型"
placeholder="请选择来源单据类型"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="来源单据编号" prop="sourceDocCode">
<el-input
v-model="queryParams.sourceDocCode"
placeholder="请输入来源单据编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_QC_SOURCE_DOC_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
-->
<el-form-item label="产品物料" prop="itemId">
<MdItemSelect
v-model="queryParams.itemId"
@ -45,22 +44,14 @@
class="!w-240px"
/>
</el-form-item>
<!-- TODO @AI批次号 batchCode -->
<!-- TODO @AI不需要 rqcType 的检索去掉去掉前后端都去掉 -->
<el-form-item label="检验类型" prop="rqcType">
<el-select
v-model="queryParams.rqcType"
placeholder="请选择检验类型"
<el-form-item label="批次号" prop="batchCode">
<el-input
v-model="queryParams.batchCode"
placeholder="请输入批次号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_RQC_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
/>
</el-form-item>
<el-form-item label="检测结果" prop="checkResult">
<el-select
@ -77,18 +68,6 @@
/>
</el-select>
</el-form-item>
<!-- TODO @AI去掉 inspectDate前后端都去掉 -->
<el-form-item label="检测日期" prop="inspectDate">
<el-date-picker
v-model="queryParams.inspectDate"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="检测人员" prop="inspectorUserId">
<UserSelect
v-model="queryParams.inspectorUserId"
@ -124,10 +103,15 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="检验单编号" align="center" prop="code" width="160" />
<el-table-column label="检验单编号" align="center" prop="code" width="160">
<template #default="scope">
<el-link type="primary" @click="openForm('detail', scope.row.id)">
{{ scope.row.code }}
</el-link>
</template>
</el-table-column>
<el-table-column label="检验单名称" align="center" prop="name" min-width="180" />
<el-table-column label="来源单据类型" align="center" prop="sourceDocType" width="120" />
<el-table-column label="来源单据编号" align="center" prop="sourceDocCode" width="140" />
<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="itemSpecification" width="130" />
@ -219,11 +203,9 @@ const queryParams = reactive({
pageSize: 10,
code: undefined,
sourceDocType: undefined,
sourceDocCode: undefined,
itemId: undefined,
rqcType: undefined,
batchCode: undefined,
checkResult: undefined,
inspectDate: undefined,
inspectorUserId: undefined
})
const queryFormRef = ref() //