用户管理过滤掉已禁用部门

RuoYi

2024-12-11 7216b56a5617fea1a1d451d578e7b2b3429e8368

 ruoyi-ui/src/views/system/user/index.vue

@@ -1,207 +1,100 @@
<template>

  <div class="app-container">

    <el-row :gutter="20">

      <!--部门数据-->

      <el-col :span="4" :xs="24">

        <div class="head-container">

          <el-input

            v-model="deptName"

            placeholder="请输入部门名称"

            clearable

            size="small"

            prefix-icon="el-icon-search"

            style="margin-bottom: 20px"

          />

        </div>

        <div class="head-container">

          <el-tree

            :data="deptOptions"

            :props="defaultProps"

            :expand-on-click-node="false"

            :filter-node-method="filterNode"

            ref="tree"

            default-expand-all

            @node-click="handleNodeClick"

          />

        </div>

      </el-col>

      <!--用户数据-->

      <el-col :span="20" :xs="24">

        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">

          <el-form-item label="用户名称" prop="userName">

            <el-input

              v-model="queryParams.userName"

              placeholder="请输入用户名称"

              clearable

              size="small"

              style="width: 240px"

              @keyup.enter.native="handleQuery"

            />

          </el-form-item>

          <el-form-item label="手机号码" prop="phonenumber">

            <el-input

              v-model="queryParams.phonenumber"

              placeholder="请输入手机号码"

              clearable

              size="small"

              style="width: 240px"

              @keyup.enter.native="handleQuery"

            />

          </el-form-item>

          <el-form-item label="状态" prop="status">

            <el-select

              v-model="queryParams.status"

              placeholder="用户状态"

              clearable

              size="small"

              style="width: 240px"

            >

              <el-option

                v-for="dict in statusOptions"

                :key="dict.dictValue"

                :label="dict.dictLabel"

                :value="dict.dictValue"

              />

            </el-select>

          </el-form-item>

          <el-form-item label="创建时间">

            <el-date-picker

              v-model="dateRange"

              size="small"

              style="width: 240px"

              value-format="yyyy-MM-dd"

              type="daterange"

              range-separator="-"

              start-placeholder="开始日期"

              end-placeholder="结束日期"

            ></el-date-picker>

          </el-form-item>

          <el-form-item>

            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

          </el-form-item>

        </el-form>

      <splitpanes :horizontal="this.$store.getters.device === 'mobile'" class="default-theme">

        <!--部门数据-->

        <pane size="16">

          <el-col>

            <div class="head-container">

              <el-input v-model="deptName" placeholder="请输入部门名称" clearable size="small" prefix-icon="el-icon-search" style="margin-bottom: 20px" />

            </div>

            <div class="head-container">

              <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false" :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current @node-click="handleNodeClick" />

            </div>

          </el-col>

        </pane>

        <!--用户数据-->

        <pane size="84">

          <el-col>

            <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

              <el-form-item label="用户名称" prop="userName">

                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter.native="handleQuery" />

              </el-form-item>

              <el-form-item label="手机号码" prop="phonenumber">

                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter.native="handleQuery" />

              </el-form-item>

              <el-form-item label="状态" prop="status">

                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">

                  <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />

                </el-select>

              </el-form-item>

              <el-form-item label="创建时间">

                <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>

              </el-form-item>

              <el-form-item>

                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>

              </el-form-item>

            </el-form>



        <el-row :gutter="10" class="mb8">

          <el-col :span="1.5">

            <el-button

              type="primary"

              plain

              icon="el-icon-plus"

              size="mini"

              @click="handleAdd"

              v-hasPermi="['system:user:add']"

            >新增</el-button>

          </el-col>

          <el-col :span="1.5">

            <el-button

              type="success"

              plain

              icon="el-icon-edit"

              size="mini"

              :disabled="single"

              @click="handleUpdate"

              v-hasPermi="['system:user:edit']"

            >修改</el-button>

          </el-col>

          <el-col :span="1.5">

            <el-button

              type="danger"

              plain

              icon="el-icon-delete"

              size="mini"

              :disabled="multiple"

              @click="handleDelete"

              v-hasPermi="['system:user:remove']"

            >删除</el-button>

          </el-col>

          <el-col :span="1.5">

            <el-button

              type="info"

              plain

              icon="el-icon-upload2"

              size="mini"

              @click="handleImport"

              v-hasPermi="['system:user:import']"

            >导入</el-button>

          </el-col>

          <el-col :span="1.5">

            <el-button

              type="warning"

              plain

              icon="el-icon-download"

              size="mini"

              @click="handleExport"

              v-hasPermi="['system:user:export']"

            >导出</el-button>

          </el-col>

          <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>

        </el-row>

            <el-row :gutter="10" class="mb8">

              <el-col :span="1.5">

                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>

              </el-col>

              <el-col :span="1.5">

                <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['system:user:edit']">修改</el-button>

              </el-col>

              <el-col :span="1.5">

                <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['system:user:remove']">删除</el-button>

              </el-col>

              <el-col :span="1.5">

                <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>

              </el-col>

              <el-col :span="1.5">

                <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['system:user:export']">导出</el-button>

              </el-col>

              <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>

            </el-row>



        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

          <el-table-column type="selection" width="50" align="center" />

          <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />

          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />

          <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />

          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />

          <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />

          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">

            <template slot-scope="scope">

              <el-switch

                v-model="scope.row.status"

                active-value="0"

                inactive-value="1"

                @change="handleStatusChange(scope.row)"

              ></el-switch>

            </template>

          </el-table-column>

          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">

            <template slot-scope="scope">

              <span>{{ parseTime(scope.row.createTime) }}</span>

            </template>

          </el-table-column>

          <el-table-column

            label="操作"

            align="center"

            width="160"

            class-name="small-padding fixed-width"

          >

            <template slot-scope="scope">

              <el-button

                size="mini"

                type="text"

                icon="el-icon-edit"

                @click="handleUpdate(scope.row)"

                v-hasPermi="['system:user:edit']"

              >修改</el-button>

              <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">

                <span class="el-dropdown-link">

                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多操作

                </span>

                <el-dropdown-menu slot="dropdown">

                  <el-dropdown-item command="handleDelete" v-if="scope.row.userId !== 1" icon="el-icon-delete"

                    v-hasPermi="['system:user:remove']">删除用户</el-dropdown-item>

                  <el-dropdown-item command="handleResetPwd" icon="el-icon-key"

                    v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>

                  <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check"

                    v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>

                </el-dropdown-menu>

              </el-dropdown>

            </template>

          </el-table-column>

        </el-table>

            <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">

              <el-table-column type="selection" width="50" align="center" />

              <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />

              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />

              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />

              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />

              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />

              <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">

                <template slot-scope="scope">

                  <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>

                </template>

              </el-table-column>

              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">

                <template slot-scope="scope">

                  <span>{{ parseTime(scope.row.createTime) }}</span>

                </template>

              </el-table-column>

              <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">

                <template slot-scope="scope" v-if="scope.row.userId !== 1">

                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']">修改</el-button>

                  <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']">删除</el-button>

                  <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">

                    <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>

                    <el-dropdown-menu slot="dropdown">

                      <el-dropdown-item command="handleResetPwd" icon="el-icon-key" v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>

                      <el-dropdown-item command="handleAuthRole" icon="el-icon-circle-check" v-hasPermi="['system:user:edit']">分配角色</el-dropdown-item>

                    </el-dropdown-menu>

                  </el-dropdown>

                </template>

              </el-table-column>

            </el-table>



        <pagination

          v-show="total>0"

          :total="total"

          :page.sync="queryParams.pageNum"

          :limit.sync="queryParams.pageSize"

          @pagination="getList"

        />

      </el-col>

            <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />

          </el-col>

        </pane>

      </splitpanes>

    </el-row>



    <!-- 添加或修改参数配置对话框 -->

    <!-- 添加或修改用户配置对话框 -->

    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>

      <el-form ref="form" :model="form" :rules="rules" label-width="80px">

        <el-row>

@@ -212,7 +105,7 @@
          </el-col>

          <el-col :span="12">

            <el-form-item label="归属部门" prop="deptId">

              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />

              <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />

            </el-form-item>

          </el-col>

        </el-row>

@@ -236,31 +129,22 @@
          </el-col>

          <el-col :span="12">

            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">

              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" />

              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />

            </el-form-item>

          </el-col>

        </el-row>

        <el-row>

          <el-col :span="12">

            <el-form-item label="用户性别">

              <el-select v-model="form.sex" placeholder="请选择">

                <el-option

                  v-for="dict in sexOptions"

                  :key="dict.dictValue"

                  :label="dict.dictLabel"

                  :value="dict.dictValue"

                ></el-option>

              <el-select v-model="form.sex" placeholder="请选择性别">

                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>

              </el-select>

            </el-form-item>

          </el-col>

          <el-col :span="12">

            <el-form-item label="状态">

              <el-radio-group v-model="form.status">

                <el-radio

                  v-for="dict in statusOptions"

                  :key="dict.dictValue"

                  :label="dict.dictValue"

                >{{dict.dictLabel}}</el-radio>

                <el-radio v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>

              </el-radio-group>

            </el-form-item>

          </el-col>

@@ -268,27 +152,15 @@
        <el-row>

          <el-col :span="12">

            <el-form-item label="岗位">

              <el-select v-model="form.postIds" multiple placeholder="请选择">

                <el-option

                  v-for="item in postOptions"

                  :key="item.postId"

                  :label="item.postName"

                  :value="item.postId"

                  :disabled="item.status == 1"

                ></el-option>

              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">

                <el-option v-for="item in postOptions" :key="item.postId" :label="item.postName" :value="item.postId" :disabled="item.status == 1" ></el-option>

              </el-select>

            </el-form-item>

          </el-col>

          <el-col :span="12">

            <el-form-item label="角色">

              <el-select v-model="form.roleIds" multiple placeholder="请选择">

                <el-option

                  v-for="item in roleOptions"

                  :key="item.roleId"

                  :label="item.roleName"

                  :value="item.roleId"

                  :disabled="item.status == 1"

                ></el-option>

              <el-select v-model="form.roleIds" multiple placeholder="请选择角色">

                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId" :disabled="item.status == 1"></el-option>

              </el-select>

            </el-form-item>

          </el-col>

@@ -309,28 +181,16 @@


    <!-- 用户导入对话框 -->

    <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>

      <el-upload

        ref="upload"

        :limit="1"

        accept=".xlsx, .xls"

        :headers="upload.headers"

        :action="upload.url + '?updateSupport=' + upload.updateSupport"

        :disabled="upload.isUploading"

        :on-progress="handleFileUploadProgress"

        :on-success="handleFileSuccess"

        :auto-upload="false"

        drag

      >

      <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>

        <i class="el-icon-upload"></i>

        <div class="el-upload__text">

          将文件拖到此处，或

          <em>点击上传</em>

        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>

        <div class="el-upload__tip text-center" slot="tip">

          <div class="el-upload__tip" slot="tip">

            <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据

          </div>

          <span>仅允许导入xls、xlsx格式文件。</span>

          <el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>

        </div>

        <div class="el-upload__tip" slot="tip">

          <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据

          <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>

        </div>

        <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>

      </el-upload>

      <div slot="footer" class="dialog-footer">

        <el-button type="primary" @click="submitFileForm">确 定</el-button>

@@ -341,15 +201,17 @@
</template>



<script>

import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } from "@/api/system/user";

import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";

import { getToken } from "@/utils/auth";

import { treeselect } from "@/api/system/dept";

import Treeselect from "@riophae/vue-treeselect";

import "@riophae/vue-treeselect/dist/vue-treeselect.css";

import { Splitpanes, Pane } from "splitpanes";

import "splitpanes/dist/splitpanes.css";



export default {

  name: "User",

  components: { Treeselect },

  dicts: ['sys_normal_disable', 'sys_user_sex'],

  components: { Treeselect, Splitpanes, Pane },

  data() {

    return {

      // 遮罩层

@@ -368,8 +230,10 @@
      userList: null,

      // 弹出层标题

      title: "",

      // 部门树选项

      // 所有部门树选项

      deptOptions: undefined,

      // 过滤掉已禁用部门树选项

      enabledDeptOptions: undefined,

      // 是否显示弹出层

      open: false,

      // 部门名称

@@ -378,10 +242,6 @@
      initPassword: undefined,

      // 日期范围

      dateRange: [],

      // 状态数据字典

      statusOptions: [],

      // 性别状态字典

      sexOptions: [],

      // 岗位选项

      postOptions: [],

      // 角色选项

@@ -429,19 +289,21 @@
      // 表单校验

      rules: {

        userName: [

          { required: true, message: "用户名称不能为空", trigger: "blur" }

          { required: true, message: "用户名称不能为空", trigger: "blur" },

          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }

        ],

        nickName: [

          { required: true, message: "用户昵称不能为空", trigger: "blur" }

        ],

        password: [

          { required: true, message: "用户密码不能为空", trigger: "blur" },

          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }

          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },

          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }

        ],

        email: [

          {

            type: "email",

            message: "'请输入正确的邮箱地址",

            message: "请输入正确的邮箱地址",

            trigger: ["blur", "change"]

          }

        ],

@@ -463,13 +325,7 @@
  },

  created() {

    this.getList();

    this.getTreeselect();

    this.getDicts("sys_normal_disable").then(response => {

      this.statusOptions = response.data;

    });

    this.getDicts("sys_user_sex").then(response => {

      this.sexOptions = response.data;

    });

    this.getDeptTree();

    this.getConfigKey("sys.user.initPassword").then(response => {

      this.initPassword = response.msg;

    });

@@ -486,9 +342,22 @@
      );

    },

    /** 查询部门下拉树结构 */

    getTreeselect() {

      treeselect().then(response => {

    getDeptTree() {

      deptTreeSelect().then(response => {

        this.deptOptions = response.data;

        this.enabledDeptOptions = this.filterDisabledDept(JSON.parse(JSON.stringify(response.data)));

      });

    },

    // 过滤禁用的部门

    filterDisabledDept(deptList) {

      return deptList.filter(dept => {

        if (dept.disabled) {

          return false;

        }

        if (dept.children && dept.children.length) {

          dept.children = this.filterDisabledDept(dept.children);

        }

        return true;

      });

    },

    // 筛选节点

@@ -499,22 +368,18 @@
    // 节点单击事件

    handleNodeClick(data) {

      this.queryParams.deptId = data.id;

      this.getList();

      this.handleQuery();

    },

    // 用户状态修改

    handleStatusChange(row) {

      let text = row.status === "0" ? "启用" : "停用";

      this.$confirm('确认要"' + text + '""' + row.userName + '"用户吗?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return changeUserStatus(row.userId, row.status);

        }).then(() => {

          this.msgSuccess(text + "成功");

        }).catch(function() {

          row.status = row.status === "0" ? "1" : "0";

        });

      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {

        return changeUserStatus(row.userId, row.status);

      }).then(() => {

        this.$modal.msgSuccess(text + "成功");

      }).catch(function() {

        row.status = row.status === "0" ? "1" : "0";

      });

    },

    // 取消按钮

    cancel() {

@@ -548,6 +413,8 @@
    resetQuery() {

      this.dateRange = [];

      this.resetForm("queryForm");

      this.queryParams.deptId = undefined;

      this.$refs.tree.setCurrentKey(null);

      this.handleQuery();

    },

    // 多选框选中数据

@@ -559,9 +426,6 @@
    // 更多操作触发

    handleCommand(command, row) {

      switch (command) {

        case "handleDelete":

          this.handleDelete(row);

          break;

        case "handleResetPwd":

          this.handleResetPwd(row);

          break;

@@ -575,7 +439,6 @@
    /** 新增按钮操作 */

    handleAdd() {

      this.reset();

      this.getTreeselect();

      getUser().then(response => {

        this.postOptions = response.posts;

        this.roleOptions = response.roles;

@@ -587,14 +450,13 @@
    /** 修改按钮操作 */

    handleUpdate(row) {

      this.reset();

      this.getTreeselect();

      const userId = row.userId || this.ids;

      getUser(userId).then(response => {

        this.form = response.data;

        this.postOptions = response.posts;

        this.roleOptions = response.roles;

        this.form.postIds = response.postIds;

        this.form.roleIds = response.roleIds;

        this.$set(this.form, "postIds", response.postIds);

        this.$set(this.form, "roleIds", response.roleIds);

        this.open = true;

        this.title = "修改用户";

        this.form.password = "";

@@ -608,16 +470,21 @@
        closeOnClickModal: false,

        inputPattern: /^.{5,20}$/,

        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",

        inputValidator: (value) => {

          if (/<|>|"|'|\||\\/.test(value)) {

            return "不能包含非法字符：< > \" ' \\\ |"

          }

        },

      }).then(({ value }) => {

          resetUserPwd(row.userId, value).then(response => {

            this.msgSuccess("修改成功，新密码是：" + value);

            this.$modal.msgSuccess("修改成功，新密码是：" + value);

          });

        }).catch(() => {});

    },

    /** 分配角色操作 */

    handleAuthRole: function(row) {

      const userId = row.userId;

      this.$router.push("/auth/role/" + userId);

      this.$router.push("/system/user-auth/role/" + userId);

    },

    /** 提交按钮 */

    submitForm: function() {

@@ -625,13 +492,13 @@
        if (valid) {

          if (this.form.userId != undefined) {

            updateUser(this.form).then(response => {

              this.msgSuccess("修改成功");

              this.$modal.msgSuccess("修改成功");

              this.open = false;

              this.getList();

            });

          } else {

            addUser(this.form).then(response => {

              this.msgSuccess("新增成功");

              this.$modal.msgSuccess("新增成功");

              this.open = false;

              this.getList();

            });

@@ -642,16 +509,12 @@
    /** 删除按钮操作 */

    handleDelete(row) {

      const userIds = row.userId || this.ids;

      this.$confirm('是否确认删除用户编号为"' + userIds + '"的数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return delUser(userIds);

        }).then(() => {

          this.getList();

          this.msgSuccess("删除成功");

        }).catch(() => {});

      this.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function() {

        return delUser(userIds);

      }).then(() => {

        this.getList();

        this.$modal.msgSuccess("删除成功");

      }).catch(() => {});

    },

    /** 导出按钮操作 */

    handleExport() {

@@ -667,8 +530,7 @@
    /** 下载模板操作 */

    importTemplate() {

      this.download('system/user/importTemplate', {

        ...this.queryParams

      }, `user_${new Date().getTime()}.xlsx`)

      }, `user_template_${new Date().getTime()}.xlsx`)

    },

    // 文件上传中处理

    handleFileUploadProgress(event, file, fileList) {

@@ -679,7 +541,7 @@
      this.upload.open = false;

      this.upload.isUploading = false;

      this.$refs.upload.clearFiles();

      this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });

      this.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });

      this.getList();

    },

    // 提交上传文件