Source/UBCS-WEB/src/views/system/user.vue

@@ -177,7 +177,7 @@
  resetPassword, unlock
} from "@/api/system/user";
import {exportBlob} from "@/api/common";
import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
import {getDeptTree, getDeptLazyTree, updateUserStatus} from "@/api/system/dept";
import {getRoleTree} from "@/api/system/role";
import {getPostList} from "@/api/system/post";
import {mapGetters} from "vuex";
@@ -278,6 +278,7 @@
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        columnBtn:false,
        border: true,
        index: true,
        selection: true,
@@ -345,7 +346,7 @@
              required: true,
              message: "请选择用户平台",
              trigger: "blur"
            }]
            }],
          },
        ],
        group: [
@@ -373,7 +374,7 @@
                  trigger: "click"
                }],
                span: 24,
                value:"211833"
                value:""
              },
              {
                label: "登录账号",
@@ -392,6 +393,7 @@
                  label: "dictValue",
                  value: "dictKey"
                },
                value:'1',
                dataType: "number",
                slot: true,
                prop: "userType",
@@ -550,7 +552,7 @@
                  value: "id"
                },
                rules: [{
                  required: true,
                  required: false,
                  message: "请选择所属岗位",
                  trigger: "click"
                }],
@@ -740,6 +742,9 @@
    }
  },
  created() {
    updateUserStatus({userid:'1702600796324032513',status:true}).then(res=>{
      console.log(res)
    })
    this.selecload()
    const arr=JSON.parse(localStorage.getItem("updataid"))
    if(arr.user_id != '0' && arr.tenant_id !== '000000'){
@@ -1034,33 +1039,33 @@
      })
    },
    beforeOpen(done, type) {
      // console.log(type)
      //console.log(type)
      // console.log('this.tenantId',this.tenantId)
      // const column = this.findObject(this.option.group,'tenantId');
      // column.value=this.tenantId;
      // console.log('column',column)
      if(this.treeDeptId){
        if (["edit", "view"].includes(type)) {
          getUser(this.form.id).then(res => {
            this.form = res.data.data;
            if (this.form.hasOwnProperty("deptId")) {
              this.form.deptId = this.form.deptId.split(",");
            }
            if (this.form.hasOwnProperty("roleId")) {
              this.form.roleId = this.form.roleId.split(",");
            }
            if (this.form.hasOwnProperty("postId")) {
              this.form.postId = this.form.postId.split(",");
            }
          });
        }
        const prop = this.findObject(this.option.group, 'tenantId');
        console.log('1',prop)
        this.initFlag = true;
        done();
      }else {
        this.$message.warning('请选择一条所属租户')
      // if(this.treeDeptId){
      if (["edit", "view"].includes(type)) {
        getUser(this.form.id).then(res => {
          this.form = res.data.data;
          if (this.form.hasOwnProperty("deptId")) {
            this.form.deptId = this.form.deptId.split(",");
          }
          if (this.form.hasOwnProperty("roleId")) {
            this.form.roleId = this.form.roleId.split(",");
          }
          if (this.form.hasOwnProperty("postId")) {
            this.form.postId = this.form.postId.split(",");
          }
        });
      }
      const prop = this.findObject(this.option.group, 'tenantId');
      //console.log('1',prop)
      this.initFlag = true;
      done();
      // }else {
      //   this.$message.warning('请选择一条所属租户')
      // }
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;