fix: cron组件中周回显bug

fuzui

2021-12-16 43d76e599091dc6b79b51f89c79514b50e33ea35

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

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

@@ -131,7 +131,6 @@
              plain

              icon="el-icon-download"

              size="mini"

              :loading="exportLoading"

              @click="handleExport"

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

            >导出</el-button>

@@ -207,7 +206,7 @@
      </el-col>

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

@@ -251,10 +250,10 @@
            <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>

@@ -263,10 +262,10 @@
            <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>

@@ -346,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";

@@ -354,13 +353,12 @@


export default {

  name: "User",

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

  components: { Treeselect },

  data() {

    return {

      // 遮罩层

      loading: true,

      // 导出遮罩层

      exportLoading: false,

      // 选中数组

      ids: [],

      // 非单个禁用

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

      // 日期范围

      dateRange: [],

      // 状态数据字典

      statusOptions: [],

      // 性别状态字典

      sexOptions: [],

      // 岗位选项

      postOptions: [],

      // 角色选项

@@ -418,7 +412,6 @@
      queryParams: {

        pageNum: 1,

        pageSize: 10,

        reasonable: true,

        userName: undefined,

        phonenumber: undefined,

        status: undefined,

@@ -473,12 +466,6 @@
  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.msg;

    });

@@ -513,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() {

@@ -613,10 +596,10 @@
        cancelButtonText: "取消",

        closeOnClickModal: false,

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

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

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

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

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

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

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

          });

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

    },

@@ -631,13 +614,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();

            });

@@ -648,31 +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(() => {});

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

          this.exportLoading = true;

          return exportUser(queryParams);

        }).then(response => {

          this.download(response.msg);

          this.exportLoading = false;

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

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

        ...this.queryParams

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

    },

    /** 导入按钮操作 */

    handleImport() {

@@ -681,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) {