diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 176c99b9..df084c65 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -1,5 +1,14 @@
 <template>
-    <el-dialog v-model="dialogFormVisible" title="用户档案录入" width="80%" height="400" :append-to-body="true">
+    <el-dialog
+        v-model="dialogFormVisible"
+        title="用户档案录入"
+        width="55%"
+        height="400"
+        :append-to-body="true"
+        :validate-on-rule-change="false"
+        :scroll-to-error="true"
+        @closed="close"
+    >
         <!-- 用户档案录入 新建1 -->
         <el-form :model="form" :rules="rules" ref="ruleFormRef">
             <el-row>
@@ -54,7 +63,7 @@
             <el-row>
                 <el-col :span="12">
                     <el-form-item label="用户性质：" :label-width="formLabelWidth" prop="userType">
-                        <el-select v-model="form.userType" placeholder="请选择用户性质">
+                        <el-select v-model="form.userType" placeholder="请选择用户性质" @change="changeUserType()">
                             <el-option
                                 v-for="(item, index) in userTypeList"
                                 :label="item.label"
@@ -76,7 +85,7 @@
                                 v-for="item in areaOptionList"
                                 :key="item.id"
                                 :label="item.name"
-                                :value="item.id"
+                                :value="item.name"
                             ></el-option>
                         </el-select>
                     </el-form-item>
@@ -153,14 +162,7 @@
                         class="label_over_warp"
                         prop="nonlinearDeviceType"
                     >
-                        <!-- <el-select
-                            v-model="form.nonlinearDeviceType"
-                            placeholder="请选择非线性设备类型"
-                            :disabled="openType == 'detail'"
-                        >
-                            <el-option v-for="(item,index) in nonlinearDeviceTypeList" :label="name" :value="item.id" :key="index"/>
-                        </el-select> -->
-                        <el-tree
+                        <!-- <el-tree
                             accordion
                             ref="treeRef"
                             :default-expand-all="false"
@@ -173,7 +175,22 @@
                             :data="nonlinearDeviceTypeList"
                             :expand-on-click-node="false"
                             @check-change="handleCheckChange"
-                        ></el-tree>
+                        ></el-tree> -->
+                        <el-tree-select
+                            accordion
+                            ref="treeRef"
+                            :default-expand-all="false"
+                            show-checkbox
+                            check-strictly
+                            :highlight-current="true"
+                            readonly
+                            node-key="id"
+                            :props="defaultProps"
+                            v-model="form.nonlinearDeviceType"
+                            :data="nonlinearDeviceTypeList"
+                            :render-after-expand="false"
+                            style="width: 240px"
+                        />
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -453,7 +470,8 @@
                         />
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position">
+                    <span class="required_icon">*</span>
                     <el-form-item label="可研报告：" prop="feasibilityReport" :label-width="formLabelWidth">
                         <el-upload
                             v-model:file-list="form.feasibilityReport"
@@ -474,7 +492,8 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position">
+                    <span class="required_icon">*</span>
                     <el-form-item
                         label="项目初步设计说明书："
                         prop="preliminaryDesignDescription"
@@ -498,7 +517,8 @@
                         </el-upload>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position">
+                    <span class="required_icon">*</span>
                     <el-form-item
                         label="预测评估报告："
                         prop="predictionEvaluationReport"
@@ -523,7 +543,8 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position">
+                    <span class="required_icon">*</span>
                     <el-form-item
                         label="预测评估评审意见报告："
                         prop="predictionEvaluationReviewOpinions"
@@ -547,7 +568,8 @@
                         </el-upload>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position">
+                    <span class="required_icon" style="color: #fff">*</span>
                     <el-form-item label="其他附件：" prop="additionalAttachments" :label-width="formLabelWidth">
                         <el-upload
                             v-model:file-list="form.additionalAttachments"
@@ -568,10 +590,10 @@
                 </el-col>
             </el-row>
             <el-row>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position" v-show="form.userType != '0' && form.userType != '1'">
+                    <span class="required_icon">*</span>
                     <el-form-item
-                        v-if="form.userType != '0' && form.userType != '1'"
-                        label="用户接入变电站主接线示意图"
+                        label="用户接入变电站主接线示意图："
                         :label-width="formLabelWidth"
                         class="label_over_warp"
                         prop="substationMainWiringDiagram"
@@ -593,9 +615,9 @@
                         </el-upload>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position" v-show="form.userType == '6'">
+                    <span class="required_icon">*</span>
                     <el-form-item
-                        v-if="form.userType == '6'"
                         label="主要敏感设备清单："
                         :label-width="formLabelWidth"
                         class="label_over_warp"
@@ -619,7 +641,8 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row v-if="form.userType == '6'">
+            <el-row v-show="form.userType == '6'" class="required_position">
+                <span class="required_icon">*</span>
                 <el-col :span="12">
                     <el-form-item
                         label="抗扰度测试报告："
@@ -644,7 +667,8 @@
                         </el-upload>
                     </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <el-col :span="12" class="required_position">
+                    <span class="required_icon">*</span>
                     <el-form-item
                         label="背景电能质量测试报告："
                         prop="powerQualityReport"
@@ -679,7 +703,7 @@
     </el-dialog>
 </template>
 <script lang="ts" setup>
-import { ref, onMounted, reactive, defineExpose, defineProps, watch } from 'vue'
+import { ref, onMounted, reactive, defineExpose, defineProps, defineEmits, watch } from 'vue'
 // import { upload, insertTerminal, updateTerminal } from '@/api/process-boot/terminal'
 import type { UploadInstance, UploadProps, UploadRawFile } from 'element-plus'
 import { genFileId, ElMessage } from 'element-plus'
@@ -689,13 +713,14 @@ import moment from 'moment'
 import { queryByAllCode } from '@/api/system-boot/dictTree'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { uploadFile } from '@/api/system-boot/file'
-import { submitFormData } from '@/api/supervise/interfere/index.ts'
-// defineProps({
-//     openType: {
-//         type: String,
-//         default: 'create'
-//     }
-// })
+import { submitFormData } from '@/api/supervise/interfere/index'
+defineProps({
+    openType: {
+        type: String,
+        default: 'create'
+    }
+})
+const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogFormVisible = ref(false)
 const formLabelWidth = '120px'
@@ -713,12 +738,117 @@ const voltageLevelList = dictData.getBasicData('Dev_Voltage_Stand')
 const evaluationTypeList = dictData.getBasicData('Evaluation_Type')
 //字典预测评估单位
 const evaluationDeptList = dictData.getBasicData('evaluation_dept')
+
+//用户性质数组
+const userTypeList = reactive([
+    {
+        label: '新建电网工程',
+        value: '0'
+    },
+    {
+        label: '扩建电网工程',
+        value: '1'
+    },
+    {
+        label: '新建非线性负荷用户',
+        value: '2'
+    },
+    {
+        label: '扩建非线性负荷用户',
+        value: '3'
+    },
+    {
+        label: '新建新能源发电站',
+        value: '4'
+    },
+    {
+        label: '扩建新能源发电站',
+        value: '5'
+    },
+    {
+        label: '敏感及重要用户',
+        value: '6'
+    }
+])
+//用户状态数组
+const userStateList = reactive([
+    {
+        label: '可研',
+        value: '0'
+    },
+    {
+        label: '建设',
+        value: '1'
+    },
+    {
+        label: '运行',
+        value: '2'
+    },
+    {
+        label: '退运',
+        value: '3'
+    }
+])
 //获取非线性设备类型树形下拉
 const defaultProps = {
     children: 'children',
-    label: 'name'
+    label: 'name',
+    key: 'id'
 }
 const nonlinearDeviceTypeList = ref('')
+//获取登陆用户姓名和部门
+const adminInfo = useAdminInfo()
+console.log(adminInfo.$state, '打印登陆用户新信息')
+const resetForm = () => {
+    form.value = {
+        reporter: '', //填报人  1
+        reportDate: new Date(), //填报日期  1
+        orgId: '', //填报部门  1
+        expectedProductionDate: '', //工程预期投产日期 1
+        userType: '0', //用户性质 1
+        city: areaOptionList[0].name, //所属地市 1
+        responsibleDepartment: '', //归口管理部门 1
+        userStatus: userStateList[0].value, //用户状态 1
+        projectName: '', //工程名称 1
+        substation: '', //变电站 1
+        voltageLevel: voltageLevelList[0].id, //电压等级 1
+        evaluationDept: evaluationDeptList[0].id, //预测评估单位 1
+        evaluationConclusion: '', //预测评估结论 1
+        backgroundTestPerformed: 0, //是否开展背景测试 1
+        feasibilityReport: '', // 可研报告告地址  1
+        preliminaryDesignDescription: '', //项目初步设计说明书告地址 1
+        predictionEvaluationReport: '', //预测评估报告地址 1
+        predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址 1
+        additionalAttachments: '', //其他附件告地址 1
+        state: '', //数据状态
+        pccPoint: '', //PCC点 1
+        evaluationType: evaluationTypeList[0].id, //评估类型 1
+        evaluationChekDept: '', //预测评估审单位  1
+        substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址  1
+        powerQualityReport: '', //背景电能质量测试报告 1
+        minShortCircuitCapacity: '', //系统最小短路容量（MVA） 1
+        userAgreementCapacity: '', //用户用电协议容量（MVA） 1
+        needGovernance: 0, //是否需要治理 1
+        agreementCapacity: '', //用户协议容量  1
+        nonlinearDeviceType: '', //非线性设备类型 1
+        nonlinearLoadType: '', //非线性负荷类型 1
+        pccEquipmentCapacity: '', // PCC供电设备容量（MVA） 1
+        baseShortCircuitCapacity: '', //基准短路容量（MVA）1
+        industry: industryList[0].id, //行业 1
+        deviceName: '', //敏感装置名称  1
+        powerSupplyCount: 0, //供电电源数量 1
+        energyQualityIndex: energyQualityIndexList[0].id, //敏感电能质量指标 1
+        antiInterferenceTest: 0, //是否开展抗扰度测试 1
+        sensitiveDevices: '', //主要敏感设备清单 1
+        antiInterferenceReport: '' //抗扰度测试报告 1
+    }
+
+    form.value.reporter = adminInfo.$state.name
+    form.value.orgId = adminInfo.$state.deptName
+}
+//初始化数据
+resetForm()
+//获取树形图数据
 const getTreeList = () => {
     queryByAllCode().then(res => {
         nonlinearDeviceTypeList.value = [res.data.find(item => item.code == 'Major_Nonlinear_Device')]
@@ -737,84 +867,24 @@ const getTreeList = () => {
         })
     })
 }
+getTreeList()
 const treeRef = ref()
+//选中树形节点变化事件
 const handleCheckChange = data => {
     const checkedNodes = treeRef.value.getCheckedKeys()
     if (checkedNodes.length > 1) {
         checkedNodes.map((item, index) => {
-            // if (index == checkedNodes.length - 1) {
-            //     treeRef.value.setCheckedKeys(item, true)
-            // } else {
-            //     treeRef.value.setCheckedKeys(item, false)
-            // }
+            if (index == checkedNodes.length - 1) {
+                treeRef.value.setChecked(checkedNodes[index], true)
+            } else {
+                treeRef.value.setChecked(checkedNodes[index], false)
+            }
         })
         form.value.nonlinearDeviceType = checkedNodes[checkedNodes.length - 1]
     } else if (checkedNodes.length == 1) {
         form.value.nonlinearDeviceType = checkedNodes[0]
     }
 }
-getTreeList()
-//获取登陆用户姓名和部门
-const adminInfo = useAdminInfo()
-console.log(adminInfo.$state, '打印登陆用户新信息')
-const resetForm = () => {
-    form.value = {
-        reporter: '', //填报人
-        reportDate: new Date(), //填报日期
-        orgId: '', //填报部门
-        expectedProductionDate: '', //工程预期投产日期
-        userType: '0', //用户性质
-        city: '', //所属地市
-        responsibleDepartment: '', //归口管理部门
-        userStatus: '', //用户状态
-        projectName: '', //工程名称
-        substation: '', //变电站
-        voltageLevel: '', //电压等级
-        evaluationDept: '', //预测评估单位
-        evaluationConclusion: '', //预测评估结论
-        backgroundTestPerformed: '', //是否开展背景测试
-        feasibilityReport: '', // 可研报告告地址
-        preliminaryDesignDescription: '', //项目初步设计说明书告地址
-        predictionEvaluationReport: '', //预测评估报告告地址
-        predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-        additionalAttachments: '', //其他附件告地址
-        state: '', //数据状态
-        pccPoint: '', //PCC点
-        evaluationType: '', //评估类型
-        evaluationChekDept: '', //预测评估审单位
-        substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
-        powerQualityReport: '', //背景电能质量测试报告
-        minShortCircuitCapacity: '', //系统最小短路容量（MVA）
-        userAgreementCapacity: '', //用户用电协议容量（MVA）
-        needGovernance: '', //是否需要治理
-        //userType=='0' '1'
-        // userReportProjectPO: {
-        agreementCapacity: '', //用户协议容量
-        nonlinearDeviceType: '', //非线性设备类型
-        // },
-        //userType=='2' '3' '4' '5'
-        // userReportSensitivePO: {
-        nonlinearLoadType: '', //非线性负荷类型
-        pccEquipmentCapacity: '', // PCC供电设备容量（MVA）
-        baseShortCircuitCapacity: '', //基准短路容量（MVA）
-        // },
-        //userType=='6'
-        // userReportSubstationPO: {
-        industry: '', //行业
-        deviceName: '', //敏感装置名称
-        powerSupplyCount: 0, //供电电源数量
-        energyQualityIndex: '', //敏感电能质量指标
-        antiInterferenceTest: '', //是否开展抗扰度测试
-        sensitiveDevices: '', //主要敏感设备清单
-        antiInterferenceReport: '' //抗扰度测试报告
-        // }
-    }
-
-    form.value.reporter = adminInfo.$state.name
-    form.value.orgId = adminInfo.$state.deptName
-}
-//初始化数据
-resetForm()
 const subForm = ref({
     city: '', //所属地市
     evaluationConclusion: '', //预测评估结论
@@ -827,8 +897,8 @@ const subForm = ref({
     responsibleDepartment: '', //归口管理部门
     substation: '', ////变电站
     userStatus: '0', //用户状态
-    userType: '0',//用户性质
-    voltageLevel: "",
+    userType: '0', //用户性质
+    voltageLevel: '',
     //userType=='0' '1'
     userReportProjectPO: {
         additionalAttachments: '', //其他附件告地址
@@ -889,112 +959,9 @@ const subForm = ref({
         substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
     }
 })
-watch(
-    () => form.value,
-    (val, oldVal) => {
-        for (let key in val) {
-            if (subForm.value.hasOwnProperty(key)) {
-                subForm.value[key] = val[key] // 对相同的key进行赋值
-            }
-        }
-        //处理填报日期时间格式
-        subForm.value.reportDate = moment(form.value.reportDate).format('YYYY-MM-DD')
-        //userType==0,1
-        if (val.userType == '0' || val.userType == '1') {
-            subForm.value.userReportProjectPO = {
-                additionalAttachments: '', //其他附件告地址
-                agreementCapacity: 0,
-                backgroundTestPerformed: 0,
-                feasibilityReport: '', //可研报告
-                id: '',
-                needGovernance: 0,
-                nonlinearDeviceType: '',
-                predictionEvaluationReport: '', //预测评估报告告地址
-                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-                preliminaryDesignDescription: '', //项目初步设计说明书告地址
-                state: 0
-            }
-            for (let key in val) {
-                if (subForm.value.userReportProjectPO.hasOwnProperty(key)) {
-                    // 对相同的key进行赋值
-                    subForm.value.userReportProjectPO[key] = val[key]
-                }
-            }
-            delete subForm.value.userReportSubstationPO
-            delete subForm.value.userReportSensitivePO
-        }
-        //userType==2,3,4,5
-        if (val.userType == '2' || val.userType == '3' || val.userType == '4' || val.userType == '5') {
-            subForm.value.userReportSubstationPO = {
-                additionalAttachments: '', //其他附件告地址
-                backgroundTestPerformed: 0,
-                baseShortCircuitCapacity: 0,
-                evaluationChekDept: '',
-                evaluationType: '',
-                feasibilityReport: '', //可研报告
-                id: '',
-                minShortCircuitCapacity: 0,
-                needGovernance: 0,
-                nonlinearLoadType: '',
-                pccEquipmentCapacity: 0,
-                pccPoint: '',
-                predictionEvaluationReport: '', //预测评估报告告地址
-                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-                preliminaryDesignDescription: '', //项目初步设计说明书告地址
-                state: 0,
-                substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
-                userAgreementCapacity: 0
-            }
-            for (let key in val) {
-                if (subForm.value.userReportSensitivePO.hasOwnProperty(key)) {
-                    // 对相同的key进行赋值
-                    subForm.value.userReportSensitivePO[key] = val[key]
-                }
-            }
-            delete subForm.value.userReportProjectPO
-            delete subForm.value.userReportSensitivePO
-        }
-        //userType==6
-        if (val.userType == '6') {
-            subForm.value.userReportSensitivePO = {
-                additionalAttachments: '', //其他附件告地址
-                antiInterferenceReport: '', //抗扰度测试报告
-                antiInterferenceTest: '',
-                backgroundTestPerformed: 0,
-                deviceName: '',
-                energyQualityIndex: '',
-                evaluationChekDept: '',
-                evaluationType: '',
-                feasibilityReport: '', //可研报告告地址
-                id: '',
-                industry: '',
-                needGovernance: 0,
-                pccPoint: '',
-                powerQualityReport: '', //背景电能质量测试报告
-                powerSupplyCount: 0,
-                predictionEvaluationReport: '', //预测评估报告告地址
-                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-                preliminaryDesignDescription: '', //项目初步设计说明书告地址
-                sensitiveDevices: '', //主要敏感设备清单
-                state: 0,
-                substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
-            }
-            for (let key in val) {
-                if (subForm.value.userReportSubstationPO.hasOwnProperty(key)) {
-                    // 对相同的key进行赋值
-                    subForm.value.userReportSubstationPO[key] = val[key]
-                }
-            }
-            delete subForm.value.userReportProjectPO
-            delete subForm.value.userReportSubstationPO
-        }
-    },
-    {
-        deep: true
-    }
-)
+
 //定义校验规则
-const rules = reactive({
+const rules = ref({
     reporter: [
         {
             required: true,
@@ -1114,41 +1081,6 @@ const rules = reactive({
             trigger: 'change'
         }
     ],
-    feasibilityReport: [
-        {
-            required: true,
-            message: '请上传可研报告',
-            trigger: 'blur'
-        }
-    ],
-    preliminaryDesignDescription: [
-        {
-            required: true,
-            message: '请上传项目初步设计说明书',
-            trigger: 'blur'
-        }
-    ],
-    predictionEvaluationReport: [
-        {
-            required: true,
-            message: '请上传预测评估报告',
-            trigger: 'blur'
-        }
-    ],
-    predictionEvaluationReviewOpinions: [
-        {
-            required: true,
-            message: '请上传预测评估评审意见报告',
-            trigger: 'blur'
-        }
-    ],
-    additionalAttachments: [
-        {
-            required: false,
-            message: '请上传其他附件',
-            trigger: 'blur'
-        }
-    ],
     state: [
         {
             required: true,
@@ -1212,34 +1144,7 @@ const rules = reactive({
             trigger: 'blur'
         }
     ],
-    substationMainWiringDiagram: [
-        {
-            required: true,
-            message: '请上传用户接入变电站主接线示意图',
-            trigger: 'change'
-        }
-    ],
-    sensitiveDevices: [
-        {
-            required: true,
-            message: '请上传主要敏感设备清单',
-            trigger: 'change'
-        }
-    ],
-    antiInterferenceReport: [
-        {
-            required: true,
-            message: '请上传抗扰度测试报告',
-            trigger: 'change'
-        }
-    ],
-    powerQualityReport: [
-        {
-            required: true,
-            message: '请上传背景电能质量测试报告',
-            trigger: 'change'
-        }
-    ],
+
     baseShortCircuitCapacity: [
         {
             required: true,
@@ -1274,58 +1179,211 @@ const rules = reactive({
             message: '请输入非线性负荷类型',
             trigger: 'blur'
         }
+    ],
+    //先取消必填，提交时候校验
+    substationMainWiringDiagram: [
+        {
+            required: false,
+            message: '请上传用户接入变电站主接线示意图',
+            trigger: 'change'
+        }
+    ],
+    //先取消必填，提交时候校验
+    sensitiveDevices: [
+        {
+            required: false,
+            message: '请上传主要敏感设备清单',
+            trigger: 'change'
+        }
+    ],
+    //先取消必填，提交时候校验
+    antiInterferenceReport: [
+        {
+            required: false,
+            message: '请上传抗扰度测试报告',
+            trigger: 'change'
+        }
+    ],
+    //先取消必填，提交时候校验
+    powerQualityReport: [
+        {
+            required: false,
+            message: '请上传背景电能质量测试报告',
+            trigger: 'change'
+        }
+    ],
+
+    //先取消必填，提交时候校验
+    feasibilityReport: [
+        {
+            required: false,
+            message: '请上传可研报告',
+            trigger: 'blur'
+        }
+    ],
+    //先取消必填，提交时候校验
+    preliminaryDesignDescription: [
+        {
+            required: false,
+            message: '请上传项目初步设计说明书',
+            trigger: 'blur'
+        }
+    ],
+    //先取消必填，提交时候校验
+    predictionEvaluationReport: [
+        {
+            required: false,
+            message: '请上传预测评估报告',
+            trigger: 'blur'
+        }
+    ],
+    //先取消必填，提交时候校验
+    predictionEvaluationReviewOpinions: [
+        {
+            required: false,
+            message: '请上传预测评估评审意见报告',
+            trigger: 'blur'
+        }
+    ],
+    //先取消必填，提交时候校验
+    additionalAttachments: [
+        {
+            required: false,
+            message: '请上传其他附件',
+            trigger: 'blur'
+        }
     ]
 })
-//用户性质数组
-const userTypeList = reactive([
-    {
-        label: '新建电网工程',
-        value: '0'
+watch(
+    () => form.value,
+    (val, oldVal) => {
+        for (let key in val) {
+            if (subForm.value.hasOwnProperty(key)) {
+                subForm.value[key] = val[key] // 对相同的key进行赋值
+            }
+        }
+        //处理填报日期时间格式
+        subForm.value.reportDate = moment(form.value.reportDate).format('YYYY-MM-DD')
+        //userType==0,1
+        if (val.userType == '0' || val.userType == '1') {
+            subForm.value.userReportProjectPO = {
+                additionalAttachments: '', //其他附件告地址
+                agreementCapacity: 0,
+                backgroundTestPerformed: 0,
+                feasibilityReport: '', //可研报告
+                id: '',
+                needGovernance: 0,
+                nonlinearDeviceType: '',
+                predictionEvaluationReport: '', //预测评估报告告地址
+                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+                preliminaryDesignDescription: '', //项目初步设计说明书告地址
+                state: 0
+            }
+            for (let key in val) {
+                if (subForm.value.userReportProjectPO && subForm.value.userReportProjectPO.hasOwnProperty(key)) {
+                    // 对相同的key进行赋值
+                    subForm.value.userReportProjectPO[key] = val[key]
+                }
+            }
+
+            delete subForm.value.userReportSubstationPO
+            delete subForm.value.userReportSensitivePO
+
+            return
+            //userType==6时必填
+            rules.value.sensitiveDevices[0].required = false //主要敏感设备清单：
+            rules.value.antiInterferenceReport[0].required = false //抗扰度测试报告：
+            rules.value.powerQualityReport[0].required = false //背景电能质量测试报告：
+            //userType==2,3,4,5,6时必填
+            rules.value.substationMainWiringDiagram[0].required = false //用户接入变电站主接线示意图
+            console.log(subForm.value, 'userType111111111111111111')
+        }
+        //userType==2,3,4,5
+        if (val.userType == '2' || val.userType == '3' || val.userType == '4' || val.userType == '5') {
+            subForm.value.userReportSubstationPO = {
+                additionalAttachments: '', //其他附件告地址
+                backgroundTestPerformed: 0,
+                baseShortCircuitCapacity: 0,
+                evaluationChekDept: '',
+                evaluationType: '',
+                feasibilityReport: '', //可研报告
+                id: '',
+                minShortCircuitCapacity: 0,
+                needGovernance: 0,
+                nonlinearLoadType: '',
+                pccEquipmentCapacity: 0,
+                pccPoint: '',
+                predictionEvaluationReport: '', //预测评估报告告地址
+                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+                preliminaryDesignDescription: '', //项目初步设计说明书告地址
+                state: 0,
+                substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
+                userAgreementCapacity: 0
+            }
+            for (let key in val) {
+                if (subForm.value.userReportSubstationPO && subForm.value.userReportSubstationPO.hasOwnProperty(key)) {
+                    // 对相同的key进行赋值
+                    subForm.value.userReportSubstationPO[key] = val[key]
+                }
+            }
+            delete subForm.value.userReportProjectPO
+            delete subForm.value.userReportSensitivePO
+            return
+            //userType==6时必填
+            rules.value.sensitiveDevices[0].required = false //主要敏感设备清单：
+            rules.value.antiInterferenceReport[0].required = false //抗扰度测试报告：
+            rules.value.powerQualityReport[0].required = false //背景电能质量测试报告：
+            //userType==2,3,4,5,6时必填
+            rules.value.substationMainWiringDiagram[0].required = true //用户接入变电站主接线示意图
+            console.log(subForm.value, 'userType222222222222')
+        }
+        //userType==6
+        if (val.userType == '6') {
+            subForm.value.userReportSensitivePO = {
+                additionalAttachments: '', //其他附件告地址
+                antiInterferenceReport: '', //抗扰度测试报告
+                antiInterferenceTest: '',
+                backgroundTestPerformed: 0,
+                deviceName: '',
+                energyQualityIndex: '',
+                evaluationChekDept: '',
+                evaluationType: '',
+                feasibilityReport: '', //可研报告告地址
+                id: '',
+                industry: '',
+                needGovernance: 0,
+                pccPoint: '',
+                powerQualityReport: '', //背景电能质量测试报告
+                powerSupplyCount: 0,
+                predictionEvaluationReport: '', //预测评估报告告地址
+                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+                preliminaryDesignDescription: '', //项目初步设计说明书告地址
+                sensitiveDevices: '', //主要敏感设备清单
+                state: 0,
+                substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
+            }
+            for (let key in val) {
+                if (subForm.value.userReportSensitivePO && subForm.value.userReportSensitivePO.hasOwnProperty(key)) {
+                    // 对相同的key进行赋值
+                    subForm.value.userReportSensitivePO[key] = val[key]
+                }
+            }
+            delete subForm.value.userReportProjectPO
+            delete subForm.value.userReportSubstationPO
+            return
+            //userType==6时必填
+            rules.value.sensitiveDevices[0].required = true //主要敏感设备清单：
+            rules.value.antiInterferenceReport[0].required = true //抗扰度测试报告：
+            rules.value.powerQualityReport[0].required = true //背景电能质量测试报告：
+            //userType==2,3,4,5,6时必填
+            rules.value.substationMainWiringDiagram[0].required = true //用户接入变电站主接线示意图
+            console.log(subForm.value, '3333333333333333')
+        }
     },
     {
-        label: '扩建电网工程',
-        value: '1'
-    },
-    {
-        label: '新建非线性负荷用户',
-        value: '2'
-    },
-    {
-        label: '扩建非线性负荷用户',
-        value: '3'
-    },
-    {
-        label: '新建新能源发电站',
-        value: '4'
-    },
-    {
-        label: '扩建新能源发电站',
-        value: '5'
-    },
-    {
-        label: '敏感及重要用户',
-        value: '6'
+        deep: true
     }
-])
-//用户状态数组
-const userStateList = reactive([
-    {
-        label: '可研',
-        value: '0'
-    },
-    {
-        label: '建设',
-        value: '1'
-    },
-    {
-        label: '运行',
-        value: '2'
-    },
-    {
-        label: '退运',
-        value: '3'
-    }
-])
+)
 const open = () => {
     dialogFormVisible.value = true
 }
@@ -1335,10 +1393,143 @@ const close = () => {
     //取消表单校验状态
     ruleFormRef.value.resetFields()
     dialogFormVisible.value = false
+    emits('onSubmit')
 }
 onMounted(() => {
     console.log()
 })
+const changeUserType = value => {
+    console.log(form.value.userType, '切换用户性质++++++++++++', value)
+    return
+    // nextTick(() => {
+    //     // 清除校验效果
+    //     ruleFormRef.value.resetFields()
+    // })
+    for (let key in form.value) {
+        if (subForm.value.hasOwnProperty(key)) {
+            subForm.value[key] = form.value[key] // 对相同的key进行赋值
+        }
+    }
+    //处理填报日期时间格式
+    subForm.value.reportDate = moment(form.value.reportDate).format('YYYY-MM-DD')
+    //userType==0,1
+    if (form.value.userType == '0' || form.value.userType == '1') {
+        subForm.value.userReportProjectPO = {
+            additionalAttachments: '', //其他附件告地址
+            agreementCapacity: 0,
+            backgroundTestPerformed: 0,
+            feasibilityReport: '', //可研报告
+            id: '',
+            needGovernance: 0,
+            nonlinearDeviceType: '',
+            predictionEvaluationReport: '', //预测评估报告告地址
+            predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+            preliminaryDesignDescription: '', //项目初步设计说明书告地址
+            state: 0
+        }
+        for (let key in form.value) {
+            if (subForm.value.userReportProjectPO && subForm.value.userReportProjectPO.hasOwnProperty(key)) {
+                // 对相同的key进行赋值
+                subForm.value.userReportProjectPO[key] = form.value[key]
+            }
+        }
+
+        delete subForm.value.userReportSubstationPO
+        delete subForm.value.userReportSensitivePO
+
+        //userType==6时必填
+        // rules.value.sensitiveDevices[0].required = false //主要敏感设备清单：
+        // rules.value.antiInterferenceReport[0].required = false //抗扰度测试报告：
+        // rules.value.powerQualityReport[0].required = false //背景电能质量测试报告：
+        // //userType==2,3,4,5,6时必填
+        // rules.value.substationMainWiringDiagram[0].required = false //用户接入变电站主接线示意图
+        // console.log(subForm.value, 'userType111111111111111111')
+    }
+    //userType==2,3,4,5
+    if (
+        form.value.userType == '2' ||
+        form.value.userType == '3' ||
+        form.value.userType == '4' ||
+        form.value.userType == '5'
+    ) {
+        subForm.value.userReportSubstationPO = {
+            additionalAttachments: '', //其他附件告地址
+            backgroundTestPerformed: 0,
+            baseShortCircuitCapacity: 0,
+            evaluationChekDept: '',
+            evaluationType: '',
+            feasibilityReport: '', //可研报告
+            id: '',
+            minShortCircuitCapacity: 0,
+            needGovernance: 0,
+            nonlinearLoadType: '',
+            pccEquipmentCapacity: 0,
+            pccPoint: '',
+            predictionEvaluationReport: '', //预测评估报告告地址
+            predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+            preliminaryDesignDescription: '', //项目初步设计说明书告地址
+            state: 0,
+            substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
+            userAgreementCapacity: 0
+        }
+        for (let key in form.value) {
+            if (subForm.value.userReportSubstationPO && subForm.value.userReportSubstationPO.hasOwnProperty(key)) {
+                // 对相同的key进行赋值
+                subForm.value.userReportSubstationPO[key] = form.value[key]
+            }
+        }
+        delete subForm.value.userReportProjectPO
+        delete subForm.value.userReportSensitivePO
+        //userType==6时必填
+        // rules.value.sensitiveDevices[0].required = false //主要敏感设备清单：
+        // rules.value.antiInterferenceReport[0].required = false //抗扰度测试报告：
+        // rules.value.powerQualityReport[0].required = false //背景电能质量测试报告：
+        // //userType==2,3,4,5,6时必填
+        // rules.value.substationMainWiringDiagram[0].required = true //用户接入变电站主接线示意图
+        console.log(subForm.value, 'userType222222222222')
+    }
+    //userType==6
+    if (form.value.userType == '6') {
+        subForm.value.userReportSensitivePO = {
+            additionalAttachments: '', //其他附件告地址
+            antiInterferenceReport: '', //抗扰度测试报告
+            antiInterferenceTest: '',
+            backgroundTestPerformed: 0,
+            deviceName: '',
+            energyQualityIndex: '',
+            evaluationChekDept: '',
+            evaluationType: '',
+            feasibilityReport: '', //可研报告告地址
+            id: '',
+            industry: '',
+            needGovernance: 0,
+            pccPoint: '',
+            powerQualityReport: '', //背景电能质量测试报告
+            powerSupplyCount: 0,
+            predictionEvaluationReport: '', //预测评估报告告地址
+            predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
+            preliminaryDesignDescription: '', //项目初步设计说明书告地址
+            sensitiveDevices: '', //主要敏感设备清单
+            state: 0,
+            substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
+        }
+        for (let key in form.value) {
+            if (subForm.value.userReportSensitivePO && subForm.value.userReportSensitivePO.hasOwnProperty(key)) {
+                // 对相同的key进行赋值
+                subForm.value.userReportSensitivePO[key] = form.value[key]
+            }
+        }
+        delete subForm.value.userReportProjectPO
+        delete subForm.value.userReportSubstationPO
+        // //userType==6时必填
+        // rules.value.sensitiveDevices[0].required = true //主要敏感设备清单：
+        // rules.value.antiInterferenceReport[0].required = true //抗扰度测试报告：
+        // rules.value.powerQualityReport[0].required = true //背景电能质量测试报告：
+        // //userType==2,3,4,5,6时必填
+        // rules.value.substationMainWiringDiagram[0].required = true //用户接入变电站主接线示意图
+        console.log(subForm.value, '3333333333333333')
+    }
+}
 // 上传报告
 const uploadRef = ref()
 const handleExceed: UploadProps['onExceed'] = files => {
@@ -1417,63 +1608,181 @@ const disabledDate = time => {
 }
 //提交
 const confirmForm = () => {
+    console.log(adminInfo.$state, '=======')
     ruleFormRef.value.validate(valid => {
         if (valid) {
             //整理上传文件的数据
             // userType==0,1
-            form.value.reporter = adminInfo.$state.id
-            form.value.orgId = adminInfo.$state.deptName
             subForm.value.reporter = adminInfo.$state.id
+            subForm.value.orgId = adminInfo.$state.deptId
             let confirmFormData = JSON.parse(JSON.stringify(subForm.value))
-            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 //其他附件告地址
-               }
-            }else{
-                delete subForm.value.userReportProjectPO;
+            //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 //其他附件告地址
+                    }
+                }
             }
 
-            console.log(
-                feasibilityReport.value,
-                'feasibilityReport.value++++++++',
-                confirmFormData,
-            )
             //userType==2,3,4,5
-            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 //其他附件告地址
-               }
-            }else{
-                delete subForm.value.userReportProjectPO;
+            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
-             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 (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 (!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 //背景电能质量测试报告
+                    }
+                }
             }
-            console.log('提交的数据:',  confirmFormData)
-            return
-            submitFormData(subForm.value).then(res => {
+
+            submitFormData(confirmFormData).then(res => {
                 console.log(res, '打印提交结果2333=======>>>>>')
+                ruleFormRef.value.resetFields()
+                resetForm()
+                close()
             })
         } else {
             console.log('表单验证失败')
@@ -1483,7 +1792,7 @@ const confirmForm = () => {
 }
 defineExpose({ open })
 </script>
-<style lang="less" scoped>
+<style lang="scss" scoped>
 .el-form {
     width: 96%;
     height: 400px;
@@ -1521,4 +1830,20 @@ defineExpose({ open })
     top: 20% !important;
     left: 50% !important;
 }
+::v-deep .required_position {
+    position: relative;
+    .required_icon {
+        position: absolute;
+        // left: 20px;
+        margin-top: 8px;
+        color: #f56c6c;
+        margin-left: 20px;
+    }
+    .required_text {
+        // padding-left: 20px;
+    }
+    .el-form-item__label {
+        margin-left: 10px;
+    }
+}
 </style>