diff --git a/src/api/mes/qc/rqc/index.ts b/src/api/mes/qc/rqc/index.ts
index 126f7af98..9718fd5a2 100644
--- a/src/api/mes/qc/rqc/index.ts
+++ b/src/api/mes/qc/rqc/index.ts
@@ -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
diff --git a/src/api/mes/qc/rqc/line/index.ts b/src/api/mes/qc/rqc/line/index.ts
index 6740200c0..dccf7eb26 100644
--- a/src/api/mes/qc/rqc/line/index.ts
+++ b/src/api/mes/qc/rqc/line/index.ts
@@ -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
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 364dc7cad..07d8e97e7 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -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 物料接收单状态
}
diff --git a/src/views/mes/qc/rqc/RqcForm.vue b/src/views/mes/qc/rqc/RqcForm.vue
index 0442fb6dd..67226ff4d 100644
--- a/src/views/mes/qc/rqc/RqcForm.vue
+++ b/src/views/mes/qc/rqc/RqcForm.vue
@@ -8,6 +8,7 @@
:rules="formRules"
label-width="120px"
v-loading="formLoading"
+ :disabled="isDetail"
>
@@ -26,21 +27,14 @@
-
-
-
-
-
-
物料信息
-
-
+
-
+
@@ -150,10 +149,47 @@
+
+
+ 缺陷情况
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -166,7 +202,9 @@
- 保 存
+
+ 保 存
+
关 闭
@@ -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) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-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()
}
diff --git a/src/views/mes/qc/rqc/RqcLineList.vue b/src/views/mes/qc/rqc/RqcLineList.vue
index 191a7e4bc..ea515e454 100644
--- a/src/views/mes/qc/rqc/RqcLineList.vue
+++ b/src/views/mes/qc/rqc/RqcLineList.vue
@@ -9,7 +9,7 @@
-
+
diff --git a/src/views/mes/qc/rqc/index.vue b/src/views/mes/qc/rqc/index.vue
index 04f0092e2..b65d0f048 100644
--- a/src/views/mes/qc/rqc/index.vue
+++ b/src/views/mes/qc/rqc/index.vue
@@ -18,25 +18,24 @@
class="!w-240px"
/>
-
+
-
-
-
-
+
-
-
+ />
-
-
-
-
-
+
+
+
+ {{ scope.row.code }}
+
+
+
-
@@ -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() // 搜索的表单