Administrator
2021-11-11 584f2d892201e6fbd0a932f8fb8571734c7797a8
src/views/system/user.vue
@@ -262,8 +262,9 @@
      treeData: [],
      treeOption: {
        nodeKey: "id",
        lazy: true,
        treeLoad: "", //处理权限  在created中
        defaultExpandAll:true,
        // lazy: false,
        // treeLoad: "", //处理权限  在created中
        //  function (node, resolve) {
        //   const parentId = node.level === 0 ? 0 : node.data.id;
        //   //公安局进入
@@ -289,6 +290,26 @@
          children: "children",
        },
      },
      // treeOption:{
      //   nodeKey: "id",
      //   defaultExpandAll:true,
      //   addBtn: false,
      //   menu: false,
      //   size: "small",
      //   formOption:{
      //     labelWidth:100,
      //     column:[{
      //         label:'自定义项',
      //         prop:'test'
      //     }],
      //   },
      //   props:{
      //     labelText:'标题',
      //     label:'label',
      //     value:'value',
      //     children:'children'
      //   }
      // },
      option: {
        height: "auto",
        calcHeight: 80,
@@ -343,15 +364,17 @@
                label: "所属组织机构",
                prop: "deptId",
                type: "tree",
                dicUrl: "/api/blade-system/dept/lazy-tree",
                defaultExpandAll:true,
                // dicUrl: "/api/blade-system/dept/lazy-tree",
                props: {
                  label: "title",
                  value: "id",
                },
                hide: !website.tenantMode,
                addDisplay: website.tenantMode,
                editDisplay: website.tenantMode,
                viewDisplay: website.tenantMode,
                dicData:[],
                // hide: !website.tenantMode,
                // addDisplay: website.tenantMode,
                // editDisplay: website.tenantMode,
                // viewDisplay: website.tenantMode,
                rules: [
                  {
                    required: true,
@@ -680,37 +703,32 @@
      this.sizes = [5, 19];
    }
    var that = this;
    //公安局进入
    var jurisdiction = "";
    if (this.userInfo.role_name == "公安管理员") {
      jurisdiction = this.userInfo.jurisdiction;
      this.treeOption.treeLoad = function (node, resolve) {
        const parentId = node.level === 0 ? 0 : node.data.id;
        getDeptLazyTree(parentId, jurisdiction).then((res) => {
          resolve(
            res.data.data.map((item) => {
              return {
                ...item,
                leaf: !item.hasChildren,
              };
            })
          );
        });
      };
      var  parentId = this.userInfo.dept_id;
      var  userId = this.userInfo.Id;
      getDeptLazyTree(parentId, userId).then((res) => {
        that.treeData = res.data.data;
      });
    } else {
      this.treeOption.treeLoad = function (node, resolve) {
        const parentId = node.level === 0 ? 0 : node.data.id;
        getDeptLazyTree(parentId).then((res) => {
          resolve(
            res.data.data.map((item) => {
              return {
                ...item,
                leaf: !item.hasChildren,
              };
            })
          );
        });
      };
      // this.treeOption.treeLoad = function (node, resolve) {
      //   const parentId = node.level === 0 ? 0 : node.data.id;
      //   getDeptLazyTree(parentId).then((res) => {
      //     resolve(
      //       res.data.data.map((item) => {
      //         return {
      //           ...item,
      //           leaf: !item.hasChildren,
      //         };
      //       })
      //     );
      //   });
      // };
      getDeptLazyTree(0).then((res) => {
        that.treeData = res.data.data;
      });
      this.treeOption.defaultExpandAll = false;
    }
  },
  mounted() {
@@ -735,21 +753,43 @@
        var k = res.data.data;
        var b = [];
        if (d == "保安公司管理员") {
          console.log(k);
          // console.log(k);
          for (var n in k) {
            if (k[n].title == "保安" || k[n].title == "保安公司管理员") {
              b.push(k[n]);
            }
          }
          column.dicData = b;
        } else {
        } else if(d == "公安管理员"){
          for (var i in k) {
            if (k[i].title == "公安管理员") {
              b.push(k[i]);
            }
          }
          column.dicData = b;
        }else {
          column.dicData = k;
        }
      });
      getDeptTree(tenantId).then((res) => {
      //公安局进入
    if (this.userInfo.role_name == "公安管理员" || this.userInfo.role_name == "保安公司管理员") {
      var  parentId = this.userInfo.dept_id;
      var  userId = this.userInfo.Id;
      getDeptLazyTree(parentId, userId).then((res) => {
        const column = this.findObject(this.option.group, "deptId");
        column.dicData = res.data.data;
      });
    } else {
      getDeptLazyTree(0).then((res) => {
        const column = this.findObject(this.option.group, "deptId");
        column.dicData = res.data.data;
      });
    }
      // getDeptTree(tenantId).then((res) => {
      //   const column = this.findObject(this.option.group, "deptId");
      //   column.dicData = res.data.data;
      // });
      // getPostList(tenantId).then((res) => {
      //   const column = this.findObject(this.option.group, "postId");
      //   column.dicData = res.data.data;
@@ -773,8 +813,6 @@
        deptname: row.$deptId,
      };
      getJurisdiction(params).then((res) => {
        console.log(res.data,123);
        console.log(res.data.data,1234);
        if (res.data.msg != "暂无承载数据") {
          row.jurisdiction = res.data.data;
        } else {
@@ -989,6 +1027,7 @@
      //公安局进入
      if (this.userInfo.role_name == "公安管理员") {
        params["jurisdiction"] = this.userInfo.jurisdiction;
        params["roleId"] = "1";
      }
      var test = /派出所|分局|公安局|市公安局$/g;
      var jurisdiction = "";