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

@@ -372,6 +372,7 @@
                  trigger: "click"
                }],
                span: 24,
                // value:'986926'
              },
              {
                label: "登录账号",
@@ -746,6 +747,9 @@
    }
  },
  methods: {
    beOpen(done,type){
      console.log(done,type)
    },
    //esc取消键操作
    handleClose(done) {
      this.$confirm('确认关闭？')
@@ -765,8 +769,6 @@
      }else {
        this.passVisible=true;
      }
      //console.log("selectionList",this.selectionList)
      //console.log(this.UserPwdstrategyVO)
    },
    // 设置密码策略，传递下拉框的id和多选框的id
    passhandle(){
@@ -839,21 +841,22 @@
      });
    },
    rowSave(row, done, loading) {
      row.deptId = row.deptId.join(",");
      row.roleId = row.roleId.join(",");
      row.postId = row.postId.join(",");
      add(row).then(() => {
        this.initFlag = false;
        this.onLoad(this.page);
        this.$message({
          type: "success",
          message: "操作成功!"
        row.deptId = row.deptId.join(",");
        row.roleId = row.roleId.join(",");
        row.postId = row.postId.join(",");
        console.log('3',row)
        add(row).then(() => {
          this.initFlag = false;
          this.onLoad(this.page);
          this.$message({
            type: "success",
            message: "操作成功!"
          });
          done();
        }, error => {
          window.console.log(error);
          loading();
        });
        done();
      }, error => {
        window.console.log(error);
        loading();
      });
    },
    rowUpdate(row, index, done, loading) {
      row.deptId = row.deptId.join(",");
@@ -1025,22 +1028,29 @@
      })
    },
    beforeOpen(done, type) {
      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(",");
          }
        });
      console.log(type)
      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('请选择一条所属租户')
      }
      this.initFlag = true;
      done();
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;