修改未建档用户档案录入管理草稿功能

src/views/pqs/supervise/interfere/components/undocumented/addForm.vue

@@ -508,7 +508,8 @@
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="close()">取消</el-button>
-                <el-button type="primary" @click="confirmForm()">确定</el-button>
+                <el-button type="primary" @click="confirmForm(true)">保存</el-button>
+                <el-button type="primary" @click="confirmForm(false)">提交审批</el-button>
             </div>
         </template>
     </el-dialog>
@@ -1079,199 +1080,272 @@ const disabledDate = time => {
     return false
 }
 //提交
-const confirmForm = () => {
+const confirmForm = (flag?: boolean) => {
-    ruleFormRef.value.validate((valid: any) => {
+    if (flag) {
-        if (valid) {
+        //整理上传文件的数据
-            //整理上传文件的数据
+        // userType==0,1
-            // userType==0,1
+        subForm.value.reporter = adminInfo.$state.id
-            subForm.value.reporter = adminInfo.$state.id
+        subForm.value.orgId = adminInfo.$state.deptId
-            subForm.value.orgId = adminInfo.$state.deptId
+        let confirmFormData = JSON.parse(JSON.stringify(subForm.value))
-            let confirmFormData = JSON.parse(JSON.stringify(subForm.value))
+        //1.判断是否上传
-            //1.判断是否上传
+        if (subForm.value.userType == '0' || subForm.value.userType == '1') {
-            if (subForm.value.userType == '0' || subForm.value.userType == '1') {
+            {
-                // if (!feasibilityReport.value) {
+                //其他报告非必填
-                //     return ElMessage({
+                confirmFormData.userReportProjectPO = {
-                //         message: '请上传可研报告',
+                    ...confirmFormData.userReportProjectPO,
-                //         type: 'warning'
+                    feasibilityReport: feasibilityReport.value, //可研报告
-                //     })
+                    preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址
-                // }
+                    predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址
-                // if (!preliminaryDesignDescription.value) {
+                    predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址
-                //     return ElMessage({
+                    additionalAttachments: additionalAttachments?.value //其他附件告地址
-                //         message: '请上传项目初步设计说明书',
-                //         type: 'warning'
-                //     })
-                // }
-                if (!predictionEvaluationReport.value) {
-                    return ElMessage({
-                        message: '请上传预测评估报告',
-                        type: 'warning'
-                    })
                 }
-                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 {
-                    //其他报告非必填
+                    console.log(confirmFormData)
-                    confirmFormData.userReportProjectPO = {
+                    confirmFormData.id = resendId.value
-                        ...confirmFormData.userReportProjectPO,
+
-                        feasibilityReport: feasibilityReport.value, //可研报告
+                    updateFormData(confirmFormData).then(res => {
-                        preliminaryDesignDescription: preliminaryDesignDescription.value, //项目初步设计说明书告地址
+                        if (res.code == 'A0000') {
-                        predictionEvaluationReport: predictionEvaluationReport.value, //预测评估报告告地址
+                            ElMessage({
-                        predictionEvaluationReviewOpinions: predictionEvaluationReviewOpinions.value, //预测评估评审意见报告地址
+                                message: '重新发起成功',
-                        additionalAttachments: additionalAttachments?.value //其他附件告地址
+                                type: 'success'
-                    }
+                            })
-                }
+                            ruleFormRef.value.resetFields()
-            }
+                            resetForm()
-            //userType==2,3,4,5
+                            close()
-            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 //背景电能质量测试报告
-                    }
-                }
-            }
-            if (title.value == '用户档案录入') {
-                submitFormData(confirmFormData).then(res => {
-                    if (res.code == 'A0000') {
-                        ElMessage({
-                            message: '新增成功',
-                            type: 'success'
-                        })
-                        ruleFormRef.value.resetFields()
-                        resetForm()
-                        close()
-                    }
-                })
             } else {
-                console.log(confirmFormData)
+                console.log('表单验证失败')
-                confirmFormData.id = resendId.value
+                return false
-                updateFormData(confirmFormData).then(res => {
-                    if (res.code == 'A0000') {
-                        ElMessage({
-                            message: '重新发起成功',
-                            type: 'success'
-                        })
-                        ruleFormRef.value.resetFields()
-                        resetForm()
-                        close()
-                    }
-                })
             }
-        } else {
+        })
-            console.log('表单验证失败')
+    }
-            return false
-        }
-    })
 }
 defineExpose({ open })
 </script>

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: '重新发起',