diff --git a/src/api/mes/qc/iqc/index.ts b/src/api/mes/qc/iqc/index.ts
index acc84db9c..232a7845e 100644
--- a/src/api/mes/qc/iqc/index.ts
+++ b/src/api/mes/qc/iqc/index.ts
@@ -17,8 +17,6 @@ export interface QcIqcVO {
itemName: string // 产品物料名称(关联查询)
itemSpecification: string // 规格型号(关联查询)
unitName: string // 单位名称(关联查询)
- minCheckQuantity: number // 最低检测数
- maxUnqualifiedQuantity: number // 最大不合格数
receivedQuantity: number // 本次接收数量
checkQuantity: number // 本次检测数量
qualifiedQuantity: number // 合格品数量
diff --git a/src/views/mes/qc/iqc/IqcForm.vue b/src/views/mes/qc/iqc/IqcForm.vue
index 48d90e648..336b34ed0 100644
--- a/src/views/mes/qc/iqc/IqcForm.vue
+++ b/src/views/mes/qc/iqc/IqcForm.vue
@@ -26,11 +26,6 @@
-
-
-
-
-
物料与供应商
@@ -65,12 +60,12 @@
检测情况
-
+
@@ -121,16 +116,6 @@
/>
-
-
-
-
-
-
@@ -223,8 +208,6 @@ import { generateRandomStr } from '@/utils'
import { QcIqcApi, QcIqcVO } from '@/api/mes/qc/iqc'
import MdVendorSelect from '@/views/mes/md/vendor/components/MdVendorSelect.vue'
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 IqcLineList from './IqcLineList.vue'
import QcIndicatorResultList from '@/views/mes/qc/indicatorresult/components/QcIndicatorResultList.vue'
import { MesQcTypeEnum } from '@/views/mes/utils/constants'
@@ -249,23 +232,18 @@ const formData = ref({
id: undefined as number | undefined,
code: undefined,
name: undefined,
- templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
sourceLineId: undefined,
vendorId: undefined,
vendorBatch: undefined,
itemId: undefined,
- minCheckQuantity: undefined,
- maxUnqualifiedQuantity: undefined,
receivedQuantity: undefined,
- checkQuantity: undefined,
qualifiedQuantity: undefined,
unqualifiedQuantity: undefined,
checkResult: undefined,
receiveDate: undefined,
inspectDate: undefined,
- inspectorUserId: undefined,
remark: undefined,
// 缺陷统计(只读)
criticalRate: 0,
@@ -278,10 +256,13 @@ const formData = ref({
const formRules = reactive({
code: [{ required: true, message: '检验单编号不能为空', trigger: 'blur' }],
name: [{ required: true, message: '检验单名称不能为空', trigger: 'blur' }],
- templateId: [{ required: true, message: '检验模板不能为空', trigger: 'change' }],
vendorId: [{ required: true, message: '供应商不能为空', trigger: 'change' }],
itemId: [{ required: true, message: '产品物料不能为空', trigger: 'change' }],
- receivedQuantity: [{ required: true, message: '接收数量不能为空', trigger: 'blur' }]
+ receivedQuantity: [{ required: true, message: '本次接收数量不能为空', trigger: 'blur' }],
+ qualifiedQuantity: [{ required: true, message: '合格品数量不能为空', trigger: 'blur' }],
+ unqualifiedQuantity: [{ required: true, message: '不合格品数量不能为空', trigger: 'blur' }],
+ receiveDate: [{ required: true, message: '来料日期不能为空', trigger: 'change' }],
+ inspectDate: [{ required: true, message: '检测日期不能为空', trigger: 'change' }]
})
const formRef = ref() // 表单 Ref
@@ -291,8 +272,7 @@ const generateCode = () => {
}
/** 打开弹窗 */
-// TODO @AI:Partial 是不是可以不用?变量是不是可以叫 data;
-const open = async (type: string, id?: number, prefillData?: Partial) => {
+const open = async (type: string, id?: number, data?: QcIqcVO) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
@@ -306,9 +286,9 @@ const open = async (type: string, id?: number, prefillData?: Partial) =
} finally {
formLoading.value = false
}
- } else if (prefillData) {
+ } else if (data) {
// 预填模式:来自待检任务(pending inspect)
- Object.assign(formData.value, prefillData)
+ Object.assign(formData.value, data)
}
}
defineExpose({ open }) // 提供 open 方法,用于打开弹窗
@@ -345,24 +325,18 @@ const resetForm = () => {
id: undefined,
code: undefined,
name: undefined,
- templateId: undefined,
sourceDocId: undefined,
sourceDocType: undefined,
- sourceDocCode: undefined,
sourceLineId: undefined,
vendorId: undefined,
vendorBatch: undefined,
itemId: undefined,
- minCheckQuantity: undefined,
- maxUnqualifiedQuantity: undefined,
receivedQuantity: undefined,
- checkQuantity: undefined,
qualifiedQuantity: undefined,
unqualifiedQuantity: undefined,
checkResult: undefined,
receiveDate: undefined,
inspectDate: undefined,
- inspectorUserId: undefined,
remark: undefined,
criticalRate: 0,
majorRate: 0,