Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterpris...

liuyg

2021-12-06 5a3ace296c010b5c11501dedf252e1c144cda9e2

 src/views/system/user.vue

@@ -291,6 +291,10 @@
        border: true,
        index: true,
        delBtnText: "注销",
        addBtnText: "系统用户注册",
        addTitle: "系统用户注册",
        editBtnText: "修改",
        editTitle: "用户信息修改",
        selection: true,
        viewBtn: true,
        //dialogType: 'drawer',
@@ -1016,6 +1020,7 @@
    onLoad(page, params = {}) {
      this.loading = true;
      var deptid = this.deptids == null ? this.treeDeptId : this.deptids;
      params['status'] = 1;
      getList(
        page.currentPage,
        page.pageSize,