修改组织架构

src/components/TreeData.vue

@@ -8,9 +8,9 @@
           extend: treeData.children && treeData.children.length && treeData.extend,
         }"
       >
-        <div :class="{ node: true, hasMate: treeData.mate }">
+        <div :class="{ node: true, hasMate: treeData.mate }" >
           <div class="person" @click="$emit('click-node', treeData)">
-            <el-popover v-if="!isDetail" placement="top" width="180" trigger="hover">
+            <el-popover v-if="!isDetail" placement="top" width="180" trigger="hover"  >
               <div style="margin: 0">
                 <el-button
                   size="mini"
@@ -82,6 +82,7 @@
 </template>
 
 <script>
+import { oSessionStorage } from "../utils/utils";
 export default {
   name: "TreeChart",
   props: {
@@ -94,6 +95,7 @@ export default {
   data() {
     return {
       treeData: {},
+      userInfo:{}
     };
   },
 
@@ -126,6 +128,9 @@ export default {
       deep: true,
     },
   },
+  mounted(){
+    this.userInfo=JSON.parse(oSessionStorage.getItem("userInfo"));
+  },
   methods: {
     toggleExtend(treeData) {
       treeData.extend = !treeData.extend;

src/views/manage/channelInfo/orderSettlement.vue

@@ -64,7 +64,16 @@ export default {
       ppData: [],
       groupData: [],
 
-      treeData: {
+      // treeData: {
+      //   //公司名称
+      //   orgName: "大米科技公司",
+      //   proportionShares: "100",
+      //   //公司层级
+      //   level: 2,
+      //   //公司编号
+      //   orgNo: 1,
+      // },
+       treeData: {
         //公司名称
         orgName: "大米科技公司",
         proportionShares: "100",
@@ -135,6 +144,7 @@ export default {
 
               let levelList = this.markersFun(resultRes, 1);
               console.log("格式化的结构且去掉children");
+  
               // console.log(JSON.stringify(levelList));
               this.treeData = levelList[0];
               console.log(levelList[0]);

src/views/manage/userManage.vue

@@ -237,7 +237,23 @@
 
           <!-- 先选择组织架构 -->
           <!-- :props="{ checkStrictly: true }" -->
+          <el-select
+            style="width: 100%"
+            v-model="group4"
+            clearable
+            placeholder="请选择组织架构"
+            v-show="userInfo.roleType == '3'"
+          >
+            <el-option
+              v-for="item in options3"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
           <el-cascader
+            v-show="userInfo.roleType == '4'"
             placeholder="请选择组织架构"
             v-model="groupLead"
             :options="groupData"
@@ -263,12 +279,7 @@
             style="margin-top: 20px"
             drag
             :before-upload="beforeUploadFun"
-            :action="
-              basePath +
-              `/user/userImport?orgNo=${
-                groupLead[groupLead.length - 1]
-              }&roleType=1&grade=${grade}`
-            "
+            :action="filePath"
             :headers="headers"
             :on-success="fileSuccess"
             :on-error="fileError"
@@ -376,6 +387,8 @@ export default {
       headers: {},
       grade: "",
       gradeOption: [],
+      group4: "",
+      filePath:''
     };
   },
   created() {},
@@ -429,13 +442,28 @@ export default {
     },
     //文件上传之前
     beforeUploadFun(file) {
-      //查询是否选择了组织架构
-      if (this.groupLead.length == 0) {
-        this.$message({
-          message: "请选择组织架构",
-          type: "error",
-        });
-        return false;
+      //判断当前用户时辅导员还是院管理员
+      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 == "") {
@@ -508,12 +536,10 @@ export default {
       //根据辅导员ID查询其下边的组织架构
       let url = `/user/findUserById?id=${this.userInfo.id}`;
       this.$http.get(url, {}, (res) => {
-        console.log("res");
-        console.log(res);
-        debugger;
+  
         if (res && res.code == 200) {
           //辅导员组织架构
-          res.data.gradeEntities;
+          // res.data.gradeEntities;
           for (let i = 0; i < res.data.gradeEntities.length; i++) {
             let obj = {
               value: res.data.gradeEntities[i].orgNo,
@@ -626,7 +652,7 @@ export default {
       // 搜索需要的性别
       this.sex = "";
       this.group = "";
-      this.group3='';
+      this.group3 = "";
       this.searchTarget();
     },
 
@@ -678,14 +704,12 @@ export default {
         }${this.name == "" ? "" : `&userName=${this.name}`}${
           this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
         }`;
-          //辅导员进来的时候
+        //辅导员进来的时候
       } else if (this.userInfo.roleType == "3") {
         url = `/user/findUserListByPage?pageSize=${this.pageSize}&pageNum=${
           this.pageNum
         }&roleType=1${this.sex == "" ? "" : `&gender=${this.sex}`}${
-          this.group3== ''
-            ? `&orgNo=${this.userInfo.orgNo}`
-            : `&orgNo=${this.group3}`
+          this.group3 == "" ? `&orgNo=${this.userInfo.orgNo}` : `&orgNo=${this.group3}`
         }${this.name == "" ? "" : `&userName=${this.name}`}${
           this.studentNumber == "" ? "" : `&userNo=${this.studentNumber}`
         }`;