修改组织架构

src/components/PlanRegister.vue

@@ -69,6 +69,7 @@
                   </el-col>
                   <el-col :span="12" style="text-align: right">
                     <el-select
+                    v-show="userInfo.roleType!='3'"
                       :collapse-tags="true"
                       multiple
                       placeholder="请选择辅导员"
@@ -184,7 +185,7 @@ export default {
       isView: true,
       rules: {
         planName: [{ required: true, message: "请输入计划名称", trigger: "blur" }],
-        endTime: [{ required: true, message: "请输结束时间", trigger: "blur" }],
+        endTime: [{ required: true, message: "请输入结束时间", trigger: "blur" }],
         checkedList: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
       },
       userInfo: {},
@@ -223,6 +224,8 @@ export default {
       scaleAndTaskList: [],
       scaleList: [],
       taskList: [],
+      //辅导员的组织架构
+    teacherOrgList:[]
     };
   },
   //需要监听变量
@@ -294,7 +297,6 @@ export default {
             for (let i = 0; i < listRequest.length; i++) {
               this.ruleForm.checkboxGroup2.push(listRequest[i].flag);
             }
-            // instructorOption
           } else {
             // this.groupData = [];
           }
@@ -310,6 +312,7 @@ export default {
       this.$http.get(`/user/findAllCounsellor`, {}, (res) => {
         //  this.$toast.success({message:'成功'});
         if (res && res.code == 200) {
+         
           //将值赋值给list
           if (res.data.length > 0) {
             //
@@ -322,7 +325,6 @@ export default {
               };
               this.instructorOption.push(obj);
             }
-            // instructorOption
           } else {
             // this.groupData = [];
           }
@@ -475,13 +477,16 @@ export default {
     //获取组织架构方法--------------------开始-----------------------
     getChannel() {
       this.$http.get(
-        `/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`,
+        // `/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`,
+        `/org/findAllOrgByCurrent`,
         {},
         (res) => {
           //  this.$toast.success({message:'成功'});
           if (res && res.code == 200) {
             //将值赋值给list
             if (res.data.length > 0) {
+
+              //当用户角色为3时  需要将数据处理为辅导员的数据
               //选择出来需要的级
               //--------------------------------开始
               let list = [];
@@ -511,7 +516,6 @@ export default {
               this.ppData = JSON.parse(JSON.stringify(resAdd));
               let forRes = this.arrToTree(resAdd);
               let resultRes = this.deleteChildren(forRes);
-
               let levelList = this.markersFun(resultRes, 1);
               this.treeData = levelList;
             } else {

src/views/manage/channelInfo/orderSettlement.vue

@@ -182,7 +182,8 @@ export default {
     //获取组织架构方法--------------------开始-----------------------
     getChannel() {
       this.$http.get(
-        `/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`,
+        // `/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`,
+        `/org/findAllOrgByCurrent`,
         {},
         (res) => {
           //  this.$toast.success({message:'成功'});