diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index badd548a4..a5b9daf2c 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => { // 编辑 // 评估代码值是1,接收时候,使用决策下拉列表是全部合格 if (row.estimateCode == 1) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) } }) } else if (row.estimateCode == 2) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) } @@ -338,7 +338,7 @@ const basicFormRef = ref() /** 使用决策操作操作 */ const formRef = ref() const rowData = ref() -const openUseForm = async (type: string, row?: number) => { +const openUseForm = async (type: string, row?: any) => { tableData.value = [] // 重置明细数据 rowData.value = row formRef.value.open(type, row) diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue index c430495c8..b533dfcf7 100644 --- a/src/views/qms/inspectionRecord/useAddForm.vue +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if(row.estimateCode == 1){ data.value.useDecision = '1' }else{ - data.value.useDecision ='' + data.value.useDecision =row.useDecision||'' } // 全部合格时合格数量==数量 if(data.value.useDecision == 1){