diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue index 42ad8dfd..d6978831 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue @@ -508,7 +508,8 @@ @@ -1079,199 +1080,272 @@ const disabledDate = time => { return false } //提交 -const confirmForm = () => { - ruleFormRef.value.validate((valid: any) => { - if (valid) { - //整理上传文件的数据 - // userType==0,1 - subForm.value.reporter = adminInfo.$state.id - subForm.value.orgId = adminInfo.$state.deptId - let confirmFormData = JSON.parse(JSON.stringify(subForm.value)) - //1.判断是否上传 - if (subForm.value.userType == '0' || subForm.value.userType == '1') { - // if (!feasibilityReport.value) { - // return ElMessage({ - // message: '请上传可研报告', - // type: 'warning' - // }) - // } - // if (!preliminaryDesignDescription.value) { - // return ElMessage({ - // message: '请上传项目初步设计说明书', - // type: 'warning' - // }) - // } - if (!predictionEvaluationReport.value) { - return ElMessage({ - message: '请上传预测评估报告', - type: 'warning' - }) +const confirmForm = (flag?: boolean) => { + if (flag) { + //整理上传文件的数据 + // userType==0,1 + subForm.value.reporter = adminInfo.$state.id + subForm.value.orgId = adminInfo.$state.deptId + let confirmFormData = JSON.parse(JSON.stringify(subForm.value)) + //1.判断是否上传 + if (subForm.value.userType == '0' || subForm.value.userType == '1') { + { + //其他报告非必填 + confirmFormData.userReportProjectPO = { + ...confirmFormData.userReportProjectPO, + feasibilityReport: feasibilityReport.value, //可研报告 + preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 + predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 + predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 + additionalAttachments: additionalAttachments?.value //其他附件告地址 } - if (!predictionEvaluationReviewOpinions.value) { - return ElMessage({ - message: '请上传预测评估评审意见报告', - type: 'warning' + } + } + + if ( + subForm.value.userType == '2' || + subForm.value.userType == '3' || + subForm.value.userType == '4' || + subForm.value.userType == '5' + ) { + { + confirmFormData.userReportSubstationPO = { + ...confirmFormData.userReportSubstationPO, + feasibilityReport: feasibilityReport.value, //可研报告 + preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 + predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 + predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 + additionalAttachments: additionalAttachments.value, //其他附件告地址 + substationMainWiringDiagram: substationMainWiringDiagram.value //用户接入变电站主接线示意图地址 + } + } + } + //userType==6 + if (subForm.value.userType == '6') { + { + confirmFormData.userReportSensitivePO = { + ...confirmFormData.userReportSensitivePO, + feasibilityReport: feasibilityReport.value, //可研报告 + preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 + predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 + predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 + additionalAttachments: additionalAttachments.value, //其他附件告地址 + substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址 + sensitiveDevices: sensitiveDevices.value, //主要敏感终端清单 + antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告 + powerQualityReport: powerQualityReport.value //背景电能质量测试报告 + } + } + } + confirmFormData.saveOrCheckflag = '1' + confirmFormData.id = resendId.value + submitFormData(confirmFormData).then(res => { + ElMessage({ + message: '保存成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + }) + } else { + console.log(123213); + + ruleFormRef.value.validate((valid: any) => { + if (valid) { + //整理上传文件的数据 + // userType==0,1 + subForm.value.reporter = adminInfo.$state.id + subForm.value.orgId = adminInfo.$state.deptId + let confirmFormData = JSON.parse(JSON.stringify(subForm.value)) + //1.判断是否上传 + if (subForm.value.userType == '0' || subForm.value.userType == '1') { + // if (!feasibilityReport.value) { + // return ElMessage({ + // message: '请上传可研报告', + // type: 'warning' + // }) + // } + // if (!preliminaryDesignDescription.value) { + // return ElMessage({ + // message: '请上传项目初步设计说明书', + // type: 'warning' + // }) + // } + if (!predictionEvaluationReport.value) { + return ElMessage({ + message: '请上传预测评估报告', + type: 'warning' + }) + } + if (!predictionEvaluationReviewOpinions.value) { + return ElMessage({ + message: '请上传预测评估评审意见报告', + type: 'warning' + }) + } else { + //其他报告非必填 + confirmFormData.userReportProjectPO = { + ...confirmFormData.userReportProjectPO, + feasibilityReport: feasibilityReport.value, //可研报告 + preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 + predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 + predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 + additionalAttachments: additionalAttachments?.value //其他附件告地址 + } + } + } + //userType==2,3,4,5 + if ( + subForm.value.userType == '2' || + subForm.value.userType == '3' || + subForm.value.userType == '4' || + subForm.value.userType == '5' + ) { + // if (!feasibilityReport.value) { + // return ElMessage({ + // message: '请上传可研报告', + // type: 'warning' + // }) + // } + // if (!preliminaryDesignDescription.value) { + // return ElMessage({ + // message: '请上传项目初步设计说明书', + // type: 'warning' + // }) + // } + if (!predictionEvaluationReport.value) { + return ElMessage({ + message: '请上传预测评估报告', + type: 'warning' + }) + } + if (!predictionEvaluationReviewOpinions.value) { + return ElMessage({ + message: '请上传预测评估评审意见报告', + type: 'warning' + }) + } + if (!substationMainWiringDiagram.value) { + return ElMessage({ + message: '请上传用户接入变电站主接线示意图', + type: 'warning' + }) + } + //其他附件非必填 + else { + confirmFormData.userReportSubstationPO = { + ...confirmFormData.userReportSubstationPO, + feasibilityReport: feasibilityReport.value, //可研报告 + preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 + predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 + predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 + additionalAttachments: additionalAttachments.value, //其他附件告地址 + substationMainWiringDiagram: substationMainWiringDiagram.value //用户接入变电站主接线示意图地址 + } + } + } + //userType==6 + if (subForm.value.userType == '6') { + // if (!feasibilityReport.value) { + // return ElMessage({ + // message: '请上传可研报告', + // type: 'warning' + // }) + // } + // if (!preliminaryDesignDescription.value) { + // return ElMessage({ + // message: '请上传项目初步设计说明书', + // type: 'warning' + // }) + // } + if (!predictionEvaluationReport.value) { + return ElMessage({ + message: '请上传预测评估报告', + type: 'warning' + }) + } + if (!predictionEvaluationReviewOpinions.value) { + return ElMessage({ + message: '请上传预测评估评审意见报告', + type: 'warning' + }) + } + if (!substationMainWiringDiagram.value) { + return ElMessage({ + message: '请上传用户接入变电站主接线示意图', + type: 'warning' + }) + } + if (!sensitiveDevices.value) { + return ElMessage({ + message: '请上传主要敏感终端清单', + type: 'warning' + }) + } + if (!antiInterferenceReport.value) { + return ElMessage({ + message: '请上传抗扰度测试报告', + type: 'warning' + }) + } + if (!powerQualityReport.value) { + return ElMessage({ + message: '请上传背景电能质量测试报告', + type: 'warning' + }) + } + //其他附件非必填 + else { + confirmFormData.userReportSensitivePO = { + ...confirmFormData.userReportSensitivePO, + feasibilityReport: feasibilityReport.value, //可研报告 + preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 + predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 + predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 + additionalAttachments: additionalAttachments.value, //其他附件告地址 + substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址 + sensitiveDevices: sensitiveDevices.value, //主要敏感终端清单 + antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告 + powerQualityReport: powerQualityReport.value //背景电能质量测试报告 + } + } + } + confirmFormData.saveOrCheckflag = '2' + if (title.value == '用户档案录入') { + submitFormData(confirmFormData).then(res => { + if (res.code == 'A0000') { + ElMessage({ + message: '新增成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } }) } else { - //其他报告非必填 - confirmFormData.userReportProjectPO = { - ...confirmFormData.userReportProjectPO, - feasibilityReport: feasibilityReport.value, //可研报告 - preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 - predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 - predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 - additionalAttachments: additionalAttachments?.value //其他附件告地址 - } - } - } - //userType==2,3,4,5 - if ( - subForm.value.userType == '2' || - subForm.value.userType == '3' || - subForm.value.userType == '4' || - subForm.value.userType == '5' - ) { - // if (!feasibilityReport.value) { - // return ElMessage({ - // message: '请上传可研报告', - // type: 'warning' - // }) - // } - // if (!preliminaryDesignDescription.value) { - // return ElMessage({ - // message: '请上传项目初步设计说明书', - // type: 'warning' - // }) - // } - if (!predictionEvaluationReport.value) { - return ElMessage({ - message: '请上传预测评估报告', - type: 'warning' + console.log(confirmFormData) + confirmFormData.id = resendId.value + + updateFormData(confirmFormData).then(res => { + if (res.code == 'A0000') { + ElMessage({ + message: '重新发起成功', + type: 'success' + }) + ruleFormRef.value.resetFields() + resetForm() + close() + } }) } - if (!predictionEvaluationReviewOpinions.value) { - return ElMessage({ - message: '请上传预测评估评审意见报告', - type: 'warning' - }) - } - if (!substationMainWiringDiagram.value) { - return ElMessage({ - message: '请上传用户接入变电站主接线示意图', - type: 'warning' - }) - } - //其他附件非必填 - else { - confirmFormData.userReportSubstationPO = { - ...confirmFormData.userReportSubstationPO, - feasibilityReport: feasibilityReport.value, //可研报告 - preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 - predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 - predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 - additionalAttachments: additionalAttachments.value, //其他附件告地址 - substationMainWiringDiagram: substationMainWiringDiagram.value //用户接入变电站主接线示意图地址 - } - } - } - //userType==6 - if (subForm.value.userType == '6') { - // if (!feasibilityReport.value) { - // return ElMessage({ - // message: '请上传可研报告', - // type: 'warning' - // }) - // } - // if (!preliminaryDesignDescription.value) { - // return ElMessage({ - // message: '请上传项目初步设计说明书', - // type: 'warning' - // }) - // } - if (!predictionEvaluationReport.value) { - return ElMessage({ - message: '请上传预测评估报告', - type: 'warning' - }) - } - if (!predictionEvaluationReviewOpinions.value) { - return ElMessage({ - message: '请上传预测评估评审意见报告', - type: 'warning' - }) - } - if (!substationMainWiringDiagram.value) { - return ElMessage({ - message: '请上传用户接入变电站主接线示意图', - type: 'warning' - }) - } - if (!sensitiveDevices.value) { - return ElMessage({ - message: '请上传主要敏感终端清单', - type: 'warning' - }) - } - if (!antiInterferenceReport.value) { - return ElMessage({ - message: '请上传抗扰度测试报告', - type: 'warning' - }) - } - if (!powerQualityReport.value) { - return ElMessage({ - message: '请上传背景电能质量测试报告', - type: 'warning' - }) - } - //其他附件非必填 - else { - confirmFormData.userReportSensitivePO = { - ...confirmFormData.userReportSensitivePO, - feasibilityReport: feasibilityReport.value, //可研报告 - preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址 - predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址 - predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址 - additionalAttachments: additionalAttachments.value, //其他附件告地址 - substationMainWiringDiagram: substationMainWiringDiagram.value, //用户接入变电站主接线示意图地址 - sensitiveDevices: sensitiveDevices.value, //主要敏感终端清单 - antiInterferenceReport: antiInterferenceReport.value, //抗扰度测试报告 - powerQualityReport: powerQualityReport.value //背景电能质量测试报告 - } - } - } - if (title.value == '用户档案录入') { - submitFormData(confirmFormData).then(res => { - if (res.code == 'A0000') { - ElMessage({ - message: '新增成功', - type: 'success' - }) - ruleFormRef.value.resetFields() - resetForm() - close() - } - }) } else { - console.log(confirmFormData) - confirmFormData.id = resendId.value - updateFormData(confirmFormData).then(res => { - if (res.code == 'A0000') { - ElMessage({ - message: '重新发起成功', - type: 'success' - }) - ruleFormRef.value.resetFields() - resetForm() - close() - } - }) + console.log('表单验证失败') + return false } - } else { - console.log('表单验证失败') - return false - } - }) + }) + } } defineExpose({ open }) diff --git a/src/views/pqs/supervise/interfere/components/undocumented/index.vue b/src/views/pqs/supervise/interfere/components/undocumented/index.vue index bfda06f1..53f4b9da 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/index.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/index.vue @@ -120,12 +120,14 @@ const tableStore = new TableStore({ minWidth: 100, render: 'tag', custom: { + 0: 'warning', 1: 'primary', 2: 'success', 3: 'danger', 4: 'warning' }, replaceValue: { + 0: '待提交审批', 1: '审批中', 2: '审批通过', 3: '审批不通过', @@ -158,6 +160,22 @@ const tableStore = new TableStore({ handleAudit(row.processInstanceId, row.historyInstanceId) } }, + { + name: 'edit', + title: '编辑', + type: 'primary', + icon: 'el-icon-Open', + render: 'basicButton', + disabled: row => { + return row.createBy != adminInfo.$state.id || !(row.status == 0 ) + }, + click: row => { + addForms.value.open({ + title: '编辑', + row: row + }) + } + }, { name: 'edit', title: '重新发起',