Merge branch 'master' of https://sinanoaq.cn:8888/r/gtqtOut

shj

2022-08-09 c64c8f43ec1a3d88feb1f915fd488040b6358e7d

 src/views/contingencyManagement/panManagement/component/openAdd.vue

@@ -15,12 +15,14 @@
                        v-model="ruleForm.responsibleDepartment"
                        :data="newTreeList"
                        class="w100"
                        :props="propse"
                        clearable
                        :props="propse"
                        multiple
                        :render-after-expand="false"
                        show-checkbox
                        check-strictly
                        check-on-click-node
                        placeholder="请选择"
                        @change="changeDepartment"
                     />
                     <el-divider />
                  </el-form-item>
@@ -127,7 +129,8 @@
         <template #footer>
            <span class="dialog-footer">
               <el-button @click="resetForm(ruleFormRef)" size="default">关闭</el-button>
               <el-button size="default" type="primary" v-if="disabled == true ? false : true" @click="submitForm(titles, ruleFormRef)">确定</el-button>
               <el-button size="default" type="primary" v-if="disabled == true ? false : true"
                        @click="submitForm(titles, ruleFormRef)">确定</el-button>
            </span>
         </template>
      </el-dialog>
@@ -193,12 +196,17 @@
               .seeEmergencyTeam(id)
               .then((res) => {
                  if (res.data.code == 200) {
              ruleForm.value = res.data.data;
              let arr = [];
              for (let i = 0; i < ruleForm.value.teamList.length; i++) {
                arr.push(ruleForm.value.teamList[i].teamName);
              }
              ruleForm.value.teamName = arr.toString();
                    ruleForm.value = res.data.data;
                    let arr = [];
                    ruleForm.value.responsibleDepartment = []
                    for (let i = 0; i < ruleForm.value.teamList.length; i++) {
                     arr.push(ruleForm.value.teamList[i].teamName);
                    }
                     for (let i = 0; i < ruleForm.value.deptList.length; i++) {
                        ruleForm.value.responsibleDepartment.push(ruleForm.value.deptList[i].departmentId);
                     }
                     console.log(ruleForm.value.responsibleDepartment)
                    ruleForm.value.teamName = arr.toString();
                  }
               });
         }
@@ -245,6 +253,16 @@
      onMounted(() => {
         department();
      });
      const changeDepartment = (e) => {
         var temList = []
         for(var a = 0;a<e.length;a++){
            temList.push({
               departmentId:e[a]
            })
         }
         ruleForm.value.deptList = temList
         console.log(ruleForm)
      }
      //定义树形下拉框
      const responsibleDepartment = ref();
      const data = ref();
@@ -350,8 +368,7 @@
      for (let i = 0; i < val.length; i++) {
        arr.push(val[i].teamName);
        ruleForm.value.teamList.push({
          userUid: val[i].uid,
          teamName: val[i].teamName,
         teamId: val[i].id,
        });
      }
      ruleForm.value.teamName = arr.toString();
@@ -410,7 +427,8 @@
         ruleForm,
         resetForm,
         onUser,
         newTreeList
         newTreeList,
         changeDepartment
      };
   },
});