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

@@ -35,54 +35,61 @@
          @refresh-change="refreshChange"
          @on-load="onLoad">
          <template slot="menuLeft">
            <el-button v-if="permission.user_delete"
            <el-button v-if="permissionList.delBtn"
                       icon="el-icon-delete"
                       plain
                       size="small"
                       type="danger"
                       @click="handleDelete">删 除
            </el-button>
            <el-button v-if="permission.user_role"
            <el-button v-if="permissionList.roleBtn"
                       icon="el-icon-user"
                       plain
                       size="small"
                       type="info"
                       @click="handleGrant">角色配置
            </el-button>
            <el-button v-if="permission.user_reset"
            <el-button v-if="permissionList.resetBtn"
                       icon="el-icon-refresh"
                       plain
                       size="small"
                       type="info"
                       @click="handleReset">密码重置
            </el-button>
            <el-button size="small"
                       v-if="userInfo.role_name.includes('admin')"
            <el-button v-if="permissionList.pwdStrategyBtn"
                        size="small"
                       type="success"
                       icon="el-icon-setting"
                       @click="handlepass">
              配置密码策略
            </el-button>
            <el-button v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-coordinate"
                       plain
                       size="small"
                       type="info"
                       @click="handleLock">账号解封
            <el-button v-if="permissionList.unsealBtn"
              icon="el-icon-coordinate"
              plain
              size="small"
              type="info"
              @click="handleLock">账号解封
            </el-button>
            <el-button v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-upload2"
                       plain
                       size="small"
                       type="success"
                       @click="handleImport">导入
            <el-button v-if="permissionList.importBtn"
              icon="el-icon-upload2"
              plain
              size="small"
              type="success"
              @click="handleImport">导入
            </el-button>
            <el-button v-if="userInfo.role_name.includes('admin')"
                       icon="el-icon-download"
                       plain
                       size="small"
                       type="warning"
                       @click="handleExport">导出
            <el-button v-if="permissionList.exportBtn"
              icon="el-icon-download"
              plain
              size="small"
              type="warning"
              @click="handleExport">导出
            </el-button>
            <el-button v-if="permissionList.deactEnBtn"
                size="small"
                type="warning"
                icon="el-icon-setting"
                @click="updateUserStatus">
              账号停/启用
            </el-button>
          </template>
          <template slot="tenantName"
@@ -116,7 +123,6 @@
              node-key="id"
              show-checkbox>
          </el-tree>

          <span slot="footer" class="dialog-footer">
            <el-button @click="roleBox = false">取 消</el-button>
            <el-button type="primary"
@@ -137,13 +143,11 @@
        </el-dialog>
        <!--        设置密码策略弹出框-->
        <el-dialog
          :before-close="handleClose"
          :visible.sync="passVisible"
          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 +159,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>
@@ -175,12 +179,14 @@
  updatePlatform,
  add,
  grant,
  resetPassword, unlock
  resetPassword,
  unlock,
  updateUserStatus
} from "@/api/system/user";
import {exportBlob} from "@/api/common";
import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
import {getRoleTree} from "@/api/system/role";
import {getPostList} from "@/api/system/post";
//import {getPostList} from "@/api/system/post";
import {mapGetters} from "vuex";
import website from '@/config/website';
import {getToken} from '@/util/auth';
@@ -193,23 +199,8 @@

export default {
  data() {
    const validatePass = (rule, value, callback) => {
      if (value === '') {
        callback(new Error('请输入密码'));
      } else {
        callback();
      }
    };
    const validatePass2 = (rule, value, callback) => {
      if (value === '') {
        callback(new Error('请再次输入密码'));
      } else if (value !== this.form.password) {
        callback(new Error('两次输入密码不一致!'));
      } else {
        callback();
      }
    };
    return {
      tenantId:'',
      form: {},
      seoptions: [],
      sevalue:"",
@@ -271,290 +262,6 @@
          value: 'value',
          children: 'children'
        }
      },
      option: {
        height:'auto',
        calcHeight: 80,
        tip: false,
        searchShow: true,
        searchMenuSpan: 6,
        border: true,
        index: true,
        selection: true,
        viewBtn: true,
        dialogType: 'drawer',
        dialogClickModal: false,
        highlightCurrentRow: true, //行选中时高亮
        column: [
          {
            label: "登录账号",
            prop: "account",
            search: true,
            display: false
          },
          {
            label: "所属租户",
            prop: "tenantName",
            slot: true,
            display: false
          },
          {
            label: "用户姓名",
            prop: "realName",
            search: true,
            display: false
          },
          {
            label: "所属角色",
            prop: "roleName",
            slot: true,
            display: false
          },
          {
            label: "密码策略",
            prop: "pwdStrategy",
            slot: true,
            display: false
          },
          {
            label: "所属部门",
            prop: "deptName",
            slot: true,
            display: false
          },
          {
            label: "用户平台",
            prop: "userTypeName",
            slot: true,
            display: false
          },
          {
            label: "用户平台",
            type: "select",
            dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
            props: {
              label: "dictValue",
              value: "dictKey"
            },
            dataType: "number",
            search: true,
            hide: true,
            display: false,
            prop: "userType",
            rules: [{
              required: true,
              message: "请选择用户平台",
              trigger: "blur"
            }]
          },
        ],
        group: [
          {
            label: '基础信息',
            prop: 'baseInfo',
            icon: 'el-icon-user-solid',
            column: [
              {
                label: "所属租户",
                prop: "tenantId",
                type: "tree",
                dicUrl: "/api/ubcs-system/tenant/select",
                props: {
                  label: "tenantName",
                  value: "tenantId"
                },
                hide: !website.tenantMode,
                addDisplay: website.tenantMode,
                editDisplay: website.tenantMode,
                viewDisplay: website.tenantMode,
                rules: [{
                  required: true,
                  message: "请输入所属租户",
                  trigger: "click"
                }],
                span: 24,
              },
              {
                label: "登录账号",
                prop: "account",
                rules: [{
                  required: true,
                  message: "请输入登录账号",
                  trigger: "blur"
                }],
              },
              {
                label: "用户平台",
                type: "select",
                dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
                props: {
                  label: "dictValue",
                  value: "dictKey"
                },
                dataType: "number",
                slot: true,
                prop: "userType",
                rules: [{
                  required: true,
                  message: "请选择用户平台",
                  trigger: "blur"
                }]
              },
              {
                label: '密码',
                prop: 'password',
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [{required: true, validator: validatePass, trigger: 'blur'}]
              },
              {
                label: '确认密码',
                prop: 'password2',
                hide: true,
                editDisplay: false,
                viewDisplay: false,
                rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
              },
            ]
          },
          {
            label: '详细信息',
            prop: 'detailInfo',
            icon: 'el-icon-s-order',
            column: [
              {
                label: "用户昵称",
                prop: "name",
                hide: true,
                rules: [{
                  required: true,
                  message: "请输入用户昵称",
                  trigger: "blur"
                }]
              },
              {
                label: "用户姓名",
                prop: "realName",
                rules: [{
                  required: true,
                  message: "请输入用户姓名",
                  trigger: "blur"
                }, {
                  min: 2,
                  max: 5,
                  message: '姓名长度在2到5个字符'
                }]
              },
              {
                label: "手机号码",
                prop: "phone",
                overHidden: true
              },
              {
                label: "电子邮箱",
                prop: "email",
                hide: true,
                overHidden: true
              },
              {
                label: "用户性别",
                prop: "sex",
                type: "select",
                dicData: [
                  {
                    label: "男",
                    value: 1
                  },
                  {
                    label: "女",
                    value: 2
                  },
                  {
                    label: "未知",
                    value: 3
                  }
                ],
                hide: true
              },
              {
                label: "用户生日",
                type: "date",
                prop: "birthday",
                format: "yyyy-MM-dd hh:mm:ss",
                valueFormat: "yyyy-MM-dd hh:mm:ss",
                hide: true
              },
              {
                label: "账号状态",
                prop: "statusName",
                hide: true,
                display: false
              }
            ]
          },
          {
            label: '职责信息',
            prop: 'dutyInfo',
            icon: 'el-icon-s-custom',
            column: [
              {
                label: "用户编号",
                prop: "code",
              },
              {
                label: "所属角色",
                prop: "roleId",
                multiple: true,
                type: "tree",
                dicData: [],
                props: {
                  label: "title"
                },
                checkStrictly: true,
                slot: true,
                rules: [{
                  required: true,
                  message: "请选择所属角色",
                  trigger: "click"
                }]
              },
              {
                label: "所属部门",
                prop: "deptId",
                type: "tree",
                multiple: true,
                dicData: [],
                props: {
                  label: "title"
                },
                checkStrictly: true,
                slot: true,
                rules: [{
                  required: true,
                  message: "请选择所属部门",
                  trigger: "click"
                }]
              },
              {
                label: "所属岗位",
                prop: "postId",
                type: "tree",
                multiple: true,
                dicData: [],
                props: {
                  label: "postName",
                  value: "id"
                },
                rules: [{
                  required: true,
                  message: "请选择所属岗位",
                  trigger: "click"
                }],
              },
            ]
          },
        ]
      },
      data: [],
      platformQuery: {},
@@ -687,13 +394,15 @@
        pwdstrategyId:''
      },
      userflag:true,
      usernumber:0
      usernumber:0,
      userStatus:false,
    };
  },
  watch: {
    'form.tenantId'() {
      if (this.form.tenantId !== '' && this.initFlag) {
        this.initData(this.form.tenantId);
        // console.log('this.form.tenantId',this.form.tenantId)
      }
    },
    'excelForm.isCovered'() {
@@ -705,21 +414,337 @@
  },
  computed: {
    ...mapGetters(["userInfo", "permission"]),
    /** 按钮显示隐藏控制 */
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.user_add, false),
        viewBtn: this.vaildData(this.permission.user_view, false),
        delBtn: this.vaildData(this.permission.user_delete, false),
        editBtn: this.vaildData(this.permission.user_edit, false)
        addBtn: this.vaildData(this.permission.user.user_add, false),
        viewBtn: this.vaildData(this.permission.user.user_view, false),
        delBtn: this.vaildData(this.permission.user.user_delete, false),
        editBtn: this.vaildData(this.permission.user.user_edit, false),
        deactEnBtn: this.vaildData(this.permission.user.user_deact_en,false),
        exportBtn: this.vaildData(this.permission.user.user_export,false),
        pwdStrategyBtn: this.vaildData(this.permission.user.user_pwd_strategy,false),
        importBtn: this.vaildData(this.permission.user.user_import,false),
        resetBtn: this.vaildData(this.permission.user.user_reset,false),
        roleBtn: this.vaildData(this.permission.user.user_role,false),
        unsealBtn: this.vaildData(this.permission.user.user_unseal,false),
      };
    },
    platformPermissionList() {
      return {
        addBtn: false,
        viewBtn: false,
        delBtn: false,
        editBtn: this.vaildData(this.permission.user_edit, false)
      };
    option() {
      return{
          height:'auto',
          calcHeight: 80,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,
          columnBtn:false,
          border: true,
          index: true,
          selection: true,
          /* 下面这三个属性默认设置为true，
            实际根据permissionList中对照的属性进行控制的 */
          viewBtn: true,
          editBtn: true,
          delBtn: true,
          addBtn: true,
          dialogType: 'drawer',
          dialogClickModal: false,
          highlightCurrentRow: true, //行选中时高亮
          column: [
            {
              label: "登录账号",
              prop: "account",
              search: true,
              display: false
            },
            {
              label: "所属租户",
              prop: "tenantName",
              slot: true,
              display: false
            },
            {
              label: "用户姓名",
              prop: "realName",
              search: true,
              display: false
            },
            {
              label: "所属角色",
              prop: "roleName",
              slot: true,
              display: false
            },
            {
              label: "密码策略",
              prop: "pwdStrategy",
              slot: true,
              display: false
            },
            {
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              type: "select",
              dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
              props: {
                label: "dictValue",
                value: "dictKey"
              },
              dataType: "number",
              search: true,
              hide: true,
              display: false,
              prop: "userType",
              rules: [{
                required: true,
                message: "请选择用户平台",
                trigger: "blur"
              }],
            },
            {
              label: "状态",
              display: false,
              sortable:true,
              html:true,
              prop: "userStatus",
              formatter : function (row, column) {
                return row.userStatus == 0 ? '<i class="el-icon-check" style="color: #32cd32;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: #ff0000;font-size: 20px;font-weight: 800"></i>'
              }
            },
          ],
          group: [
            {
              label: '基础信息',
              prop: 'baseInfo',
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  prop: "tenantId",
                  type: "tree",
                  dicUrl: "/api/ubcs-system/tenant/select",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                  },
                  hide: !website.tenantMode,
                  addDisplay: website.tenantMode,
                  editDisplay: website.tenantMode,
                  viewDisplay: website.tenantMode,
                  rules: [{
                    required: true,
                    message: "请输入所属租户",
                    trigger: "click"
                  }],
                  span: 24,
                  value:""
                },
                {
                  label: "登录账号",
                  prop: "account",
                  rules: [{
                    required: true,
                    message: "请输入登录账号",
                    trigger: "blur"
                  }],
                },
                {
                  label: "用户平台",
                  type: "select",
                  dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  value:'1',
                  dataType: "number",
                  slot: true,
                  prop: "userType",
                  rules: [{
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur"
                  }]
                },
                {
                  label: '密码',
                  prop: 'password',
                  type: "password",
                  hide: true,
                  editDisplay: false,
                  viewDisplay: false,
                  rules: [{
                    required: true,
                    validator:(rule, value,callback) => {
                      if (value === '') {
                        callback(new Error('请再次输入密码'));
                      } else if (value !== this.form.password) {
                        callback(new Error('两次输入密码不一致!'));
                      } else {
                        callback();
                      }
                    },
                    trigger: 'blur'
                  }]
                },
                {
                  label: '确认密码',
                  prop: 'password2',
                  hide: true,
                  type: "password",
                  editDisplay: false,
                  viewDisplay: false,
                  rules: [{
                    required: true,
                    validator:(rule, value,callback) => {
                      if (value === '') {
                        callback(new Error('请再次输入密码'));
                      } else if (value !== this.form.password) {
                        callback(new Error('两次输入密码不一致!'));
                      } else {
                        callback();
                      }
                    },
                    trigger: 'blur'
                  }]
                },
              ]
            },
            {
              label: '详细信息',
              prop: 'detailInfo',
              icon: 'el-icon-s-order',
              column: [
                {
                  label: "用户昵称",
                  prop: "name",
                  hide: true,
                  rules: [{
                    required: true,
                    message: "请输入用户昵称",
                    trigger: "blur"
                  }]
                },
                {
                  label: "用户姓名",
                  prop: "realName",
                  rules: [{
                    required: true,
                    message: "请输入用户姓名",
                    trigger: "blur"
                  }, {
                    min: 2,
                    max: 5,
                    message: '姓名长度在2到5个字符'
                  }]
                },
                {
                  label: "手机号码",
                  prop: "phone",
                  overHidden: true
                },
                {
                  label: "电子邮箱",
                  prop: "email",
                  hide: true,
                  overHidden: true
                },
                {
                  label: "用户性别",
                  prop: "sex",
                  type: "select",
                  dicData: [
                    {
                      label: "男",
                      value: 1
                    },
                    {
                      label: "女",
                      value: 2
                    },
                    {
                      label: "未知",
                      value: 3
                    }
                  ],
                  hide: true
                },
                {
                  label: "用户生日",
                  type: "date",
                  prop: "birthday",
                  format: "yyyy-MM-dd hh:mm:ss",
                  valueFormat: "yyyy-MM-dd hh:mm:ss",
                  hide: true
                },
                {
                  label: "账号状态",
                  prop: "statusName",
                  hide: true,
                  display: false
                }
              ]
            },
            {
              label: '职责信息',
              prop: 'dutyInfo',
              icon: 'el-icon-s-custom',
              column: [
                {
                  label: "用户编号",
                  prop: "code",
                },
                {
                  label: "所属角色",
                  prop: "roleId",
                  multiple: true,
                  type: "tree",
                  dicData: [],
                  disabled:this.userStatus,
                  props: {
                    label: "title"
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择所属角色",
                    trigger: "click"
                  }]
                },
                {
                  label: "所属部门",
                  prop: "deptId",
                  type: "tree",
                  multiple: true,
                  dicData: [],
                  props: {
                    label: "title"
                  },
                  checkStrictly: true,
                  slot: true,
                  rules: [{
                    required: true,
                    message: "请选择所属部门",
                    trigger: "click"
                  }]
                },
              ]
            },
          ]

      }
    },
    ids() {
      let ids = [];
@@ -747,8 +772,54 @@
    }
  },
  methods: {

    // beOpen(done,type){
    //   console.log(done,type)
    // },
    // 用户停用启用状态
    /** 修改用户状态 */
    updateUserStatus(){
      let list = this.selectionList;
      if(list.length < 1){
        this.$message({
          type: "warning",
          message: "请至少选择一条用户数据！"
        });
        return;
      }
      if(func.isAttrInconsistent(list,"userStatus")){
        this.$message({
          type: "warning",
          message: "批量操作用户状态时，请选择用户状态一致的数据！"
        });
        return;
      }
      let userIds = func.joinedString(list,"id");
      let status = list[0].userStatus == 1 ? true:false;
      let msg = status ? "确定将选择账号启用":"确定将选择账号停用"+"？";
      // console.log(msg);
      this.$confirm(msg, {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning"
      })
        .then(() => {
          return updateUserStatus(userIds,status);
        })
        .then(() => {
          this.$message({
            type: "success",
            message: "操作成功!",
            duration: 1000,// 设置消息显示3秒后自动关闭
            onClose: () => {
              // 在消息关闭时重新加载数据
              this.onLoad(this.page);
            }
          });
        });
    },
    //esc取消键操作
    handleClose(done) {
    /*handleClose(done) {
      this.$confirm('确认关闭？')
        .then(() => {
          done();
@@ -757,7 +828,7 @@
          done();
        });

    },
    },*/
    //点击配置密码策略
    handlepass(){
      if (this.selectionList.length === 0) {
@@ -766,8 +837,6 @@
      }else {
        this.passVisible=true;
      }
      //console.log("selectionList",this.selectionList)
      //console.log(this.UserPwdstrategyVO)
    },
    // 设置密码策略，传递下拉框的id和多选框的id
    passhandle(){
@@ -780,7 +849,7 @@
       this.UserPwdstrategyVO.pwdstrategyId=this.id

      //请求
      insert(this.UserPwdstrategyVO.userIds).then(()=>{
      insert(this.UserPwdstrategyVO).then(()=>{
        this.passVisible=false
        this.$message({
          type: "success",
@@ -808,6 +877,8 @@
      });
    },
    nodeClick(data) {
      // console.log(data)
      // console.log(this.form.tenantId)
      this.treeDeptId = data.id;
      this.page.currentPage = 1;
      this.onLoad(this.page);
@@ -823,10 +894,10 @@
        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;
      });
      // getPostList(tenantId).then(res => {
      //   const column = this.findObject(this.option.group, "postId");
      //   column.dicData = res.data.data;
      // });
    },
    submitRole() {
      const roleList = this.$refs.treeRole.getCheckedKeys().join(",");
@@ -840,21 +911,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(",");
@@ -1026,6 +1098,18 @@
      })
    },
    beforeOpen(done, type) {
      // console.log(type)
      if(type === "edit"){
        this.userStatus = true;
      }else {
        this.userStatus = false;
      }
      //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;
@@ -1040,8 +1124,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;
@@ -1059,6 +1148,7 @@
        this.page.total = data.total;
        this.data = data.records;
        this.loading = false;
        this.tenantId=data.records[0].tenantId
        this.selectionClear();
      });
    },