Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-07-10 8ef98bfd45d97a4c7d494d5a4e51b573df8da268

 src/views/system/user.vue

@@ -36,7 +36,7 @@
                       plain
                       icon="el-icon-delete"
                       v-if="permission.user_delete"
                       @click="handleDelete">删 除
                       @click="handleDelete">注 销
            </el-button>
            <el-button type="info"
                       size="small"
@@ -260,6 +260,7 @@
          searchMenuSpan: 6,
          border: true,
          index: true,
          delBtnText:'注销',
          selection: true,
          viewBtn: true,
          //dialogType: 'drawer',
@@ -272,7 +273,7 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属组织机构",
              prop: "tenantName",
              slot: true,
              display: false
@@ -289,52 +290,59 @@
              slot: true,
              display: false
            },
            {
              label: "所属部门",
              prop: "deptName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              prop: "userTypeName",
              slot: true,
              display: false
            },
            {
              label: "用户平台",
              type: "select",
              dicUrl: "/api/blade-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: "所属部门",
            //   prop: "deptName",
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   prop: "userTypeName",
            //   addDisplay:false,
            //   viewDisplay:false,
            //   editDisplay:false,
            //   slot: true,
            //   display: false
            // },
            // {
            //   label: "用户平台",
            //   type: "select",
            //   dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
            //   props: {
            //     label: "dictValue",
            //     value: "dictKey"
            //   },
            //   dataType: "number",
            //   search: true,
            //   hide: true,
            //   addDisplay:false,
            //   viewDisplay:false,
            //   editDisplay:false,
            //   display: false,
            //   prop: "userType",
            //   rules: [{
            //     required: true,
            //     message: "请选择用户平台",
            //     trigger: "blur"
            //   }]
            // },
          ],
          group: [
            {
              label: '基础信息',
              labelWidth:"110",
              prop: 'baseInfo',
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  prop: "tenantId",
                  label: "所属组织机构",
                  prop: "deptId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
                  dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
                  props: {
                    label: "tenantName",
                    value: "tenantId"
                    label: "title",
                    value: "id",
                  },
                  hide: !website.tenantMode,
                  addDisplay: website.tenantMode,
@@ -342,7 +350,7 @@
                  viewDisplay: website.tenantMode,
                  rules: [{
                    required: true,
                    message: "请输入所属租户",
                    message: "所属组织机构",
                    trigger: "click"
                  }],
                  span: 24,
@@ -356,23 +364,23 @@
                    trigger: "blur"
                  }],
                },
                {
                  label: "用户平台",
                  type: "select",
                  dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
                  props: {
                    label: "dictValue",
                    value: "dictKey"
                  },
                  dataType: "number",
                  slot: true,
                  prop: "userType",
                  rules: [{
                    required: true,
                    message: "请选择用户平台",
                    trigger: "blur"
                  }]
                },
                // {
                //   label: "用户平台",
                //   type: "select",
                //   dicUrl: "/api/blade-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',
@@ -393,6 +401,7 @@
            },
            {
              label: '详细信息',
              labelWidth:"110",
              prop: 'detailInfo',
              icon: 'el-icon-s-order',
              column: [
@@ -468,6 +477,7 @@
            },
            {
              label: '职责信息',
              labelWidth:"110",
              prop: 'dutyInfo',
              icon: 'el-icon-s-custom',
              column: [
@@ -492,23 +502,23 @@
                    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: "deptId",
                //   type: "tree",
                //   multiple: true,
                //   dicData: [],
                //   props: {
                //     label: "title"
                //   },
                //   checkStrictly: true,
                //   slot: true,
                //   rules: [{
                //     required: true,
                //     message: "请选择所属部门",
                //     trigger: "click"
                //   }]
                // },
                {
                  label: "所属岗位",
                  prop: "postId",
@@ -519,11 +529,11 @@
                    label: "postName",
                    value: "id"
                  },
                  rules: [{
                    required: true,
                    message: "请选择所属岗位",
                    trigger: "click"
                  }],
                  // rules: [{
                  //   required: true,
                  //   message: "请选择所属岗位",
                  //   trigger: "click"
                  // }],
                },
              ]
            },
@@ -553,7 +563,7 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属保安单位",
              prop: "tenantName",
              slot: true,
              display: false
@@ -695,7 +705,7 @@
      },
    },
    mounted() {
      // 非租户模式默认加载管理组数据
      // 非保安单位模式默认加载管理组数据
      if (!website.tenantMode) {
        this.initData(website.tenantId);
      }
@@ -766,7 +776,7 @@
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
        this.$confirm("确定将选择用户注销?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
@@ -805,7 +815,7 @@
          this.$message.warning("请选择至少一条数据");
          return;
        }
        this.$confirm("确定将选择数据删除?", {
        this.$confirm("确定将选择用户注销?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"