修改管理端职务--及趋势代码

src/components/Register.vue

@@ -57,25 +57,26 @@
                 clearable
               ></el-cascader>
             </el-form-item>
-            <!-- <el-form-item label="所属届" prop="grade">
+            <el-form-item label="职务" prop="position">
               <el-select
-                v-model="ruleForm.grade"
+                v-model="ruleForm.position"
                 clearable
-                placeholder="请选择所属届"
+                placeholder="请选择职务"
                 style="width: 100%"
               >
                 <el-option
-                  v-for="item in gradeOption"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
+                  v-for="item in listOption"
+                  :key="item.paramValue"
+                  :label="item.paramName"
+                  :value="item.paramValue"
                 >
                 </el-option>
               </el-select>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item label="学号" prop="studentNumber">
               <el-input v-model="ruleForm.studentNumber"></el-input>
             </el-form-item>
+
             <el-row>
               <el-col :span="12">
                 <el-form-item label="姓名" prop="name">
@@ -91,26 +92,8 @@
                 </el-form-item>
               </el-col>
             </el-row>
-
-            <!-- <el-form-item v-if="isView" label="密码" prop="password">
-              <el-input
-                type="password"
-                v-model="ruleForm.password"
-                autocomplete="off"
-              ></el-input>
-            </el-form-item>
-            <el-form-item v-if="isView" label="确认密码" prop="comPassword">
-              <el-input
-                type="password"
-                v-model="ruleForm.comPassword"
-                autocomplete="off"
-              ></el-input>
-            </el-form-item> -->
             <div class="dig_button">
               <el-button type="info" round @click="resetData()">清空</el-button>
-              <!-- <el-button type="success" round @click="submitForm('ruleForm')"
-                >提交</el-button
-              > -->
               <el-button type="success" round @click="submitCom()">提交</el-button>
             </div>
           </el-form>
@@ -188,6 +171,7 @@ export default {
       //渠道列表
       channelList: [{ name: "渠道天成", id: "1" }],
       ruleForm: {
+        position: "",
         //所属组织架构
         group: "",
         group3: "",
@@ -206,7 +190,9 @@ export default {
       isView: true,
       rules: {
         group: [{ required: true, message: "请选择组织架构", trigger: "change" }],
+
         group3: [{ required: true, message: "请选择组织架构", trigger: "change" }],
+        position: [{ required: true, message: "请选择职务", trigger: "change" }],
         studentNumber: [{ required: true, message: "请输入学号", trigger: "blur" }],
         name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
         sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
@@ -215,6 +201,7 @@ export default {
         // password: [{ required: true, validator: validatePass, trigger: "blur" }],
         // comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],
       },
+      listOption: [],
     };
   },
   mounted() {
@@ -222,6 +209,20 @@ export default {
     // this.ruleForm.type = "3";
   },
   methods: {
+    getPotion() {
+      return new Promise((resolve, reject) => {
+        let url = `/param/findAllByType?type=1`;
+        this.$http.get(url, {}, (res) => {
+          if (res.code == 200) {
+            this.listOption = res.data;
+            resolve();
+          } else {
+            this.message.error(res.msg);
+            reject();
+          }
+        });
+      });
+    },
     //获取辅导员组织架构方法
     getInstructor() {
       this.options3 = [];
@@ -294,7 +295,10 @@ export default {
               // console.log(forRes)
               let resultRes = this.deleteChildren(forRes);
 
-              this.groupData = resultRes[0].children;
+              let list = resultRes[0].children;
+              this.groupData = list.filter((item) => {
+                return item.extend != -1;
+              });
             } else {
               this.groupData = [];
             }
@@ -380,7 +384,7 @@ export default {
     },
     open(val) {
       this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
-
+      this.getPotion();
       this.getGradeFun();
       this.cancle();
 
@@ -397,7 +401,9 @@ export default {
         this.$refs.ruleForm.clearValidate();
       });
     },
-    edit(val) {
+    async edit(val) {
+      this.ruleForm.position = "";
+      await this.getPotion();
       this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
       if (this.userInfo.roleType == "3") {
         this.getInstructor();
@@ -413,43 +419,19 @@ export default {
     //调用查询详情的接口
     queryUserDetail(val) {
       let url = `/user/findUserById?id=${val}`;
-
       this.$http.get(url, {}, (res) => {
         if (res && res.code == 200) {
           //获取返回值
           //根据将数据存储
           this.userDetailData = res.data;
           let a = [];
-
-          //当角色等于2时
-          // if (this.userInfo.roleType == "2") {
-          //   //
-
-          //   a.push(res.data.orgNo);
-          // }
-          // //当角色等于1时
-          // if (this.userInfo.roleType == "3") {
-          //   for (let i = 0; i < res.data.orgList.length; i++) {
-          //     if (i < 2) {
-          //       a.push(res.data.orgList[i].orgNo);
-          //     }
-          //   }
-          // }
-          // a.push(this.userInfo.orgNo);
-          // a.push(res.data.orgNo);
-          //判断用户登录类型
-          // debugger;
-          // for (let i = res.data.orgList.length; i > 0; i--) {
-          //   //
-          //   a.push(res.data.orgList[i - 1].orgNo);
-          // }
           //回显学号
           this.ruleForm.studentNumber = res.data.userNo;
           //回显姓名
           this.ruleForm.name = res.data.userName;
           //回显性别
           this.ruleForm.sex = res.data.gender;
-
+          this.ruleForm.position = res.data.position + "";
           if (this.userInfo.roleType == "3") {
             this.ruleForm.group3 = res.data.orgNo;
           } else if (this.userInfo.roleType == "4") {
@@ -471,6 +453,7 @@ export default {
       this.ruleForm.group3 = "";
       this.ruleForm.group = "";
       this.ruleForm.name = "";
+      this.ruleForm.position = "";
       this.ruleForm.studentNumber = "";
       // this.ruleForm.password = "";
       // this.ruleForm.comPassword = "";
@@ -490,15 +473,15 @@ export default {
       let validSp = [];
       if (this.isView) {
         if (this.userInfo.roleType == "3") {
-          validSp = ["group3", "studentNumber", "name", "sex"];
+          validSp = ["group3", "studentNumber", "position", "name", "sex"];
         } else if (this.userInfo.roleType == "4") {
-          validSp = ["group", "studentNumber", "name", "sex"];
+          validSp = ["group", "studentNumber", "position", "name", "sex"];
         }
       } else {
         if (this.userInfo.roleType == "3") {
-          validSp = ["group3", "studentNumber", "name", "sex"];
+          validSp = ["group3", "studentNumber", "position", "name", "sex"];
         } else if (this.userInfo.roleType == "4") {
-          validSp = ["group", "studentNumber", "name", "sex"];
+          validSp = ["group", "studentNumber", "position", "name", "sex"];
         }
       }
       let aa = [];
@@ -507,13 +490,13 @@ export default {
           aa.push(valid);
           //判断是编辑还是新增
           if (this.isView) {
-            if (aa.length == 4) {
+            if (aa.length == 5) {
               this.register();
             } else {
               this.disableFlagStatus();
             }
           } else {
-            if (aa.length == 4) {
+            if (aa.length == 5) {
               this.editUserFun();
             } else {
               this.disableFlagStatus();
@@ -549,6 +532,7 @@ export default {
           userNo: this.ruleForm.studentNumber,
           userName: this.ruleForm.name,
           gender: this.ruleForm.sex,
+          position: parseInt(this.ruleForm.position),
           // password: md5(this.ruleForm.password),
           //roleType     1学生
           roleType: "1",
@@ -608,6 +592,7 @@ export default {
       this.userDetailData.userName = this.ruleForm.name;
       this.userDetailData.gender = this.ruleForm.sex;
       this.userDetailData.userNo = this.ruleForm.studentNumber;
+      this.userDetailData.position = parseInt(this.ruleForm.position);
       this.$http.post(
         `/user/addOrUpdateUser`,
         {

src/components/TeacherRegister.vue

@@ -23,15 +23,15 @@
             <div slot=""></div>
             <div slot="footer"></div>
             <!-- :show-all-levels="false" -->
-            <!-- <el-form-item label="所属组织架构" prop="group">
+            <el-form-item label="所属组织架构" prop="group">
               <el-cascader
+              :disabled="!isView"
                 placeholder="请选择组织架构"
                 v-model="ruleForm.group"
                 :options="groupData"
-                
                 clearable
               ></el-cascader>
-            </el-form-item> -->
+            </el-form-item>
             <el-form-item label="编号" prop="studentNumber">
               <el-input v-model="ruleForm.studentNumber"></el-input>
             </el-form-item>
@@ -157,7 +157,7 @@ export default {
       },
       isView: true,
       rules: {
-        // group: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
+        group: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
         studentNumber: [{ required: true, message: "请输入编号", trigger: "blur" }],
         name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
         sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
@@ -184,27 +184,34 @@ export default {
     },
     //获取组织架构方法--------------------开始-----------------------
     getChannel() {
-      this.$http.get(`/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`, {}, (res) => {
-        //  this.$toast.success({message:'成功'});
-        if (res && res.code == 200) {
-          //将值赋值给list
-          if (res.data.length > 0) {
-            let resAdd = this.addPro(res.data);
-            this.ppData = JSON.parse(JSON.stringify(resAdd));
-            let forRes = this.arrToTree(resAdd);
-            // console.log('格式化的结构')
-            // console.log(forRes)
-            let resultRes = this.deleteChildren(forRes);
-
-            this.groupData = resultRes[0].children;
+      this.$http.get(
+        `/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`,
+        {},
+        (res) => {
+          //  this.$toast.success({message:'成功'});
+          if (res && res.code == 200) {
+            //将值赋值给list
+            if (res.data.length > 0) {
+              let resAdd = this.addPro(res.data);
+              this.ppData = JSON.parse(JSON.stringify(resAdd));
+              let forRes = this.arrToTree(resAdd);
+              // console.log('格式化的结构')
+              // console.log(forRes)
+              let resultRes = this.deleteChildren(forRes);
+              // this.groupData = resultRes[0].children;
+              let list = resultRes[0].children;
+              this.groupData = list.filter((item) => {
+                return item.extend == -1;
+              });
+            } else {
+              this.groupData = [];
+            }
+            // this.channelList = res.data;
           } else {
-            this.groupData = [];
+            this.$message.error(res.msg);
           }
-          // this.channelList = res.data;
-        } else {
-          this.$message.error(res.msg);
         }
-      });
+      );
     },
     //z增加
     addPro(val) {
@@ -274,7 +281,7 @@ export default {
     open(val) {
       this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
       this.cancle();
-      // this.getChannel();
+      this.getChannel();
       this.dialogVisible = true;
       this.isView = val;
 
@@ -324,6 +331,11 @@ export default {
           //   a.push(res.data.orgList[i - 1].orgNo);
           // }
           //回显学号
+          if (this.userInfo.roleType == "3") {
+            this.ruleForm.group3 = res.data.orgNo;
+          } else if (this.userInfo.roleType == "4") {
+            this.ruleForm.group = [res.data.orgNo];
+          }
           this.ruleForm.studentNumber = res.data.userNo;
           //回显姓名
           this.ruleForm.name = res.data.userName;
@@ -361,9 +373,9 @@ export default {
       let validSp = [];
       if (this.isView) {
         // validSp = ["group", "studentNumber", "name", "sex", "password", "comPassword"];
-        validSp = [ "studentNumber", "name", "sex"];
+        validSp = ["group","studentNumber", "name", "sex"];
       } else {
-        validSp = ["studentNumber", "name", "sex"];
+        validSp = ["group","studentNumber", "name", "sex"];
       }
       let aa = [];
       this.$refs["ruleForm"].validateField(validSp, (valid) => {
@@ -371,13 +383,13 @@ export default {
           aa.push(valid);
           //判断是编辑还是新增
           if (this.isView) {
-            if (aa.length == 3) {
+            if (aa.length == 4) {
               this.register();
             } else {
               this.disableFlagStatus();
             }
           } else {
-            if (aa.length == 3) {
+            if (aa.length == 4) {
               this.editUserFun();
             } else {
               this.disableFlagStatus();
@@ -399,7 +411,7 @@ export default {
       //   });
       //   return;
       // }
-      // this.queryOrgName();
+      this.queryOrgName();
 
       console.log(this.ruleForm.group);
       let that = this;
@@ -407,13 +419,14 @@ export default {
       this.$http.post(
         `/user/addOrUpdateUser`,
         {
-          orgNo:this.userInfo.orgNo,
-          orgName:this.userInfo.orgName,
-          // orgNo: this.ruleForm.group[this.ruleForm.group.length - 1],
-          // orgName: this.groupName,
+          // orgNo: this.userInfo.orgNo,
+          // orgName: this.userInfo.orgName,
+          orgNo: this.ruleForm.group[this.ruleForm.group.length - 1],
+          orgName: this.groupName,
           userNo: this.ruleForm.studentNumber,
           userName: this.ruleForm.name,
           gender: this.ruleForm.sex,
+          position: -1,
           // password: md5(this.ruleForm.password),
           //roleType     5超级管理员 4 院管理员  3 辅导员  2 教师 1学生
           roleType: "2",
@@ -440,11 +453,12 @@ export default {
     editUserFun() {
       let that = this;
       this.queryOrgName();
-      // this.userDetailData.orgNo = this.ruleForm.group[this.ruleForm.group.length - 1];
-      // this.userDetailData.orgName = this.groupName;
-      this.userDetailData.userName = this.ruleForm.name;
+      this.userDetailData.orgNo = this.ruleForm.group[this.ruleForm.group.length - 1];
+      this.userDetailData.orgName = this.groupName;
+      // this.userDetailData.userName = this.ruleForm.name;
+      // this.userDetailData.userNo = this.ruleForm.studentNumber;
       this.userDetailData.gender = this.ruleForm.sex;
-      this.userDetailData.userNo = this.ruleForm.studentNumber;
+     
       this.$http.post(
         `/user/addOrUpdateUser`,
         {
@@ -473,8 +487,8 @@ export default {
 };
 </script>
 <style lang="less" scoped>
-.el-form-item{
- margin-bottom: 5px !important;
+.el-form-item {
+  margin-bottom: 5px !important;
 }
 .dig_update /deep/.el-cascader {
   position: relative;
@@ -515,7 +529,7 @@ export default {
 }
 
 .dig_button {
-  margin-top:20px;
+  margin-top: 20px;
   display: flex;
   width: 100%;
   justify-content: space-around;

src/components/TreeData.vue

@@ -11,10 +11,19 @@
         <div :class="{ node: true, hasMate: treeData.mate }">
           <div class="person" @click="$emit('click-node', treeData)">
             <!-- <el-popover v-if="false" placement="top" width="180" trigger="hover"  > -->
-            <el-popover v-if="!isDetail&& !(
-                      userInfo.roleType == '3' ||
-                      (userInfo.roleType == '4' && Number(treeData.level) === 2)|| (userInfo.roleType == '5' && Number(treeData.level) === 3)
-                    )" placement="top" width="180" trigger="hover" >
+            <el-popover
+              v-if="
+                !isDetail &&
+                !(
+                  userInfo.roleType == '3' ||
+                  (userInfo.roleType == '4' && Number(treeData.level) === 2) ||
+                  (userInfo.roleType == '5' && Number(treeData.level) === 3)
+                )
+              "
+              placement="top"
+              width="180"
+              trigger="hover"
+            >
               <div style="margin: 0">
                 <el-button
                   size="mini"
@@ -30,7 +39,9 @@
                   v-if="
                     !(
                       userInfo.roleType == '3' ||
-                      (userInfo.roleType == '4' && Number(treeData.level) === 2)
+                      (userInfo.roleType == '4' && Number(treeData.level) === 2) ||
+                      (userInfo.roleType == '4' && Number(treeData.level) === 3) ||
+                      (userInfo.roleType == '5' && Number(treeData.level) === 4)
                     )
                   "
                   >编辑</el-button
@@ -89,10 +100,12 @@
               </div>
             </el-popover>
             <div
-            v-if="(!isDetail&& (
-                      userInfo.roleType == '3' ||
-                      (userInfo.roleType == '4' && Number(treeData.level) === 2)|| (userInfo.roleType == '5' && Number(treeData.level) === 3)
-                    ))"
+              v-if="
+                !isDetail &&
+                (userInfo.roleType == '3' ||
+                  (userInfo.roleType == '4' && Number(treeData.level) === 2) ||
+                  (userInfo.roleType == '5' && Number(treeData.level) === 3))
+              "
               class="avat"
               :class="{
                 parent: !treeData.level,

src/components/instructorRegister.vue

@@ -193,12 +193,14 @@ export default {
           if (res.data.length > 0) {
             for (let i = 0; i < res.data.length; i++) {
               //
-              let obj = {
-                value: `${res.data[i].orgNo}`,
-                label: res.data[i].orgName,
-                disabled: res.data[i].isOptional == "1" ? false : true,
-              };
-              this.options.push(obj);
+              if (res.data[i].extend != -1) {
+                let obj = {
+                  value: `${res.data[i].orgNo}`,
+                  label: res.data[i].orgName,
+                  disabled: res.data[i].isOptional == "1" ? false : true,
+                };
+                this.options.push(obj);
+              }
             }
             if (listTmp.length > 0) {
               this.ruleForm.grade = listTmp;
@@ -237,8 +239,11 @@ export default {
               // console.log('格式化的结构')
               // console.log(forRes)
               let resultRes = this.deleteChildren(forRes);
-
-              this.groupData = resultRes[0].children;
+              let list = resultRes[0].children;
+              this.groupData = list.filter((item) => {
+                return item.extend != -1;
+              });
+              // this.groupData = resultRes[0].children;
             } else {
               this.groupData = [];
             }
@@ -457,7 +462,7 @@ export default {
           orgName: list[i].orgName,
           orgNo: list[i].orgNo,
           parentOrgNo: list[i].parentOrgNo,
-          extend:list[i].extend
+          extend: list[i].extend,
         };
         listTm.push(obj);
       }
@@ -472,6 +477,7 @@ export default {
           userNo: this.ruleForm.studentNumber,
           userName: this.ruleForm.name,
           gender: this.ruleForm.sex,
+          position: -1,
           //   password: md5(this.ruleForm.password),
           //roleType     1普通用户    roleType   管理员
           roleType: "3",
@@ -506,7 +512,7 @@ export default {
           orgName: list[i].orgName,
           orgNo: list[i].orgNo,
           parentOrgNo: list[i].parentOrgNo,
-          extend:list[i].extend
+          extend: list[i].extend,
         };
         listTm.push(obj);
       }

src/components/manageRegister.vue

@@ -418,6 +418,7 @@ export default {
           userNo: this.ruleForm.studentNumber.trim(),
           userName: this.ruleForm.name,
           gender: this.ruleForm.sex,
+          position:-1,
           // password: md5(this.ruleForm.password),
           //roleType     1普通用户    roleType   管理员
           roleType: "4",

src/views/loginNew.vue

@@ -180,7 +180,7 @@ export default {
                 // }
               } else if (res && res.code == 2001) {
                 //调用刷新的方法
-                this.getCode();
+                // this.getCode();
                 this.$message({
                   message: res.msg,
                   type: "error",

src/views/manage/channelInfo/orderSettlement.vue

@@ -165,6 +165,11 @@ export default {
       let currentYear = date.getFullYear();
       let preYear = currentYear - 12;
       let list = [];
+      let ji = {
+          value: -1 + "",
+          label: -1 + "级(教师)",
+        };
+      list.push(ji)
       for (let i = preYear; i < currentYear + 1; i++) {
         //
         let obj = {
@@ -173,6 +178,7 @@ export default {
         };
         list.push(obj);
       }
+  
       this.gradeOption = list.reverse();
     },
     changeDir() {

src/views/manage/manageMain.vue

@@ -490,21 +490,21 @@ export default {
           {
             id: "0",
             name: "学生管理",
-            icon: require("../../assets/menu/user.png"),
+            icon: require("../../assets/menu/yuan.png"),
             showItem: true,
             path: "/manage/userManage",
           },
-          // {
-          //   id: "5",
-          //   name: "教师管理",
-          //   icon: require("../../assets/menu/user.png"),
-          //   showItem: true,
-          //   path: "/manage/teacherManage",
-          // },
+          {
+            id: "5",
+            name: "教师管理",
+            icon: require("../../assets/menu/yuan.png"),
+            showItem: true,
+            path: "/manage/teacherManage",
+          },
           {
             id: "6",
             name: "辅导员管理",
-            icon: require("../../assets/menu/user.png"),
+            icon: require("../../assets/menu/yuan.png"),
             showItem: true,
             path: "/manage/instructorManage",
           },
@@ -576,7 +576,7 @@ export default {
           {
             id: "0",
             name: "学生管理",
-            icon: require("../../assets/menu/user.png"),
+            icon: require("../../assets/menu/yuan.png"),
             showItem: true,
             path: "/manage/userManage",
           },

src/views/manage/teacherManage.vue

@@ -23,7 +23,7 @@
             ></el-cascader>
             <!-- :props="{ checkStrictly: true }" -->
             <el-cascader
-              v-show="userInfo.roleType == '2'"
+              v-show="userInfo.roleType == '4'"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
@@ -52,7 +52,7 @@
             <el-button type="success" round class="add_class" @click="fileVisible = true"
               >批量导入</el-button
             >
-            <el-button type="info" round @click="addUser">单独注册</el-button>
+            <el-button type="info" round @click="addUser">新增</el-button>
           </div>
         </el-col>
       </el-row>
@@ -208,20 +208,21 @@
           <p v-show="!isDelete" class="dig_title">批量导入</p>
           <!-- 先选择组织架构 -->
           <!-- :props="{ checkStrictly: true }" -->
-          <!-- <el-cascader
+          <el-cascader
+            @change="queryGrade"
+            v-show="userInfo.roleType == '4'"
             placeholder="请选择组织架构"
             v-model="groupLead"
             :options="groupData"
             clearable
-          ></el-cascader> -->
+          ></el-cascader>
           <el-upload
+            ref="uploadFileUser"
             class="upload-demo"
-            style="margin-top: 40px"
+            style="margin-top: 20px"
             drag
             :before-upload="beforeUploadFun"
-            :action="
-              basePath + `/user/userImport?orgNo=${this.userInfo.orgNo}&roleType=2`
-            "
+            :action="filePath"
             :headers="headers"
             :on-success="fileSuccess"
             :on-error="fileError"
@@ -317,6 +318,7 @@ export default {
       invitationCode: "",
       roleType: "0",
       type: 0,
+      filePath: "/user/userImport",
       view: {
         name: "",
         studentNumber: "",
@@ -345,12 +347,63 @@ export default {
     this.searchTarget();
   },
   methods: {
+    queryGrade() {
+      if (this.userInfo.roleType == "4") {
+        for (let i = 0; i < this.ppData.length; i++) {
+          if (this.groupLead[this.groupLead.length - 1] == this.ppData[i].orgNo) {
+            this.grade = this.ppData[i].extend;
+          }
+        }
+        this.filePath =
+          basePath +
+          `/user/userImport?orgNo=${
+            this.groupLead[this.groupLead.length - 1]
+          }&roleType=2&grade=${this.grade}`;
+      } else if (this.userInfo.roleType == "3") {
+        for (let i = 0; i < this.options3.length; i++) {
+          if (this.options3[i].value == this.group4) {
+            // this.groupName = this.options3[i].label;
+            this.grade = this.options3[i].extend;
+          }
+        }
+        this.filePath =
+          basePath +
+          `/user/userImport?orgNo=${this.group4}&roleType=2&grade=${this.grade}`;
+      }
+    },
     //文件上传之前
     beforeUploadFun(file) {
-      //查询是否选择了组织架构
-      // if (this.groupLead.length == 0) {
+      //判断当前用户时辅导员还是院管理员
+      if (this.userInfo.roleType == "4") {
+        //查询是否选择了组织架构
+        if (this.groupLead.length == 0) {
+          this.$message({
+            message: "请选择组织架构",
+            type: "error",
+          });
+          return false;
+        }
+        // this.filePath =
+        //   basePath +
+        //   `/user/userImport?orgNo=${
+        //     this.groupLead[this.groupLead.length - 1]
+        //   }&roleType=1&grade=${this.grade}`;
+      } else if (this.userInfo.roleType == "3") {
+        if (this.group4 == "") {
+          this.$message({
+            message: "请选择组织架构",
+            type: "error",
+          });
+          return false;
+        }
+
+        // this.filePath =
+        //   basePath +
+        //   `/user/userImport?orgNo=${this.group4}&roleType=1&grade=${this.grade}`;
+      }
+      // if (this.grade == "") {
       //   this.$message({
-      //     message: "请选择组织架构",
+      //     message: "请选择所属届",
       //     type: "error",
       //   });
       //   return false;
@@ -427,8 +480,10 @@ export default {
               // console.log('格式化的结构')
               // console.log(forRes)
               let resultRes = this.deleteChildren(forRes);
-
-              this.groupData = resultRes[0].children;
+              let list = resultRes[0].children;
+              this.groupData =list.filter((item)=>{
+                return item.extend==-1
+              })
             } else {
               this.groupData = [];
             }

src/views/manage/tendency.vue

@@ -167,7 +167,7 @@
             margin-top: 10px;
           "
         >
-          {{ className }}<span v-show='year!=""'>{{year}}年</span> 近10次趋势统计
+          {{ className }}<span v-show="year != ''">{{ year }}年</span> 近10次趋势统计
         </div>
         <div style="width: 100%; height: 70vh" class="block_lei">
           <QSChart
@@ -668,7 +668,7 @@ export default {
         if (currentYear == ji) {
           this.optionsYear = [
             {
-              label: `${currentYear}'年'`,
+              label: `${currentYear}年`,
               value: ji,
             },
           ];
@@ -695,7 +695,7 @@ export default {
         if (currentYear == ji) {
           this.optionsYear = [
             {
-              label: `${currentYear}'年'`,
+              label: `${currentYear}年`,
               value: ji,
             },
           ];
@@ -802,7 +802,10 @@ export default {
 
                 let resultRes = this.deleteChildren(forRes);
 
-                this.groupData = resultRes[0].children;
+                let list = resultRes[0].children;
+                this.groupData = list.filter((item) => {
+                  return item.extend != -1;
+                });
                 resole(1);
               } else {
                 this.groupData = [];

src/views/manage/userManage.vue

@@ -13,14 +13,6 @@
               placeholder="请输入学号"
             ></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
-            <!-- :props="{ checkStrictly: true }" -->
-            <!-- <el-cascader
-              v-show="userInfo.roleType == '3'"
-              placeholder="请选择组织架构"
-              v-model="group"
-              :options="groupData"
-              clearable
-            ></el-cascader> -->
             <el-select
               v-model="group3"
               clearable
@@ -45,6 +37,16 @@
               clearable
             ></el-cascader>
             &nbsp;&nbsp;&nbsp;&nbsp;
+            <el-select v-model="position" clearable placeholder="请选择职务">
+              <el-option
+                v-for="item in listOption"
+                :key="item.paramValue"
+                :label="item.paramName"
+                :value="item.paramValue"
+              >
+              </el-option>
+            </el-select>
+            &nbsp;&nbsp;&nbsp;&nbsp;
             <!-- <span style="font-size: 16px;">性别:</span>&nbsp;&nbsp; -->
             <div style="display: flex; flex-direction: row; align-items: center">
               <span
@@ -64,18 +66,17 @@
               >搜索</el-button
             >
             <el-button type="info" round @click="clearSearch">清空</el-button>
-            <el-button type="success" round class="add_class" @click="openFileUp"
-              >批量导入</el-button
-            >
-            <el-button type="info" round @click="addUser">新增</el-button>
           </div>
         </el-col>
       </el-row>
-      <!-- <el-row class="add_user_class">
+      <el-row class="add_user_class">
         <el-col :span="24">
-          <div class="search-head"></div>
+          <el-button type="success" round class="add_class" @click="openFileUp"
+            >批量导入</el-button
+          >
+          <el-button type="info" round @click="addUser">新增</el-button>
         </el-col>
-      </el-row> -->
+      </el-row>
 
       <div class="table-content" style="flex: 1; overflow: auto">
         <el-table
@@ -401,6 +402,7 @@ export default {
       group4: "",
       filePath: "/user/userImport",
       listOption: [],
+      position: "",
     };
   },
   created() {},
@@ -640,8 +642,12 @@ export default {
               // console.log('格式化的结构')
               // console.log(forRes)
               let resultRes = this.deleteChildren(forRes);
+              let list = resultRes[0].children;
+              this.groupData =list.filter((item)=>{
+                return item.extend!=-1
+              })
+              //将级等于-1的过滤掉
 
-              this.groupData = resultRes[0].children;
             } else {
               this.groupData = [];
             }
@@ -723,6 +729,7 @@ export default {
       this.sex = "";
       this.group = "";
       this.group3 = "";
+      this.position = "";
       this.searchTarget();
     },
 
@@ -773,7 +780,7 @@ export default {
             : `&orgNo=${this.group[this.group.length - 1]}`
         }${this.name == "" ? "" : `&userName=${this.name}`}${
           this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
-        }`;
+        }${this.position != "" ? `&position=${this.position}` : ""}`;
         //辅导员进来的时候
       } else if (this.userInfo.roleType == "3") {
         url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
@@ -782,7 +789,7 @@ export default {
           this.group3 == "" ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${this.group3}`
         }${this.name == "" ? "" : `&userName=${this.name}`}${
           this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
-        }`;
+        }${this.position != "" ? `&position=${this.position}` : ""}`;
       }
 
       this.$http.get(url, {}, (res) => {