diff --git a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
index 1b1201ae..4e90b4ef 100644
--- a/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
+++ b/src/views/pqs/supervise/interfere/components/undocumented/addForm.vue
@@ -1,16 +1,17 @@
 <template>
     <el-dialog
        v-model="dialogFormVisible"
-        :close-on-click-modal="true"
         title="用户档案录入"
         width="55%"
         height="400"
         :append-to-body="true"
         :scroll-to-error="true"
         :before-close="close"
+        :close-on-click-modal="false"
+        draggable
     >
         <!-- 用户档案录入 新建1 -->
-        <el-form :model="form"  :validate-on-rule-change="false" :rules="rules" ref="ruleFormRef">
+     <el-form :model="form"  class=“form-two”  :validate-on-rule-change="false" :rules="rules" ref="ruleFormRef">
             <el-row>
                 <el-col :span="12">
                     <el-form-item label="填报人：" :label-width="formLabelWidth" prop="reporter">
@@ -142,7 +143,6 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <!-- 用户性质1独有 -->
             <el-row v-if="form.userType == '0' || form.userType == '1'">
                 <el-col :span="12">
                     <el-form-item label="用户协议容量：" :label-width="formLabelWidth" prop="agreementCapacity">
@@ -154,7 +154,6 @@
                         />
                     </el-form-item>
                 </el-col>
-                <!-- 用户性质1独有 -->
                 <el-col :span="12">
                     <el-form-item
                         label="非线性设备类型："
@@ -180,7 +179,6 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <!-- 字典 -->
             <el-row>
                 <el-col :span="12">
                     <el-form-item label="电压等级：" :label-width="formLabelWidth" prop="voltageLevel">
@@ -199,7 +197,6 @@
                         </el-select>
                     </el-form-item>
                 </el-col>
-                <!-- 字典 -->
                 <el-col :span="12">
                     <el-form-item label="预测评估单位：" :label-width="formLabelWidth" prop="evaluationDept">
                         <el-select
@@ -243,7 +240,6 @@
 
             <el-row v-if="form.userType != '0' && form.userType != '1'">
                 <el-col :span="12">
-                    <!-- 字典 -->
                     <el-form-item label="评估类型：" :label-width="formLabelWidth" prop="evaluationType">
                         <el-select
                             v-model="form.evaluationType"
@@ -360,7 +356,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row v-if="form.userType == '6'">
+           <el-row v-if="form.userType == '6'">
                 <el-col :span="12">
                     <el-form-item label="供电电源数量：" prop="powerSupplyCount" :label-width="formLabelWidth">
                         <el-input-number
@@ -399,21 +395,27 @@
                     :span="12"
                     v-if="form.userType == '2' || form.userType == '3' || form.userType == '4' || form.userType == '5'"
                 >
-                    <!-- 字典 -->
                     <el-form-item
                         label="非线性负荷类型："
                         prop="nonlinearLoadType"
                         :label-width="formLabelWidth"
                         class="label_over_warp"
                     >
-                        <el-select
+                        <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.nonlinearLoadType"
-                            placeholder="请选择非线性负荷类型"
-                            :disabled="openType == 'detail'"
-                        >
-                            <el-option label="Zone No.1" value="shanghai" />
-                            <el-option label="Zone No.2" value="beijing" />
-                        </el-select>
+                            :data="nonlinearDeviceTypeList"
+                            :render-after-expand="false"
+                            style="width: 240px"
+                        />
                     </el-form-item>
                 </el-col>
                 <el-col :span="12" v-if="form.userType == '6'">
@@ -456,7 +458,7 @@
                         />
                     </el-form-item>
                 </el-col>
-                <el-col :span="12" class="required_position">
+               <el-col :span="12" class="required_position">
                     <span class="required_icon">*</span>
                     <el-form-item label="可研报告：" prop="feasibilityReport" :label-width="formLabelWidth">
                         <el-upload
@@ -477,7 +479,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-row>
+          <el-row>
                 <el-col :span="12" class="required_position">
                     <span class="required_icon">*</span>
                     <el-form-item
@@ -679,7 +681,7 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-        </el-form>
+        </el-form> 
         <template #footer>
             <div class="dialog-footer">
                 <el-button @click="close()">取消</el-button>
@@ -710,7 +712,7 @@ const emits = defineEmits(['onSubmit'])
 const dictData = useDictData()
 const dialogFormVisible = ref(false)
 const formLabelWidth = '120px'
-const form = ref(null)
+const form:any = ref({})
 const ruleFormRef = ref(null)
 //字典获取所属地市
 const areaOptionList = dictData.getBasicData('jibei_area')
@@ -784,7 +786,6 @@ const defaultProps = {
 const nonlinearDeviceTypeList = ref('')
 //获取登陆用户姓名和部门
 const adminInfo = useAdminInfo()
-// console.log(adminInfo.$state, '打印登陆用户新信息')
 const resetForm = () => {
     form.value = {
         reporter: '', //填报人  1
@@ -801,17 +802,17 @@ const resetForm = () => {
         evaluationDept: evaluationDeptList[0].name, //预测评估单位 1
         evaluationConclusion: '', //预测评估结论 1
         backgroundTestPerformed: 0, //是否开展背景测试 1
-        feasibilityReport: '', // 可研报告告地址  1
-        preliminaryDesignDescription: '', //项目初步设计说明书告地址 1
-        predictionEvaluationReport: '', //预测评估报告地址 1
-        predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址 1
-        additionalAttachments: '', //其他附件告地址 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
+          substationMainWiringDiagram: [], //用户接入变电站主接线示意图地址  1
+         powerQualityReport: [], //背景电能质量测试报告 1
         minShortCircuitCapacity: '', //系统最小短路容量（MVA） 1
         userAgreementCapacity: '', //用户用电协议容量（MVA） 1
         needGovernance: 0, //是否需要治理 1
@@ -825,8 +826,8 @@ const resetForm = () => {
         powerSupplyCount: 0, //供电电源数量 1
         energyQualityIndex: energyQualityIndexList[0].id, //敏感电能质量指标 1
         antiInterferenceTest: 0, //是否开展抗扰度测试 1
-        sensitiveDevices: '', //主要敏感设备清单 1
-        antiInterferenceReport: '' //抗扰度测试报告 1
+          sensitiveDevices: [], //主要敏感设备清单 1
+         antiInterferenceReport: [] //抗扰度测试报告 1
     }
 
     form.value.reporter = adminInfo.$state.name
@@ -887,62 +888,62 @@ const subForm = ref({
     voltageLevel: '',
     //userType=='0' '1'
     userReportProjectPO: {
-        additionalAttachments: '', //其他附件告地址
+        additionalAttachments: [], //其他附件告地址
         agreementCapacity: 0,
         backgroundTestPerformed: 0,
-        feasibilityReport: '', //可研报告
+        feasibilityReport: [], //可研报告
         id: '',
         needGovernance: 0,
         nonlinearDeviceType: '',
-        predictionEvaluationReport: '', //预测评估报告告地址
-        predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-        preliminaryDesignDescription: '', //项目初步设计说明书告地址
+        predictionEvaluationReport: [], //预测评估报告告地址
+          predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
+        preliminaryDesignDescription: [], //项目初步设计说明书告地址
         state: 0
     },
     //userType=='2,3,4,5'
     userReportSubstationPO: {
-        additionalAttachments: '', //其他附件告地址
+        additionalAttachments: [], //其他附件告地址
         backgroundTestPerformed: 0,
         baseShortCircuitCapacity: 0,
         evaluationChekDept: '',
         evaluationType: '',
-        feasibilityReport: '', //可研报告
+        feasibilityReport: [], //可研报告
         id: '',
         minShortCircuitCapacity: 0,
         needGovernance: 0,
         nonlinearLoadType: '',
         pccEquipmentCapacity: 0,
         pccPoint: '',
-        predictionEvaluationReport: '', //预测评估报告告地址
-        predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-        preliminaryDesignDescription: '', //项目初步设计说明书告地址
+        predictionEvaluationReport: [], //预测评估报告告地址
+          predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
+        preliminaryDesignDescription: [], //项目初步设计说明书告地址
         state: 0,
-        substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
+          substationMainWiringDiagram: [], //用户接入变电站主接线示意图地址
         userAgreementCapacity: 0
     },
     //userType=='6'
     userReportSensitivePO: {
-        additionalAttachments: '', //其他附件告地址
-        antiInterferenceReport: '', //抗扰度测试报告
+        additionalAttachments: [], //其他附件告地址
+         antiInterferenceReport: [], //抗扰度测试报告
         antiInterferenceTest: '',
         backgroundTestPerformed: 0,
         deviceName: '',
         energyQualityIndex: '',
         evaluationChekDept: '',
         evaluationType: '',
-        feasibilityReport: '', //可研报告告地址
+        feasibilityReport: [], //可研报告告地址
         id: '',
         industry: '',
         needGovernance: 0,
         pccPoint: '',
-        powerQualityReport: '', //背景电能质量测试报告
+         powerQualityReport: [], //背景电能质量测试报告
         powerSupplyCount: 0,
-        predictionEvaluationReport: '', //预测评估报告告地址
-        predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-        preliminaryDesignDescription: '', //项目初步设计说明书告地址
-        sensitiveDevices: '', //主要敏感设备清单
+        predictionEvaluationReport: [], //预测评估报告告地址
+          predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
+        preliminaryDesignDescription: [], //项目初步设计说明书告地址
+          sensitiveDevices: [], //主要敏感设备清单
         state: 0,
-        substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
+          substationMainWiringDiagram: [] //用户接入变电站主接线示意图地址
     }
 })
 
@@ -1253,16 +1254,16 @@ watch(
         //userType==0,1
         if (val.userType == '0' || val.userType == '1') {
             subForm.value.userReportProjectPO = {
-                additionalAttachments: '', //其他附件告地址
+                additionalAttachments: [], //其他附件告地址
                 agreementCapacity: 0,
                 backgroundTestPerformed: 0,
-                feasibilityReport: '', //可研报告
+                feasibilityReport: [], //可研报告
                 id: '',
                 needGovernance: 0,
                 nonlinearDeviceType: '',
-                predictionEvaluationReport: '', //预测评估报告告地址
-                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-                preliminaryDesignDescription: '', //项目初步设计说明书告地址
+                predictionEvaluationReport: [], //预测评估报告告地址
+                  predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
+                preliminaryDesignDescription: [], //项目初步设计说明书告地址
                 state: 0
             }
             for (let key in val) {
@@ -1276,34 +1277,27 @@ watch(
             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: '', //其他附件告地址
+                additionalAttachments: [], //其他附件告地址
                 backgroundTestPerformed: 0,
                 baseShortCircuitCapacity: 0,
                 evaluationChekDept: '',
                 evaluationType: '',
-                feasibilityReport: '', //可研报告
+                feasibilityReport: [], //可研报告
                 id: '',
                 minShortCircuitCapacity: 0,
                 needGovernance: 0,
                 nonlinearLoadType: '',
                 pccEquipmentCapacity: 0,
                 pccPoint: '',
-                predictionEvaluationReport: '', //预测评估报告告地址
-                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-                preliminaryDesignDescription: '', //项目初步设计说明书告地址
+                predictionEvaluationReport: [], //预测评估报告告地址
+                  predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
+                preliminaryDesignDescription: [], //项目初步设计说明书告地址
                 state: 0,
-                substationMainWiringDiagram: '', //用户接入变电站主接线示意图地址
+                  substationMainWiringDiagram: [], //用户接入变电站主接线示意图地址
                 userAgreementCapacity: 0
             }
             for (let key in val) {
@@ -1315,38 +1309,31 @@ watch(
             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: '', //抗扰度测试报告
+                additionalAttachments: [], //其他附件告地址
+                 antiInterferenceReport: [], //抗扰度测试报告
                 antiInterferenceTest: '',
                 backgroundTestPerformed: 0,
                 deviceName: '',
                 energyQualityIndex: '',
                 evaluationChekDept: '',
                 evaluationType: '',
-                feasibilityReport: '', //可研报告告地址
+                feasibilityReport: [], //可研报告告地址
                 id: '',
                 industry: '',
                 needGovernance: 0,
                 pccPoint: '',
-                powerQualityReport: '', //背景电能质量测试报告
+                 powerQualityReport: [], //背景电能质量测试报告
                 powerSupplyCount: 0,
-                predictionEvaluationReport: '', //预测评估报告告地址
-                predictionEvaluationReviewOpinions: '', //预测评估评审意见报告地址
-                preliminaryDesignDescription: '', //项目初步设计说明书告地址
-                sensitiveDevices: '', //主要敏感设备清单
+                predictionEvaluationReport: [], //预测评估报告告地址
+                  predictionEvaluationReviewOpinions: [], //预测评估评审意见报告地址
+                preliminaryDesignDescription: [], //项目初步设计说明书告地址
+                  sensitiveDevices: [], //主要敏感设备清单
                 state: 0,
-                substationMainWiringDiagram: '' //用户接入变电站主接线示意图地址
+                  substationMainWiringDiagram: [] //用户接入变电站主接线示意图地址
             }
             for (let key in val) {
                 if (subForm.value.userReportSensitivePO && subForm.value.userReportSensitivePO.hasOwnProperty(key)) {
@@ -1357,13 +1344,6 @@ watch(
             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')
         }
     },
     {
@@ -1376,7 +1356,7 @@ const open = () => {
 const close = () => {
     //重置表单内容
     //取消表单校验状态
-    ruleFormRef.value.resetFields()
+   ruleFormRef.value&&ruleFormRef.value.resetFields()
     dialogFormVisible.value = false
     emits('onSubmit')
     resetForm()
@@ -1386,136 +1366,7 @@ onMounted(() => {
 })
 
 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()
@@ -1595,7 +1446,6 @@ const disabledDate = time => {
 }
 //提交
 const confirmForm = () => {
-    console.log(adminInfo.$state, '=======')
     ruleFormRef.value.validate(valid => {
         if (valid) {
             //整理上传文件的数据
@@ -1766,7 +1616,6 @@ const confirmForm = () => {
             }
 
             submitFormData(confirmFormData).then(res => {
-                console.log(res, '打印提交结果2333=======>>>>>')
                 ruleFormRef.value.resetFields()
                 resetForm()
                 close()