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>
@@ -15,24 +15,25 @@
      <basic-container>
        <div class="bbox">
        <avue-crud ref="crud"
                   v-model="form"
                   :before-open="beforeOpen"
                   :data="data"
                   :option="option"
                   :page.sync="page"
                   :permission="permissionList"
                   :search.sync="search"
                   :table-loading="loading"
                   @row-del="rowDel"
                   @row-update="rowUpdate"
                   @row-save="rowSave"
                   @search-change="searchChange"
                   @search-reset="searchReset"
                   @selection-change="selectionChange"
                   @current-change="currentChange"
                   @size-change="sizeChange"
                   @refresh-change="refreshChange"
                   @on-load="onLoad">
          v-model="form"
          :before-open="beforeOpen"
          :data="data"
          :option="option"
          :page.sync="page"
          :permission="permissionList"
          :search.sync="search"
          :table-loading="loading"
          @row-del="rowDel"
          @row-update="rowUpdate"
          @row-save="rowSave"
          @search-change="searchChange"
          @search-reset="searchReset"
          @row-click="clickRowChange"
          @selection-change="selectionChange"
          @current-change="currentChange"
          @size-change="sizeChange"
          @refresh-change="refreshChange"
          @on-load="onLoad">
          <template slot="menuLeft">
            <el-button v-if="permission.user_delete"
                       icon="el-icon-delete"
@@ -103,18 +104,17 @@
        </avue-crud>
        </div>
        <el-dialog :visible.sync="roleBox"
                   append-to-body
                   title="用户角色配置"
                   width="345px">

            append-to-body
            title="用户角色配置"
            width="345px">
          <el-tree ref="treeRole"
                   :data="roleGrantList"
                   :default-checked-keys="roleTreeObj"
                   :props="props"
                   check-strictly
                   default-expand-all
                   node-key="id"
                   show-checkbox>
              :data="roleGrantList"
              :default-checked-keys="roleTreeObj"
              :props="props"
              check-strictly
              default-expand-all
              node-key="id"
              show-checkbox>
          </el-tree>

          <span slot="footer" class="dialog-footer">
@@ -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"
@@ -152,13 +151,12 @@
              :value="item.id"
              class="seloption"
              >

            </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>
@@ -211,6 +209,7 @@
      }
    };
    return {
      tenantId:'',
      form: {},
      seoptions: [],
      sevalue:"",
@@ -279,12 +278,14 @@
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        columnBtn:false,
        border: true,
        index: true,
        selection: true,
        viewBtn: true,
        dialogType: 'drawer',
        dialogClickModal: false,
        highlightCurrentRow: true, //行选中时高亮
        column: [
          {
            label: "登录账号",
@@ -345,7 +346,7 @@
              required: true,
              message: "请选择用户平台",
              trigger: "blur"
            }]
            }],
          },
        ],
        group: [
@@ -373,6 +374,7 @@
                  trigger: "click"
                }],
                span: 24,
                value:""
              },
              {
                label: "登录账号",
@@ -391,6 +393,7 @@
                  label: "dictValue",
                  value: "dictKey"
                },
                value:'1',
                dataType: "number",
                slot: true,
                prop: "userType",
@@ -403,6 +406,7 @@
              {
                label: '密码',
                prop: 'password',
                type: "password",
                hide: true,
                editDisplay: false,
                viewDisplay: false,
@@ -412,6 +416,7 @@
                label: '确认密码',
                prop: 'password2',
                hide: true,
                type: "password",
                editDisplay: false,
                viewDisplay: false,
                rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -694,6 +699,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 +753,9 @@
    }
  },
  methods: {
    beOpen(done,type){
      console.log(done,type)
    },
    //esc取消键操作
    handleClose(done) {
      this.$confirm('确认关闭？')
@@ -766,8 +775,6 @@
      }else {
        this.passVisible=true;
      }
      console.log("selectionList",this.selectionList)
      console.log(this.UserPwdstrategyVO)
    },
    // 设置密码策略，传递下拉框的id和多选框的id
    passhandle(){
@@ -778,10 +785,9 @@
       //要传递的id，一个是数组另一个是字符串
       this.UserPwdstrategyVO.userIds=this.selid;
       this.UserPwdstrategyVO.pwdstrategyId=this.id
      console.log("1",this.UserPwdstrategyVO)
      console.log("2",this.UserPwdstrategyVO.userIds)

      //请求
      insert(this.UserPwdstrategyVO.userIds).then(()=>{
      insert(this.UserPwdstrategyVO).then(()=>{
        this.passVisible=false
        this.$message({
          type: "success",
@@ -802,13 +808,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);
@@ -841,21 +849,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(",");
@@ -902,8 +911,15 @@
      this.onLoad(this.page, params);
      done();
    },
    clickRowChange(row){
      this.$refs.crud.toggleSelection();
      this.selectionList = row;
      this.$refs.crud.setCurrentRow(row);
      this.$refs.crud.toggleRowSelection(row); //选中当前行
    },
    selectionChange(list) {
      this.selectionList = list;
      this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
    },
    selectionClear() {
      this.selectionList = [];
@@ -961,7 +977,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;

@@ -1020,6 +1036,12 @@
      })
    },
    beforeOpen(done, 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;
@@ -1034,8 +1056,13 @@
          }
        });
      }
      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;
@@ -1053,6 +1080,7 @@
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.tenantId=data.records[0].tenantId
        this.selectionClear();
      });
    },
@@ -1130,8 +1158,7 @@
  overflow: scroll;
}
.selects{
  width: 400px;
  margin-left: 92px;
  width: 100%;
}
.seloption{
  margin-left: 10px;