!78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev

疯狂的狮子Li

2021-08-18 0375fd319c9f3b08d255c814cb0f8521d8ec641b

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

@@ -346,11 +346,12 @@
</template>

<script>
import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/system/user";
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus } 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 { downLoadExcel } from "@/utils/download";

export default {
  name: "User",
@@ -436,7 +437,8 @@
      // 表单校验
      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" }
@@ -659,18 +661,7 @@
    },
    /** 导出按钮操作 */
    handleExport() {
      const queryParams = this.queryParams;
      this.$confirm('是否确认导出所有用户数据项?', "警告", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        }).then(() => {
          this.exportLoading = true;
          return exportUser(queryParams);
        }).then(response => {
          this.download(response.msg);
          this.exportLoading = false;
        }).catch(() => {});
      downLoadExcel('/system/user/export', this.queryParams);
    },
    /** 导入按钮操作 */
    handleImport() {
@@ -679,9 +670,7 @@
    },
    /** 下载模板操作 */
    importTemplate() {
      importTemplate().then(response => {
        this.download(response.msg);
      });
      downLoadExcel('/system/user/importTemplate');
    },
    // 文件上传中处理
    handleFileUploadProgress(event, file, fileList) {