新建乐团员工对应身份

1

src/api/buildTeam.js

@@ -1511,3 +1511,13 @@ export function addStudentInstrument(data) {
     requestType:'form'
   })
 }
+
+// 获取对应角色的员工
+
+export function findUserByRole(data) {
+  return request2({
+    url: api + `/employee/findUserByRole`,
+    method: 'get',
+    params:data,
+  })
+}

src/views/repairManager/repairList.vue

@@ -445,6 +445,8 @@ export default {
         ...this.searchForm,
         ...this.$route.query,
       };
+      this.$router.replace('/business/repairList')
+
     }
     findAllTechnician().then((res) => {
       if (res.code == 200) {

src/views/teamBuild/components/teamBaseInfo.vue

@@ -142,10 +142,10 @@
             clearable
           >
             <el-option
-              v-for="(item, index) in orgianList"
-              :key="index"
+              v-for="(item) in bossList"
+              :key="item.userId"
               :label="item.realName"
-              :value="item.id"
+              :value="item.userId"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -161,10 +161,10 @@
             clearable
           >
             <el-option
-              v-for="(item, index) in orgianList"
+              v-for="(item, index) in educationList"
               :key="index"
               :label="item.realName"
-              :value="item.id"
+              :value="item.userId"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -291,11 +291,11 @@
           <el-select
             v-model.trim="topFrom.head"
             filterable
-            :disabled="basdisabled"
+            :disabled="!topFrom.section || basdisabled"
             clearable
           >
             <el-option
-              v-for="(item, index) in orgianList"
+              v-for="(item, index) in teacherList"
               :key="index"
               :label="item.realName"
               :value="item.id"
@@ -344,6 +344,7 @@ import {
   getTeamBaseInfo,
   resetTeamBaseInfo,
   getEmployeeOrgan,
+  findUserByRole
 } from "@/api/buildTeam";
 import { findTechnician } from "@/api/repairManager";
 import dayjs from "dayjs";
@@ -398,11 +399,12 @@ export default {
       typeList: [], // 收费类型列表
       cooperationList: [], // 教学点列表
       teacherList: [], // 获取老师列表
+      educationList:[], // 乐团主管
+      bossList:[],
       addList: [], // 教学地点列表
       activeTeam: [],
       teamid: "",
       teamStatus: "",
-      orgianList: [],
       isInit: false,
       technician: [],
       basdisabled: false,
@@ -450,15 +452,11 @@ export default {
       this.basdisabled = false;
     }
   },
-  deactivated() {
-
-  },
-  beforeDestroy(){
-
-    sessionStorage.setItem(`${this.teamid}base`,JSON.stringify(this.topFrom));
+  deactivated() {},
+  beforeDestroy() {
+    sessionStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
   },
 
-
   methods: {
     //|| this.teamStatus === 'teamAudit'
     isNotEditing: function () {
@@ -517,135 +515,64 @@ export default {
       if (this.$route.query.id) {
         // 单团修改
         this.teamid = this.$route.query.id;
-        let sotrage = JSON.parse(sessionStorage.getItem(`${this.$route.query.id}base`));
-        console.log(sotrage)
+        let sotrage = JSON.parse(
+          sessionStorage.getItem(`${this.$route.query.id}base`)
+        );
         if (!sotrage?.section) {
-
           getTeamBaseInfo({ musicGroupId: this.teamid }).then((res) => {
             if (res.code == 200) {
               // if (this.$listeners.getBaseInfo) {
               //   this.$listeners.getBaseInfo(res.data);
               // }
 
-            // 头部
-            this.topFrom.name = res.data.musicGroup.name;
-            this.$emit("getName", this.topFrom.name);
-            this.topFrom.time = res.data.musicGroup.applyExpireDate;
-            this.topFrom.type = res.data.musicGroup.chargeTypeId;
-            this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(
-              ","
-            );
-            this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
-            this.topFrom.paymentValidStartDate =
-              res.data.musicGroup.paymentValidStartDate;
-            this.topFrom.paymentValidEndDate =
-              res.data.musicGroup.paymentValidEndDate;
-            this.topFrom.section = res.data.musicGroup.organId;
-            this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
-            this.topFrom.school = res.data.musicGroup.cooperationOrganId;
-            this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
-            this.topFrom.boss = res.data.musicGroup.teamTeacherId;
-            this.topFrom.address = res.data.musicGroup.schoolId;
-            this.topFrom.salary = res.data.musicGroup.settlementType;
-            this.topFrom.head = res.data.musicGroup.directorUserId
-              ? res.data.musicGroup.directorUserId
-              : null;
-            this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
-            this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
-            this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
-            this.topFrom.repairUserId = res.data.musicGroup.repairUserId
-              ? res.data.musicGroup.repairUserId
-              : null;
-            this.topFrom.feeType = res.data.musicGroup.feeType
-              ? res.data.musicGroup.feeType
-              : null;
-            // // 循环缴费月
-            // this.payList.chioseMonth = res.data.months;
-            if (res.data.musicGroup.organId) {
-              // 获取员工
-              queryEmployByOrganId({
-                organId: res.data.musicGroup.organId,
-                rows: 1000,
-              }).then((res) => {
-                if (res.code == 200) {
-                  this.orgianList = res.data.rows;
-                }
-              });
-              // 获取合作单位
-              queryByOrganId({ organId: res.data.musicGroup.organId }).then(
-                (res) => {
-                  if (res.code == 200) {
-                    this.orgianList = res.data.rows;
-                  }
-                });
-                // 获取合作单位
-                queryByOrganId({ organId: res.data.musicGroup.organId }).then(
-                  (res) => {
-                    if (res.code == 200) {
-                      this.cooperationList = res.data;
-                    }
-                  }
-                );
-                // 获取教学点
-                getSchool({ organId: res.data.musicGroup.organId }).then(
-                  (res) => {
-                    if (res.code == 200) {
-                      this.addList = res.data;
-                      this.isInit = false;
-                    }
-                  }
-                );
-
-                // 获取维修技师
-                findTechnician().then((res) => {
-                  if (res.code == 200) {
-                    this.technician = res.data;
-                  }
-                });
+              // 头部
+              this.topFrom.name = res.data.musicGroup.name;
+              this.$emit("getName", this.topFrom.name);
+              this.topFrom.time = res.data.musicGroup.applyExpireDate;
+              this.topFrom.type = res.data.musicGroup.chargeTypeId;
+              this.topFrom.startClass = res.data.musicGroup.enrollClasses.split(
+                ","
+              );
+              this.topFrom.paymentPattern = res.data.musicGroup.paymentPattern;
+              this.topFrom.paymentValidStartDate =
+                res.data.musicGroup.paymentValidStartDate;
+              this.topFrom.paymentValidEndDate =
+                res.data.musicGroup.paymentValidEndDate;
+              this.topFrom.section = res.data.musicGroup.organId;
+              this.topFrom.courseViewType = res.data.musicGroup.courseViewType;
+              this.topFrom.school = res.data.musicGroup.cooperationOrganId;
+              this.topFrom.teacher = res.data.musicGroup.educationalTeacherId;
+              this.topFrom.boss = res.data.musicGroup.teamTeacherId;
+              this.topFrom.address = res.data.musicGroup.schoolId;
+              this.topFrom.salary = res.data.musicGroup.settlementType;
+              this.topFrom.head = res.data.musicGroup.directorUserId
+                ? res.data.musicGroup.directorUserId
+                : null;
+              this.topFrom.isClass = res.data.musicGroup.isClassroomLessons;
+              this.topFrom.startTime = res.data.musicGroup.expectStartGroupDate;
+              this.topFrom.ownershipType = res.data.musicGroup.ownershipType;
+              this.topFrom.repairUserId = res.data.musicGroup.repairUserId
+                ? res.data.musicGroup.repairUserId
+                : null;
+              this.topFrom.feeType = res.data.musicGroup.feeType
+                ? res.data.musicGroup.feeType
+                : null;
+              // // 循环缴费月
+              // this.payList.chioseMonth = res.data.months;
+              if (res.data.musicGroup.organId) {
+                // 获取员工
+                 this.getBaseList(res.data.musicGroup.organId)
               }
               this.$emit("getBaseInfo", res.data);
-
             }
           });
-        }else{
-          this.topFrom = sotrage
-             if ( this.topFrom.section) {
-                // 获取员工
-                queryEmployByOrganId({
-                  organId: this.topFrom.section,
-                  rows: 1000,
-                }).then((res) => {
-                  if (res.code == 200) {
-                    this.orgianList = res.data.rows;
-                  }
-                });
-                // 获取合作单位
-                queryByOrganId({ organId: this.topFrom.section }).then(
-                  (res) => {
-                    if (res.code == 200) {
-                      this.cooperationList = res.data;
-                    }
-                  }
-                );
-                // 获取教学点
-                getSchool({ organId: this.topFrom.section }).then(
-                  (res) => {
-                    if (res.code == 200) {
-                      this.addList = res.data;
-                      this.isInit = false;
-                    }
-                  }
-                );
-
-                // 获取维修技师
-                findTechnician().then((res) => {
-                  if (res.code == 200) {
-                    this.technician = res.data;
-                  }
-                });
-             }
-
-             }
+        } else {
+          this.topFrom = sotrage;
+          if (this.topFrom.section) {
+            // 获取员工
+             this.getBaseList(this.topFrom.section)
+          }
+        }
       }
       this.$emit("getName", this.topFrom.name);
       getEmployeeOrgan().then((res) => {
@@ -669,11 +596,9 @@ export default {
       this.topFrom.school = "";
       this.topFrom.address = "";
       // 发请求 根据分部id 查询所有员工
-      queryEmployByOrganId({ organId: val, rows: 1000 }).then((res) => {
-        if (res.code == 200) {
-          this.orgianList = res.data.rows;
-        }
-      });
+      this.getBaseList(val)
+    },
+    async getBaseList(val){
       // 合作单位
       queryByOrganId({ organId: val }).then((res) => {
         if (res.code == 200) {
@@ -692,6 +617,26 @@ export default {
           this.technician = res.data;
         }
       });
+      // 获取乐团主管
+      try {
+        const ruselt = await findUserByRole({organId: val,employeeRole:'EDUCATION' })
+        this.educationList = ruselt.data
+      }catch(e){
+        console.log(e)
+      }
+      // 获取运营主管
+          try {
+        const ruselt = await findUserByRole({organId: val,employeeRole:'EAM_TEACHER' })
+        this.bossList = ruselt.data
+      }catch(e){
+        console.log(e)
+      }
+      // 获取指导老师
+      getTeacher({organId: val}).then(res=>{
+        if(res.code == 200){
+          this.teacherList = res.data
+        }
+      })
     },
     chioseSchool(val) {},
     gotoNext(num) {