diff --git a/src/views/quality/prevent/handle/components/edit.vue b/src/views/quality/prevent/handle/components/edit.vue index 30cd613..68608bc 100644 --- a/src/views/quality/prevent/handle/components/edit.vue +++ b/src/views/quality/prevent/handle/components/edit.vue @@ -10,7 +10,8 @@ import { getSearchDept } from '@/api/quality/supervise/record' import { AGREE, DETAILURL } from '@/views/quality/agree' import { SCHEDULE } from '@/utils/scheduleDict' -import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue' +import ApprovalDialog from '@/views/quality/correct/handle/components/ApprovalDialog.vue' +import ApprovalOpinion from '@/views/quality/correct/handle/components/approvalOpinion.vue' const $props = defineProps({ showBase: { type: Boolean, @@ -39,6 +40,8 @@ description: '', taskId: '', }) +// 审批过程中上传的附件 +const fileList = ref([]) // 表单验证规则 const rules = ref({ bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }], @@ -103,6 +106,8 @@ // 详情 // console.log(res.data, '详情') ruleForm.value = res.data + // 审批附件 + fileList.value = [...res.data.correctiveActionFiles, ...res.data.rectificationSituationFiles] setTimeout(() => { watchFlag.value = false }, 500) @@ -176,10 +181,10 @@ }) } else if (val === '同意') { - approvalDialog.value.initDialog('agree', taskId.value) + approvalDialog.value.initDialog('agree', taskId.value, ruleForm.value.id, processId.value) } else if (val === '拒绝') { - approvalDialog.value.initDialog('refuse', taskId.value, ruleForm.value.id) + approvalDialog.value.initDialog('refuse', taskId.value, ruleForm.value.id, processId.value) } } // 拒绝 @@ -283,7 +288,7 @@ - +