fix: cron组件中周回显bug

fuzui

2021-12-16 43d76e599091dc6b79b51f89c79514b50e33ea35

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

@@ -27,7 +27,7 @@
      </el-col>

      <!--用户数据-->

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

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

        <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"

@@ -57,10 +57,10 @@
              style="width: 240px"

            >

              <el-option

                v-for="dict in statusOptions"

                :key="dict.dictValue"

                :label="dict.dictLabel"

                :value="dict.dictValue"

                v-for="dict in dict.type.sys_normal_disable"

                :key="dict.value"

                :label="dict.label"

                :value="dict.value"

              />

            </el-select>

          </el-form-item>

@@ -86,6 +86,7 @@
          <el-col :span="1.5">

            <el-button

              type="primary"

              plain

              icon="el-icon-plus"

              size="mini"

              @click="handleAdd"

@@ -95,6 +96,7 @@
          <el-col :span="1.5">

            <el-button

              type="success"

              plain

              icon="el-icon-edit"

              size="mini"

              :disabled="single"

@@ -105,6 +107,7 @@
          <el-col :span="1.5">

            <el-button

              type="danger"

              plain

              icon="el-icon-delete"

              size="mini"

              :disabled="multiple"

@@ -115,6 +118,7 @@
          <el-col :span="1.5">

            <el-button

              type="info"

              plain

              icon="el-icon-upload2"

              size="mini"

              @click="handleImport"

@@ -124,22 +128,24 @@
          <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="40" align="center" />

          <el-table-column label="用户编号" align="center" prop="userId" />

          <el-table-column label="用户名称" align="center" prop="userName" />

          <el-table-column label="用户昵称" align="center" prop="nickName" />

          <el-table-column label="部门" align="center" prop="dept.deptName" />

          <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />

          <el-table-column label="状态" align="center">

          <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"

@@ -149,7 +155,7 @@
              ></el-switch>

            </template>

          </el-table-column>

          <el-table-column label="创建时间" align="center" prop="createTime" width="160">

          <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>

@@ -157,10 +163,10 @@
          <el-table-column

            label="操作"

            align="center"

            width="180"

            width="160"

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

          >

            <template slot-scope="scope">

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

              <el-button

                size="mini"

                type="text"

@@ -169,20 +175,23 @@
                v-hasPermi="['system:user:edit']"

              >修改</el-button>

              <el-button

                v-if="scope.row.userId !== 1"

                size="mini"

                type="text"

                icon="el-icon-delete"

                @click="handleDelete(scope.row)"

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

              >删除</el-button>

              <el-button

                size="mini"

                type="text"

                icon="el-icon-key"

                @click="handleResetPwd(scope.row)"

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

              >重置</el-button>

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

                <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="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>

@@ -197,20 +206,22 @@
      </el-col>

    </el-row>



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

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

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

    <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>

          <el-col :span="12">

            <el-form-item label="用户昵称" prop="nickName">

              <el-input v-model="form.nickName" placeholder="请输入用户昵称" />

              <el-input v-model="form.nickName" placeholder="请输入用户昵称" maxlength="30" />

            </el-form-item>

          </el-col>

          <el-col :span="12">

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

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

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

            </el-form-item>

          </el-col>

        </el-row>

        <el-row>

          <el-col :span="12">

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

              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />

@@ -221,24 +232,28 @@
              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />

            </el-form-item>

          </el-col>

        </el-row>

        <el-row>

          <el-col :span="12">

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

              <el-input v-model="form.userName" placeholder="请输入用户名称" />

            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">

              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />

            </el-form-item>

          </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" />

              <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"

                  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>

@@ -247,14 +262,15 @@
            <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>

                  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>



        </el-row>

        <el-row>

          <el-col :span="12">

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

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

@@ -281,6 +297,8 @@
              </el-select>

            </el-form-item>

          </el-col>

        </el-row>

        <el-row>

          <el-col :span="24">

            <el-form-item label="备注">

              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>

@@ -295,7 +313,7 @@
    </el-dialog>



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

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

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

      <el-upload

        ref="upload"

        :limit="1"

@@ -309,15 +327,14 @@
        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>

@@ -328,7 +345,7 @@
</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";

@@ -336,6 +353,7 @@


export default {

  name: "User",

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

  components: { Treeselect },

  data() {

    return {

@@ -347,6 +365,8 @@
      single: true,

      // 非多个禁用

      multiple: true,

      // 显示搜索条件

      showSearch: true,

      // 总条数

      total: 0,

      // 用户表格数据

@@ -363,10 +383,6 @@
      initPassword: undefined,

      // 日期范围

      dateRange: [],

      // 状态数据字典

      statusOptions: [],

      // 性别状态字典

      sexOptions: [],

      // 岗位选项

      postOptions: [],

      // 角色选项

@@ -401,19 +417,28 @@
        status: undefined,

        deptId: undefined

      },

      // 列信息

      columns: [

        { key: 0, label: `用户编号`, visible: true },

        { key: 1, label: `用户名称`, visible: true },

        { key: 2, label: `用户昵称`, visible: true },

        { key: 3, label: `部门`, visible: true },

        { key: 4, label: `手机号码`, visible: true },

        { key: 5, label: `状态`, visible: true },

        { key: 6, label: `创建时间`, visible: true }

      ],

      // 表单校验

      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" }

        ],

        deptId: [

          { required: true, message: "归属部门不能为空", trigger: "blur" }

        ],

        password: [

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

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

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

        ],

        email: [

          {

@@ -441,14 +466,8 @@
  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.getConfigKey("sys.user.initPassword").then(response => {

      this.initPassword = response.data;

      this.initPassword = response.msg;

    });

  },

  methods: {

@@ -481,17 +500,13 @@
    // 用户状态修改

    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() {

@@ -502,7 +517,7 @@
    reset() {

      this.form = {

        userId: undefined,

        deptId: 100,

        deptId: undefined,

        userName: undefined,

        nickName: undefined,

        password: undefined,

@@ -518,7 +533,7 @@
    },

    /** 搜索按钮操作 */

    handleQuery() {

      this.queryParams.page = 1;

      this.queryParams.pageNum = 1;

      this.getList();

    },

    /** 重置按钮操作 */

@@ -532,6 +547,19 @@
      this.ids = selection.map(item => item.userId);

      this.single = selection.length != 1;

      this.multiple = !selection.length;

    },

    // 更多操作触发

    handleCommand(command, row) {

      switch (command) {

        case "handleResetPwd":

          this.handleResetPwd(row);

          break;

        case "handleAuthRole":

          this.handleAuthRole(row);

          break;

        default:

          break;

      }

    },

    /** 新增按钮操作 */

    handleAdd() {

@@ -565,16 +593,20 @@
    handleResetPwd(row) {

      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {

        confirmButtonText: "确定",

        cancelButtonText: "取消"

        cancelButtonText: "取消",

        closeOnClickModal: false,

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

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

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

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

            if (response.code === 200) {

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

            } else {

              this.msgError(response.msg);

            }

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

          });

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

    },

    /** 分配角色操作 */

    handleAuthRole: function(row) {

      const userId = row.userId;

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

    },

    /** 提交按钮 */

    submitForm: function() {

@@ -582,23 +614,15 @@
        if (valid) {

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

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

              if (response.code === 200) {

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

                this.open = false;

                this.getList();

              } else {

                this.msgError(response.msg);

              }

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

              this.open = false;

              this.getList();

            });

          } else {

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

              if (response.code === 200) {

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

                this.open = false;

                this.getList();

              } else {

                this.msgError(response.msg);

              }

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

              this.open = false;

              this.getList();

            });

          }

        }

@@ -607,29 +631,18 @@
    /** 删除按钮操作 */

    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(function() {});

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

        return delUser(userIds);

      }).then(() => {

        this.getList();

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

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

    },

    /** 导出按钮操作 */

    handleExport() {

      const queryParams = this.queryParams;

      this.$confirm('是否确认导出所有用户数据项?', "警告", {

          confirmButtonText: "确定",

          cancelButtonText: "取消",

          type: "warning"

        }).then(function() {

          return exportUser(queryParams);

        }).then(response => {

          this.download(response.msg);

        }).catch(function() {});

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

        ...this.queryParams

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

    },

    /** 导入按钮操作 */

    handleImport() {

@@ -638,9 +651,8 @@
    },

    /** 下载模板操作 */

    importTemplate() {

      importTemplate().then(response => {

        this.download(response.msg);

      });

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

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

    },

    // 文件上传中处理

    handleFileUploadProgress(event, file, fileList) {