Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/api/buildTeam.js

@@ -1539,15 +1539,6 @@ export function updateStudentInstrument(data) {
   })
 }
 
-// 获取
-
-export function findUserByRole(data) {
-  return request2({
-    url: api + `/organization/getOrganRole`,
-    method: 'get',
-    params:data,
-  })
-}
 // 发送缴费提醒
 export function sendWaitRenewMessage(data) {
   return request2({
@@ -1648,3 +1639,11 @@ export function applyMusicGroupQuit(data) {
   })
 }
 
+// 获取角色信息
+export function getOrganRole(data) {
+  return request2({
+    url: api + `/organization/getOrganRole`,
+    method: 'get',
+    params:data
+  })
+}

src/components/remote-search/index.vue

@@ -60,8 +60,14 @@ export default {
   },
   methods: {
     async getList() {
-      await this.$store.dispatch(this.commit);
-      this.list = this.selects[this.enumer[this.commit]];
+      // 处理乐团主管数据请求
+      const commit = this.commit == 'setEducations' ? 'setOrganRole' : this.commit
+      await this.$store.dispatch(commit);
+      if(commit == 'setOrganRole') {
+        this.list = this.selects.roles[this.enumer[commit]];
+      } else {
+        this.list = this.selects[this.enumer[commit]];
+      }
       const data = {};
       for (const item of this.list) {
         data[item.userId] = item;
@@ -133,7 +139,7 @@ export default {
     enumer() {
       return {
         setTeachers: "teachers",
-        setEducations: "educations",
+        setOrganRole: "educationId",
         setEmploys:'employs'
       };
     },

src/store/modules/selects.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-empty */
 // import { branchQueryPage } from '@/api/specialSetting'
-import { getSubject, getTeacher,findEducationUsers,getEmployeeOrgan } from '@/api/buildTeam'
+import { getSubject, getTeacher,findEducationUsers,getEmployeeOrgan, getOrganRole } from '@/api/buildTeam'
 import { getSchool,queryEmployByOrganId } from '@/api/systemManage'
 import { vipGroupCategory } from "@/api/vipSeting"
 import { findTechnician } from '@/api/repairManager'
@@ -28,6 +28,7 @@ export default {
     educations:[],
     technician: [],
     employs:[],
+    roles: []
   },
   mutations: {
     commit_branchs: (state, branchs) => {
@@ -59,6 +60,9 @@ export default {
     commit_technician: (state, technician) => {
       state.technician = technician
     },
+    commit_roles: (state, roles) => {
+      state.roles = roles
+    },
     commit_employs:(state,employs)=>{
       state.employs = employs.map(emloys=>{
         return {
@@ -133,6 +137,34 @@ export default {
         loadings.commit_educations = false
       }
     },
+    async setOrganRole({commit,state},force) {
+      if ((!state.educations.length || force === true) && !loadings.commit_roles) {
+        loadings.commit_roles = getOrganRole()
+        try {
+          const res = await loadings.commit_roles
+          const tempArr = []
+          const tempData = res.data
+          // 初始化数据
+          for(let i in tempData) {
+            tempArr[i] = []
+            if(tempData[i]) {
+              for(let t in tempData[i]) {
+                tempArr[i].push({
+                  value: t,
+                  label: tempData[i][t],
+                  userName: tempData[i][t],
+                  userId: t,
+                })
+              }
+            }
+          }
+          console.log(tempArr, 'tempArr')
+          commit('commit_roles', tempArr)
+        } catch (error) { }
+        loadings.commit_roles = false
+      }
+      getOrganRole
+    },
     async setTechnician({commit,state},force){
       if ((!state.technician.length || force === true) && !loadings.commit_technician) {
         loadings.commit_technician = findTechnician()

src/views/HumanResources/index.vue

@@ -486,7 +486,6 @@ import {
   employeeInfo,
   helpCenterContentModify,
   helpCenterContentDelete,
-  queryEmployeeByRole,
 } from "@/api/appTenant";
 import { getEmployeeOrgan, getSubject } from "@/api/buildTeam";
 import { subjectListTree } from "@/api/specialSetting";
@@ -587,8 +586,8 @@ export default {
     },
   },
   async mounted() {
-    let res = await queryEmployeeByRole({ roleId: 40 });
-    this.roleList = res.data || [];
+    await this.$store.dispatch("setOrganRole");
+    this.roleList = this.selects.roles.hrId;
     this.getList();
     // this.getTreeList()
     getEmployeeOrgan().then((res) => {

src/views/OAMananger/index.vue

@@ -286,7 +286,6 @@ import {
   getDepts,
   getPosts,
 } from "@/api/systemManage";
-import { findEducationTeacher } from "@/api/specialSetting";
 import deepClone from "@/helpers/deep-clone";
 // import Treeselect from '@riophae/vue-treeselect'
 // import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -749,71 +748,7 @@ export default {
         return reuslt[row.lockFlag];
       }
     },
-    async checkStatus(data) {
-      let status;
-      await hasCourseGroupRelation({ employeeId: data.id }).then(
-        async (res) => {
-          if (res.code === 200) {
-            if (res.data.hasCourseSchedule) {
-              this.$message.error("请先交接指导老师课程");
-              status = false;
-            } else {
-              if (res.data.hasCourseGroupRelation) {
-                let userId = data.id;
-                await findEducationTeacher({ userId }).then((res) => {
-                  if (res.code === 200) {
-                    this.educationList = res.data;
-                    this.educationViseble = true;
-                    status = false;
-                  }
-                });
-              } else {
-                // 1 要弹出
-                status = true;
-              }
-            }
-          }
-        }
-      );
 
-      return status;
-    },
-    onStaffOperation(type, data) {
-      const tempStatus = type == "RESET_PASSWORD" ? true : false;
-      this.$confirm(
-        `您确定${tempStatus ? "重置密码" : "修改员工状态"}？`,
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(async () => {
-          if (type === "DEMISSION" && !data.demissionDate) {
-            this.activeRow = data;
-            // 1.点击的是离职按钮
-            // 2.判断该考级是否存在乐团主管
-            const status = await this.checkStatus(data);
-            if (!status) {
-              return;
-            }
-          }
-          employeeOperate({
-            employeeId: data.id,
-            operate: type,
-          }).then((res) => {
-            if (res.code == 200) {
-              this.$message.success(tempStatus ? "重置密码成功" : "更改成功");
-              this.roleStatus = false;
-              this.getList();
-            } else {
-              this.$message.error(res.msg);
-            }
-          });
-        })
-        .catch((err) => {});
-    },
     submitEducation() {
       // 发请求 提交信息
       updateEducationTeacherId({

src/views/accompanyManager/accompanys.vue

@@ -422,7 +422,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="指导老师" v-else="isMultiple">
+        <el-form-item label="指导老师" v-else>
           <el-select v-model.trim="teacherForm.teacher" filterable clearable>
             <el-option
               v-for="(item, index) in teacherList"
@@ -439,10 +439,10 @@
             clearable
           >
             <el-option
-              v-for="(item, index) in educationList"
+              v-for="(item, index) in selects.roles.educationId"
               :key="index"
-              :value="item.userId"
-              :label="item.userName"
+              :value="item.value"
+              :label="item.label"
             ></el-option>
           </el-select>
         </el-form-item>
@@ -656,7 +656,6 @@ import {
   batchAddCourses,
   getPracticeApplySubjects,
   batchUpdateCourseSchedule,
-  findEducationUsers,
   updateTeacherAttendance,
   updateCoursesExpireDate,
   updateCoursesExpireDateOnlyNormal,
@@ -785,7 +784,6 @@ export default {
         { value: "7", label: "星期日" },
       ],
       activeList: [],
-      educationList: [],
       timers: null,
       markAttendance: {
         // 考勤状态
@@ -810,7 +808,8 @@ export default {
   created() {
     that = this;
   },
-  mounted() {
+  async mounted() {
+    await this.$store.dispatch("setOrganRole");
     this.init();
   },
   methods: {
@@ -824,12 +823,6 @@ export default {
         this.$route.query.coursesStartDate +
         "至" +
         this.$route.query.coursesExpireDate;
-      //  获取乐团主管
-      findEducationUsers().then((res) => {
-        if (res.code == 200) {
-          this.educationList = res.data;
-        }
-      });
 
       //   <!-- 状态 指导老师 活动方案-->
       getTeacher({ organId: this.organId }).then((res) => {

src/views/buildVip/index.vue

@@ -81,10 +81,10 @@
               :disabled="!leftForm.subject"
             >
               <el-option
-                v-for="(item, index) in educationList"
-                :key="index"
-                :label="item.value"
-                :value="item.key"
+                v-for="(item, key) in educationList"
+                :key="key"
+                :label="item"
+                :value="key"
               />
             </el-select>
           </el-form-item>
@@ -670,9 +670,8 @@
 import {
   findTeacherByOrganId,
   getSubject,
-  findEducationUsers,
   getPracticeApplySubjects,
-  findUserByRole,
+  getOrganRole,
 } from "@/api/buildTeam";
 import {
   vipGroupCategory,
@@ -696,7 +695,7 @@ export default {
   name: "buildVip",
   data() {
     return {
-      title: "VIP/乐理课申请",
+      title: "VIP申请",
       dialogFormVisible: false,
       labelPosition: "right",
       courseType: "",
@@ -2144,10 +2143,11 @@ export default {
         });
         // 获取乐团主管
         try {
-          const ruselt = await findUserByRole({
+          const ruselt = await getOrganRole({
             id: val,
           });
           this.educationList = ruselt?.data?.educationId;
+          console.log(this.educationList)
           if (this.educationList.length <= 0) {
             this.$bus.$emit("showguide", ["teamManager"]);
             return
@@ -2155,16 +2155,7 @@ export default {
         } catch (e) {
           console.log(e);
         }
-        /**
-         *
         // 乐团主管
-        this.educationList = ruselt?.data?.educationId;
-         */
-        // findEducationUsers({ organId: val }).then((res) => {
-        //   if (res.code == 200) {
-        //     this.educationList = res.data;
-        //   }
-        // });
         // 如果是网管课 则获取网管课单价
         if (this.courseType == "PRACTICE") {
           getPracticeGroupSellPrice({ organId: val }).then((res) => {

src/views/businessManager/orderManager/salesList.vue

@@ -421,9 +421,7 @@ import {
 } from "@/api/orderManager";
 import { queryByOrganId } from "@/api/systemManage";
 import {
-  getEmployeeOrgan,
-  getCooperation,
-  findEducationUsers,
+  getCooperation
 } from "@/api/buildTeam";
 import { paymentChannelStatus } from "@/utils/searchArray";
 import { Export } from "@/utils/downLoadFile";

src/views/categroyManager/insideSetting/branchManager.vue

@@ -356,7 +356,7 @@ import {
 import cleanDeep from "clean-deep";
 import { isvalidPhone } from "@/utils/validate";
 import { Export } from "@/utils/downLoadFile";
-import { findUserByRole } from "@/api/buildTeam";
+import { getOrganRole } from "@/api/buildTeam";
 
 import qs from "qs";
 let validPhone = (rule, value, callback) => {
@@ -610,7 +610,7 @@ export default {
       this.form.educationUserId = null;
       if (val) {
         try {
-          const ruselt = await findUserByRole({
+          const ruselt = await getOrganRole({
             id: val,
           });
           this.educationList = ruselt?.data?.educationId;

src/views/categroyManager/insideSetting/modals/handover.vue

@@ -87,12 +87,14 @@ export default {
           }
         }
       }
+      console.log(data)
       return data
     }
   },
   async mounted() {
     this.$store.dispatch('setBranchs')
     this.$store.dispatch('setTechnician')
+    // await this.$store.dispatch("setOrganRole");
     this.FetchDetail()
   },
   methods: {

src/views/categroyManager/insideSetting/staffManager.vue

@@ -519,7 +519,7 @@
             filterable
           >
             <el-option
-              v-for="item in educationList"
+              v-for="item in selects.roles.educationId"
               :key="item.userId"
               :label="item.userName"
               :value="item.userId"
@@ -550,9 +550,7 @@ import {
   getPosts,
 } from "@/api/systemManage";
 import { userRole } from "./api";
-import { findEducationTeacher } from "@/api/specialSetting";
 import deepClone from "@/helpers/deep-clone";
-import { findEducationUsers } from "@/api/buildTeam";
 // import Treeselect from '@riophae/vue-treeselect'
 // import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Tooltip from "@/components/Tooltip/index";
@@ -575,7 +573,6 @@ export default {
       roleResetList: [],
       organList: [],
       tableList: [],
-      educationList: [],
       deptList: [],
       deptSmallList: [],
       postList: [],
@@ -1024,13 +1021,9 @@ export default {
             } else {
               if (res.data.hasCourseGroupRelation) {
                 let userId = data.id;
-                await findEducationTeacher({ userId }).then((res) => {
-                  if (res.code === 200) {
-                    this.educationList = res.data;
-                    this.educationViseble = true;
-                    status = false;
-                  }
-                });
+                await this.$store.dispatch("setOrganRole");
+                this.educationViseble = true;
+                status = false;
               } else {
                 // 1 要弹出
                 status = true;

src/views/categroyManager/insideSetting/staffPlatManager.vue

@@ -549,10 +549,8 @@ import {
   getDepts,
   getPosts,
 } from "@/api/systemManage";
-import { userRole } from "./api";
-import { findEducationTeacher } from "@/api/specialSetting";
+// import { userRole } from "./api";
 import deepClone from "@/helpers/deep-clone";
-import { findEducationUsers } from "@/api/buildTeam";
 // import Treeselect from '@riophae/vue-treeselect'
 // import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Tooltip from "@/components/Tooltip/index";
@@ -1024,13 +1022,9 @@ export default {
             } else {
               if (res.data.hasCourseGroupRelation) {
                 let userId = data.id;
-                await findEducationTeacher({ userId }).then((res) => {
-                  if (res.code === 200) {
-                    this.educationList = res.data;
-                    this.educationViseble = true;
-                    status = false;
-                  }
-                });
+                await this.$store.dispatch("setOrganRole");
+                this.educationViseble = true;
+                status = false;
               } else {
                 // 1 要弹出
                 status = true;

src/views/evaluateManager/networkList.vue

@@ -427,7 +427,6 @@ import { practiceGroupType } from "@/utils/searchArray";
 import {
   getTeacher,
   getEmployeeOrgan,
-  findEducationUsers,
   getPracticeGroup,
   getReviewInfo,
   updateReviewInfo,
@@ -455,7 +454,6 @@ export default {
       practiceGroupType: practiceGroupType,
       organList: [],
       teacherList: [],
-      educationList: [],
       tableData: [],
       rules: {
         // 分页规则
@@ -516,12 +514,6 @@ export default {
           this.organList = res.data;
         }
       });
-      // 获取教务
-      findEducationUsers().then((res) => {
-        if (res.code == 200) {
-          this.educationList = res.data;
-        }
-      });
 
       this.getList();
     },

src/views/evaluateManager/vipEvaluateList.vue

@@ -60,7 +60,7 @@
           placeholder="乐团主管"
         >
           <el-option
-            v-for="(item, index) in educationList"
+            v-for="(item, index) in selects.roles.educationId"
             :key="index"
             :value="item.userId"
             :label="item.userName"
@@ -370,9 +370,6 @@ import axios from "axios";
 import pagination from "@/components/Pagination/index";
 import { practiceGroupType } from "@/utils/searchArray";
 import {
-  getTeacher,
-  getEmployeeOrgan,
-  findEducationUsers,
   getReviewInfo,
   updateReviewInfo,
   getVipGroup,
@@ -419,8 +416,9 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  async mounted() {
     this.$store.dispatch("setBranchs");
+    await this.$store.dispatch("setOrganRole");
     this.init();
   },
   activated() {
@@ -449,25 +447,6 @@ export default {
         console.log(this.searchForm.month);
       }
 
-      // 获取指导老师
-      // getTeacher({}).then((res) => {
-      //   if (res.code == 200) {
-      //     this.teacherList = res.data;
-      //   }
-      // });
-      // 获取分部
-      getEmployeeOrgan().then((res) => {
-        if (res.code == 200) {
-          this.organList = res.data;
-        }
-      });
-      // 获取教务
-      findEducationUsers().then((res) => {
-        if (res.code == 200) {
-          this.educationList = res.data;
-        }
-      });
-
       this.getList();
     },
     getList() {

src/views/indexErrDataRecord/components/patrol.vue

@@ -70,7 +70,7 @@
             placeholder="请选择乐团主管"
           >
             <el-option
-              v-for="(item, index) in educationList"
+              v-for="(item, index) in selects.roles.educationId"
               :key="index"
               :label="item.userName"
               :value="item.userId"
@@ -297,7 +297,6 @@ import pagination from "@/components/Pagination/index";
 import LookDetail from "@/views/musicInspection/modals/lookDetail";
 import dayjs from "dayjs";
 import { inspectionItemPlan, updateMemo } from "@/views/musicInspection/api";
-import { findEducationUsers } from "@/api/buildTeam";
 import { queryByOrganId } from "@/api/systemManage";
 import { getTeamList } from "@/api/teamServer";
 import { getTimes } from "@/utils";
@@ -309,7 +308,6 @@ export default {
   components: { pagination, LookDetail, gpsLoction },
   data() {
     return {
-      educationList: [],
       cooperationList: [],
       musicGroupList: [],
       activeRow: null,
@@ -355,13 +353,8 @@ export default {
     this.getList();
     // 分部
     await this.$store.dispatch("setBranchs");
+    await this.$store.dispatch("setOrganRole");
 
-    //  获取乐团主管
-    await findEducationUsers().then((res) => {
-      if (res.code == 200) {
-        this.educationList = res.data;
-      }
-    });
 
     // 乐团列表 {只查询进行中的乐团}
     // await getTeamList({ musicGroupStatus: 'PROGRESS', rows: 9999 }).then(res => {

src/views/musicInspection/index.vue

@@ -69,7 +69,7 @@
             placeholder="请选择乐团主管"
           >
             <el-option
-              v-for="(item, index) in educationList"
+              v-for="(item, index) in selects.roles.educationId"
               :key="index"
               :label="item.userName"
               :value="item.userId"
@@ -297,7 +297,6 @@ import LookDetail from "./modals/lookDetail";
 import dayjs from "dayjs";
 import { inspectionItemPlan, updateMemo } from "./api";
 import { conclusionList } from "@/utils/searchArray";
-import { findEducationUsers } from "@/api/buildTeam";
 import { queryByOrganId } from "@/api/systemManage";
 import { getTeamList } from "@/api/teamServer";
 import { getTimes } from "@/utils";
@@ -308,7 +307,6 @@ export default {
   data() {
     return {
       conclusionList: conclusionList,
-      educationList: [],
       cooperationList: [],
       musicGroupList: [],
       activeRow: null,
@@ -354,13 +352,7 @@ export default {
     this.getList();
     // 分部
     await this.$store.dispatch("setBranchs");
-
-    //  获取乐团主管
-    await findEducationUsers().then((res) => {
-      if (res.code == 200) {
-        this.educationList = res.data;
-      }
-    });
+    await this.$store.dispatch("setOrganRole");
 
     // 乐团列表 {只查询进行中的乐团}
     // await getTeamList({ musicGroupStatus: 'PROGRESS', rows: 9999 }).then(res => {

src/views/repairManager/repairList.vue

@@ -47,7 +47,7 @@
             filterable
           >
             <el-option
-              v-for="(item, index) in employeeList"
+              v-for="(item, index) in selects.roles.repairId"
               :label="item.userName"
               :value="item.userId"
               :key="index"
@@ -432,7 +432,6 @@ import { Export } from '@/utils/downLoadFile'
 import qs from 'qs'
 import { getTimes } from "@/utils";
 import {
-  findAllTechnician,
   studentRepairList,
   repairSuccess,
 } from "@/api/repairManager";
@@ -450,7 +449,6 @@ export default {
         exemptionAmount: "",
       },
       repairVisible: false,
-      employeeList: [],
       tableList: [],
       rules: {
         // 分页规则
@@ -470,7 +468,7 @@ export default {
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
-  mounted() {
+  async mounted() {
     if (this.$route.query.studentInstrumentId) {
       this.searchForm = {
         ...this.searchForm,
@@ -478,11 +476,9 @@ export default {
       };
       this.$router.replace("/otherManager/repairList");
     }
-    findAllTechnician().then((res) => {
-      if (res.code == 200) {
-        this.employeeList = res.data;
-      }
-    });
+
+    await this.$store.dispatch("setOrganRole");
+
     this.$store.dispatch("setBranchs");
     // 获取声部
     getSoundTree({ tenantId: 1, rows: 9999 }).then((res) => {

src/views/resetTeaming/modals/giveMemberModel.vue

@@ -101,7 +101,7 @@ export default {
             // // 二维码页面， 唤起支付页面
             const { orderNo, sign, amount, orderBody, orderSubject } = res.data.payMap
             this.orderNo = orderNo
-            this.codeUrl = vaildStudentUrl() + '/#/payCenter?orderNo=' + orderNo + '&sign=' + sign + '&amount=' + amount + '&payType=' + payForm.payType + '&orderBody=' + orderBody + '&orderSubject=' + orderSubject + '&platform=tenant'
+            this.codeUrl = vaildStudentUrl() + '/#/payCenter?orderNo=' + orderNo + '&sign=' + sign + '&amount=' + amount + '&payType=' + payForm.payType + '&orderBody=' + orderBody + '&orderSubject=' + orderSubject + '&platform=cloudTeacherOrder'
             console.log(this.codeUrl, 'codeUrl')
             this.payMentVisible = true
           } catch(e) {}

src/views/teamBuild/components/teamBaseInfo.vue

@@ -249,14 +249,14 @@
             clearable
           >
             <el-option
-              v-for="(item, index) in educationList"
-              :key="index"
-              :label="item.value"
-              :value="item.key"
+              v-for="(item, key) in educationList"
+              :key="key"
+              :label="item"
+              :value="key"
             >
-              <span style="float: left">{{ item.value }}</span>
+              <span style="float: left">{{ item }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(item.key)
+                String(key)
               }}</span>
             </el-option>
           </el-select>
@@ -290,14 +290,14 @@
             clearable
           >
             <el-option
-              v-for="(item, index) in technician"
-              :key="index"
-              :label="item.value"
-              :value="item.key"
+              v-for="(item, key) in technician"
+              :key="key"
+              :label="item"
+              :value="key"
             >
-              <span style="float: left">{{ item.value }}</span>
+              <span style="float: left">{{ item }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(item.key)
+                String(key)
               }}</span>
             </el-option>
           </el-select>
@@ -310,14 +310,14 @@
             clearable
           >
             <el-option
-              v-for="item in transactionList"
-              :key="item.key"
-              :label="item.value"
-              :value="item.key"
+              v-for="(item, key) in transactionList"
+              :key="key"
+              :label="item"
+              :value="key"
             >
-              <span style="float: left">{{ item.value }}</span>
+              <span style="float: left">{{ item }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(item.key)
+                String(key)
               }}</span>
             </el-option>
           </el-select>
@@ -427,11 +427,10 @@ import {
   musicGroupOpenPay,
   extensionPayment,
   extensionApplyExpire,
-  findUserByRole,
+  getOrganRole,
   getTeacher,
   createTeam,
 } from "@/api/buildTeam";
-import { findTechnician } from "@/api/repairManager";
 import dayjs from "dayjs";
 import merge from "webpack-merge";
 import { queryByOrganId, getSchool } from "@/api/systemManage";
@@ -789,37 +788,21 @@ export default {
       //     this.addList = res.data;
       //   }
       // });
-      // 获取维修技师
-      // findTechnician().then((res) => {
-      //   if (res.code == 200) {
-      //     this.technician = res.data;
-      //   }
-      // });
       // 获取乐团主管
       try {
-        const ruselt = await findUserByRole({
+        const ruselt = await getOrganRole({
           id: val,
         });
         // 乐团主管
         this.educationList = ruselt?.data?.educationId;
         // 维修技师
-      this.technician =ruselt?.data?.repairId
+        this.technician =ruselt?.data?.repairId
         // this.bossList = ruselt?.data?.TEAM_TEACHER;
              // 衔接老师
         this.transactionList = ruselt?.data?.joinTeacherId;
       } catch (e) {
         console.log(e);
       }
-      // 获取运营主管
-      // try {
-      //   const ruselt = await findUserByRole({
-      //     organId: val,
-      //     employeeRole: "TEAM_TEACHER",
-      //   });
-      //   this.bossList = ruselt.data;
-      // } catch (e) {
-      //   console.log(e);
-      // }
       // 获取指导老师
       getTeacher({ organId: val }).then((res) => {
         if (res.code == 200) {

src/views/teamBuild/signupList.vue

@@ -1528,9 +1528,12 @@ export default {
       // 生成报名二维码
       let id = this.id;
       this.codeStatus = true;
+      let tenantConfig = sessionStorage.getItem('tenantConfig')
+      tenantConfig = tenantConfig ? JSON.parse(tenantConfig) : {}
+      const tenantId = tenantConfig.tenantId || 0
       if (type == "payment") {
         this.codeTitle = "学员报名链接";
-        this.qrCodeUrl = vaildStudentUrl() + "/#/login?musicGroupId=" + id + '&organId=' + this.organId;
+        this.qrCodeUrl = vaildStudentUrl() + "/#/login?musicGroupId=" + id + '&organId=' + this.organId+ '&tenantId=' + tenantId;
       } else if (type == "detail") {
         let teamName = this.$route.query.name;
         this.codeTitle = "报名缴费详情";
@@ -1543,7 +1546,7 @@ export default {
       } else if (type == "rePayment") {
         this.codeTitle = "学生报名链接（无乐器）";
         this.qrCodeUrl =
-          vaildStudentUrl() + "/#/login?musicGroupId=" + id + '&organId=' + this.organId + "&instrument=1";
+          vaildStudentUrl() + "/#/login?musicGroupId=" + id + '&organId=' + this.organId + '&tenantId=' + tenantId + "&instrument=1";
       }
     },
     onCreateQRCode2() {

src/views/vipClass/vipReset.vue

@@ -647,12 +647,7 @@ export default {
       if (query.searchForm) {
         this.FsearchForm = query.searchForm;
       }
-      //  获取乐团主管
-      // findEducationUsers().then(res => {
-      //   if (res.code == 200) {
-      //     this.educationList = res.data;
-      //   }
-      // });
+
       getEmployeeOrgan().then(res => {
         if (res.code == 200) {
           this.organList = res.data;