更新乐团主管取值

src/api/buildTeam.js

@@ -1642,8 +1642,16 @@ export function applyMusicGroupQuit(data) {
 // 获取角色信息
 export function getOrganRole(data) {
   return request2({
-    url: api + `/organization/getOrganRole`,
+    url: api + `/employeePosition/findOrganPosition`,
     method: 'get',
     params:data
   })
-}
+}
+// export function getOrganRole(data) {
+//   return request2({
+//     url: api + `/organization/getOrganRole`,
+//     method: 'get',
+//     params:data
+//   })
+// }
+

src/components/remote-search/index.vue

@@ -139,7 +139,7 @@ export default {
     enumer() {
       return {
         setTeachers: "teachers",
-        setOrganRole: "educationId",
+        setOrganRole: "EDUCATION",
         setEmploys:'employs'
       };
     },

src/store/modules/selects.js

@@ -150,10 +150,9 @@ export default {
             if(tempData[i]) {
               for(let t in tempData[i]) {
                 tempArr[i].push({
-                  value: t,
-                  label: tempData[i][t],
-                  userName: tempData[i][t],
-                  userId: t,
+                  value: tempData[i][t].userId,
+                  label: tempData[i][t].realName,
+                  ...tempData[i][t]
                 })
               }
             }

src/views/accompanyManager/accompanys.vue

@@ -439,7 +439,7 @@
             clearable
           >
             <el-option
-              v-for="(item, index) in selects.roles.educationId"
+              v-for="(item, index) in selects.roles.EDUCATION"
               :key="index"
               :value="item.value"
               :label="item.label"

src/views/buildVip/index.vue

@@ -83,8 +83,8 @@
               <el-option
                 v-for="(item, key) in educationList"
                 :key="key"
-                :label="item"
-                :value="key"
+                :label="item.userId"
+                :value="item.userName"
               />
             </el-select>
           </el-form-item>
@@ -2146,7 +2146,7 @@ export default {
           const ruselt = await getOrganRole({
             id: val,
           });
-          this.educationList = ruselt?.data?.educationId;
+          this.educationList = ruselt?.data?.EDUCATION;
           console.log(this.educationList)
           if (this.educationList.length <= 0) {
             this.$bus.$emit("showguide", ["teamManager"]);

src/views/categroyManager/insideSetting/branchManager.vue

@@ -206,12 +206,12 @@
               <el-option
                 v-for="(item, key) in educationList"
                 :key="key"
-                :label="item"
-                :value="key"
+                :label="item.userName"
+                :value="item.userId"
               >
-                <span style="float: left">{{ item }}</span>
+                <span style="float: left">{{ item.userName }}</span>
                 <span style="float: right; color: #8492a6; font-size: 13px">{{
-                  String(key)
+                  String(item.userId)
                 }}</span>
               </el-option>
             </el-select>
@@ -613,7 +613,8 @@ export default {
           const ruselt = await getOrganRole({
             id: val,
           });
-          this.educationList = ruselt?.data?.educationId;
+          this.educationList = ruselt?.data?.EDUCATION;
+          console.log(this.educationList)
           if (!this.educationList || this.educationList?.length <= 0) {
             this.$bus.$emit("showguide", ["teamManager"]);
           }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -519,7 +519,7 @@
             filterable
           >
             <el-option
-              v-for="item in selects.roles.educationId"
+              v-for="item in selects.roles.EDUCATION"
               :key="item.userId"
               :label="item.userName"
               :value="item.userId"

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -400,6 +400,7 @@ export default {
       // employeeFindEmployeeByRole
       try {
         const res = await queryEmployByOrganId({ organId: row.id, rows: 9999, demissionflag:false,lockFlag:false});
+        console.log(res)
         this.$set(this, "employeeList", res.data.rows);
       } catch (e) {
         console.log(e);

src/views/evaluateManager/vipEvaluateList.vue

@@ -60,7 +60,7 @@
           placeholder="乐团主管"
         >
           <el-option
-            v-for="(item, index) in selects.roles.educationId"
+            v-for="(item, index) in selects.roles.EDUCATION"
             :key="index"
             :value="item.userId"
             :label="item.userName"

src/views/indexErrDataRecord/components/patrol.vue

@@ -70,7 +70,7 @@
             placeholder="请选择乐团主管"
           >
             <el-option
-              v-for="(item, index) in selects.roles.educationId"
+              v-for="(item, index) in selects.roles.EDUCATION"
               :key="index"
               :label="item.userName"
               :value="item.userId"

src/views/musicInspection/index.vue

@@ -69,7 +69,7 @@
             placeholder="请选择乐团主管"
           >
             <el-option
-              v-for="(item, index) in selects.roles.educationId"
+              v-for="(item, index) in selects.roles.EDUCATION"
               :key="index"
               :label="item.userName"
               :value="item.userId"

src/views/repairManager/repairList.vue

@@ -47,7 +47,7 @@
             filterable
           >
             <el-option
-              v-for="(item, index) in selects.roles.repairId"
+              v-for="(item, index) in selects.roles.REPAIR"
               :label="item.userName"
               :value="item.userId"
               :key="index"

src/views/teamBuild/components/teamBaseInfo.vue

@@ -251,12 +251,12 @@
             <el-option
               v-for="(item, key) in educationList"
               :key="key"
-              :label="item"
-              :value="Number(key)"
+              :label="item.userName"
+              :value="Number(item.userId)"
             >
-              <span style="float: left">{{ item }}</span>
+              <span style="float: left">{{ item.userName }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(key)
+                String(item.userId)
               }}</span>
             </el-option>
           </el-select>
@@ -292,12 +292,12 @@
             <el-option
               v-for="(item, key) in technician"
               :key="key"
-              :label="item"
-              :value="key"
+              :label="item.userId"
+              :value="item.userName"
             >
-              <span style="float: left">{{ item }}</span>
+              <span style="float: left">{{ item.userId }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(key)
+                String(userName)
               }}</span>
             </el-option>
           </el-select>
@@ -312,12 +312,12 @@
             <el-option
               v-for="(item, key) in transactionList"
               :key="key"
-              :label="item"
-              :value="key"
+              :label="item.userName"
+              :value="item.userId"
             >
-              <span style="float: left">{{ item }}</span>
+              <span style="float: left">{{ item.userName }}</span>
               <span style="float: right; color: #8492a6; font-size: 13px">{{
-                String(key)
+                String(item.userId)
               }}</span>
             </el-option>
           </el-select>
@@ -794,12 +794,12 @@ export default {
           id: val,
         });
         // 乐团主管
-        this.educationList = ruselt?.data?.educationId;
+        this.educationList = ruselt?.data?.EDUCATION;
         // 维修技师
-        this.technician =ruselt?.data?.repairId
+        this.technician =ruselt?.data?.REPAIR
         // this.bossList = ruselt?.data?.TEAM_TEACHER;
              // 衔接老师
-        this.transactionList = ruselt?.data?.joinTeacherId;
+        this.transactionList = ruselt?.data?.JOIN_TEACHER;
       } catch (e) {
         console.log(e);
       }