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
@@ -324,11 +325,12 @@
          group: [
            {
              label: '基础信息',
              labelWidth:"110",
              prop: 'baseInfo',
              icon: 'el-icon-user-solid',
              column: [
                {
                  label: "所属租户",
                  label: "所属保安单位",
                  prop: "tenantId",
                  type: "tree",
                  dicUrl: "/api/blade-system/tenant/select",
@@ -342,7 +344,7 @@
                  viewDisplay: website.tenantMode,
                  rules: [{
                    required: true,
                    message: "请输入所属租户",
                    message: "请输入所属保安单位",
                    trigger: "click"
                  }],
                  span: 24,
@@ -393,6 +395,7 @@
            },
            {
              label: '详细信息',
              labelWidth:"110",
              prop: 'detailInfo',
              icon: 'el-icon-s-order',
              column: [
@@ -468,6 +471,7 @@
            },
            {
              label: '职责信息',
              labelWidth:"110",
              prop: 'dutyInfo',
              icon: 'el-icon-s-custom',
              column: [
@@ -553,7 +557,7 @@
              display: false
            },
            {
              label: "所属租户",
              label: "所属保安单位",
              prop: "tenantName",
              slot: true,
              display: false
@@ -695,7 +699,7 @@
      },
    },
    mounted() {
      // 非租户模式默认加载管理组数据
      // 非保安单位模式默认加载管理组数据
      if (!website.tenantMode) {
        this.initData(website.tenantId);
      }
@@ -766,7 +770,7 @@
        });
      },
      rowDel(row) {
        this.$confirm("确定将选择数据删除?", {
        this.$confirm("确定将选择用户注销?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
@@ -805,7 +809,7 @@
          this.$message.warning("请选择至少一条数据");
          return;
        }
        this.$confirm("确定将选择数据删除?", {
        this.$confirm("确定将选择用户注销?", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"