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

@@ -5,7 +5,7 @@
        <el-scrollbar style="height: auto;border-bottom-right-radius:8px ">
          <basic-container>
            <div class="abox">
              <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"/>
              <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick"/>
            </div>
          </basic-container>
        </el-scrollbar>
@@ -142,8 +142,7 @@
          class="passdialog"
          append-to-body
          title="设置密码策略"
          width="30%"
        >
          width="30%">
          <el-select v-model="sevalue" placeholder="请选择"  class="selects" @change="selChange" >
            <el-option
              v-for="item in seoptions"
@@ -155,9 +154,9 @@
            </el-option>
          </el-select>
            <span slot="footer" class="dialog-footer">
            <el-button @click="passVisible = false">取 消</el-button>
            <el-button type="primary" @click="passhandle">确 定</el-button>
  </span>
              <el-button @click="passVisible = false">取 消</el-button>
              <el-button type="primary" @click="passhandle">确 定</el-button>
            </span>
        </el-dialog>
      </basic-container>
    </el-col>
@@ -210,6 +209,7 @@
      }
    };
    return {
      tenantId:'',
      form: {},
      seoptions: [],
      sevalue:"",
@@ -373,6 +373,7 @@
                  trigger: "click"
                }],
                span: 24,
                value:"211833"
              },
              {
                label: "登录账号",
@@ -403,6 +404,7 @@
              {
                label: '密码',
                prop: 'password',
                type: "password",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
@@ -412,6 +414,7 @@
                label: '确认密码',
                prop: 'password2',
                hide: true,
                type: "password",
                editDisplay: false,
                viewDisplay: false,
                rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -694,6 +697,7 @@
    'form.tenantId'() {
      if (this.form.tenantId !== '' && this.initFlag) {
        this.initData(this.form.tenantId);
        console.log('this.form.tenantId',this.form.tenantId)
      }
    },
    'excelForm.isCovered'() {
@@ -747,6 +751,9 @@
    }
  },
  methods: {
    beOpen(done,type){
      console.log(done,type)
    },
    //esc取消键操作
    handleClose(done) {
      this.$confirm('确认关闭？')
@@ -766,8 +773,6 @@
      }else {
        this.passVisible=true;
      }
      //console.log("selectionList",this.selectionList)
      //console.log(this.UserPwdstrategyVO)
    },
    // 设置密码策略，传递下拉框的id和多选框的id
    passhandle(){
@@ -780,7 +785,7 @@
       this.UserPwdstrategyVO.pwdstrategyId=this.id

      //请求
      insert(this.UserPwdstrategyVO.userIds).then(()=>{
      insert(this.UserPwdstrategyVO).then(()=>{
        this.passVisible=false
        this.$message({
          type: "success",
@@ -801,13 +806,15 @@
    selChange(row){
      this.id=row
    },
    selecload(page, params = {}) {
      getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
        console.log(res)
        this.seoptions=res.data.data.content
    selecload() {
      getPage(1, -1).then(res => {
        // console.log(res)
        this.seoptions=res.data.data.records
      });
    },
    nodeClick(data) {
      console.log(data)
      console.log(this.form.tenantId)
      this.treeDeptId = data.id;
      this.page.currentPage = 1;
      this.onLoad(this.page);
@@ -840,21 +847,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(",");
@@ -967,7 +975,7 @@
      if (this.selectionList.length === 1) {
        this.roleTreeObj = this.selectionList[0].roleId.split(",");
      }
      getRoleTree().then(res => {
      getRoleTree(this.selectionList[0].tenantId).then(res => {
        this.roleGrantList = res.data.data;
        this.roleBox = true;

@@ -1026,22 +1034,33 @@
      })
    },
    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)
      // 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('请选择一条所属租户')
      }
      this.initFlag = true;
      done();
    },
    currentChange(currentPage) {
      this.page.currentPage = currentPage;
@@ -1059,6 +1078,7 @@
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.tenantId=data.records[0].tenantId
        this.selectionClear();
      });
    },