提交一下 衔接老师

1

src/views/categroyManager/insideSetting/branchManager.vue

@@ -467,7 +467,7 @@ export default {
             organId: val,
             employeeRole: "EDUCATION",
           });
-          this.educationList = ruselt.data;
+          this.educationList = ruselt?.data?.EDUCATION;
         } catch (e) {
           console.log(e);
         }

src/views/teamBuild/components/teamBaseInfo.vue

@@ -180,6 +180,26 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="衔接老师" prop="transactionTeacherId">
+          <el-select
+            v-model.trim="topFrom.transactionTeacherId"
+            :disabled="!topFrom.section || basdisabled"
+            filterable
+            clearable
+          >
+            <el-option
+              v-for="item in transactionList"
+              :key="item.userId"
+              :label="item.realName"
+              :value="item.userId"
+            >
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{
+                String(item.userId)
+              }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item label="维修技师" prop="repairUserId">
           <el-select
@@ -243,45 +263,6 @@
             placeholder="选择日期"
           ></el-date-picker>
         </el-form-item>
-        <!-- <el-form-item label="招生年级" v-if="basdisabled">
-          <el-input
-            placeholder="请输入招生年级"
-            v-model.trim="startClassString"
-            :disabled="basdisabled"
-          ></el-input> -->
-        <!-- <el-tooltip
-            class="item"
-            effect="dark"
-            :content="startClassString"
-            placement="top-start"
-          >
-            <div style="width: 180px; overflow: hidden">
-              {{ startClassString }}
-            </div>
-          </el-tooltip> -->
-        <!-- </el-form-item> -->
-        <!-- <el-form-item
-          label="招生年级"
-          v-else
-          prop="startClass"
-          :rules="[{ required: true, message: '请选择招生年纪' }]"
-        >
-          <el-select
-            placeholder="起始年级"
-            clearable
-            multiple
-            collapse-tags
-            filterable
-            v-model.trim="topFrom.startClass"
-          >
-            <el-option
-              v-for="item in classStatus"
-              :value="item.value"
-              :label="item.label"
-              :key="item.value"
-            ></el-option>
-          </el-select>
-        </el-form-item> -->
         <el-form-item
           label="课酬结算标准"
           :rules="[{ required: true, message: '请选择课酬结算标准' }]"
@@ -424,6 +405,7 @@ export default {
         paymentValidEndDate: null, // 缴费有效期结束
         ownershipType: "OWN", // 合作机构类型
         repairUserId: null, // 维修技师
+        transactionTeacherId:null, // 衔接老师
       },
       baseInfo: {},
       money: 580,
@@ -437,6 +419,7 @@ export default {
       teacherList: [], // 获取老师列表
       educationList: [], // 乐团主管
       bossList: [],
+      transactionList: [],
       addList: [], // 教学地点列表
       activeTeam: [],
       teamid: "",
@@ -723,22 +706,23 @@ export default {
       try {
         const ruselt = await findUserByRole({
           organId: val,
-          employeeRole: "EDUCATION",
         });
-        this.educationList = ruselt.data;
+        this.educationList = ruselt?.data?.EDUCATION;
+        this.bossList = ruselt?.data?.TEAM_TEACHER;
+        this.transactionList = ruselt?.data?.TRANSACTION;
       } catch (e) {
         console.log(e);
       }
       // 获取运营主管
-      try {
-        const ruselt = await findUserByRole({
-          organId: val,
-          employeeRole: "TEAM_TEACHER",
-        });
-        this.bossList = ruselt.data;
-      } 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) {
@@ -748,15 +732,15 @@ export default {
     },
     chioseSchool(val) {
       // 清除教学点
-      this.topFrom.teacher = ''
-      if(val){
-        this.cooperationList.forEach(item=>{
-          if(item.id == val){
-              this.topFrom.teacher = item.educationUserId
+      this.topFrom.teacher = "";
+      if (val) {
+        this.cooperationList.forEach((item) => {
+          if (item.id == val) {
+            this.topFrom.teacher = item.educationUserId;
           }
-        })
+        });
       }
-      console.log(val)
+      console.log(val);
     },
     async gotoNext(str) {
       let tempStatus;
@@ -847,6 +831,7 @@ export default {
               ownershipType: this.topFrom.ownershipType,
               repairUserId: this.topFrom.repairUserId || null,
               feeType: this.topFrom.feeType,
+              transactionTeacherId:this.topFrom.transactionTeacherId
             };
             // obj.musicGroupPaymentEntities = [];
             // createTeam
@@ -1198,6 +1183,7 @@ export default {
         : null;
       this.paymentExpireDate = res.data.musicGroup.paymentExpireDate;
       this.applyExpireDate = res.data.musicGroup.applyExpireDate;
+      this.topFrom.transactionTeacherId = res.data.musicGroup.transactionTeacherId
       localStorage.setItem(`${this.teamid}base`, JSON.stringify(this.topFrom));
     },
     changeType(val) {