From 43d76e599091dc6b79b51f89c79514b50e33ea35 Mon Sep 17 00:00:00 2001 From: fuzui <73400@163.com> Date: 星期四, 16 十二月 2021 02:18:48 +0800 Subject: [PATCH] fix: cron组件中周回显bug --- ruoyi-ui/src/views/system/notice/index.vue | 59 +++++++++++++++++++++++------------------------------------ 1 files changed, 23 insertions(+), 36 deletions(-) diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue index 7b4eb2d..22b2ad5 100644 --- a/ruoyi-ui/src/views/system/notice/index.vue +++ b/ruoyi-ui/src/views/system/notice/index.vue @@ -22,10 +22,10 @@ <el-form-item label="类型" prop="noticeType"> <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small"> <el-option - v-for="dict in typeOptions" - :key="dict.dictValue" - :label="dict.dictLabel" - :value="dict.dictValue" + v-for="dict in dict.type.sys_notice_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" /> </el-select> </el-form-item> @@ -82,12 +82,12 @@ /> <el-table-column label="公告类型" align="center" prop="noticeType" width="100"> <template slot-scope="scope"> - <dict-tag :options="typeOptions" :value="scope.row.noticeType"/> + <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/> </template> </el-table-column> <el-table-column label="状态" align="center" prop="status" width="100"> <template slot-scope="scope"> - <dict-tag :options="statusOptions" :value="scope.row.status"/> + <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/> </template> </el-table-column> <el-table-column label="创建者" align="center" prop="createBy" width="100" /> @@ -137,10 +137,10 @@ <el-form-item label="公告类型" prop="noticeType"> <el-select v-model="form.noticeType" placeholder="请选择"> <el-option - v-for="dict in typeOptions" - :key="dict.dictValue" - :label="dict.dictLabel" - :value="dict.dictValue" + v-for="dict in dict.type.sys_notice_type" + :key="dict.value" + :label="dict.label" + :value="dict.value" ></el-option> </el-select> </el-form-item> @@ -149,10 +149,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_notice_status" + :key="dict.value" + :label="dict.value" + >{{dict.label}}</el-radio> </el-radio-group> </el-form-item> </el-col> @@ -176,6 +176,7 @@ export default { name: "Notice", + dicts: ['sys_notice_status', 'sys_notice_type'], data() { return { // 遮罩层 @@ -196,10 +197,6 @@ title: "", // 是否显示弹出层 open: false, - // 类型数据字典 - statusOptions: [], - // 状态数据字典 - typeOptions: [], // 查询参数 queryParams: { pageNum: 1, @@ -223,12 +220,6 @@ }, created() { this.getList(); - this.getDicts("sys_notice_status").then(response => { - this.statusOptions = response.data; - }); - this.getDicts("sys_notice_type").then(response => { - this.typeOptions = response.data; - }); }, methods: { /** 查询公告列表 */ @@ -294,13 +285,13 @@ if (valid) { if (this.form.noticeId != undefined) { updateNotice(this.form).then(response => { - this.msgSuccess("修改成功"); + this.$modal.msgSuccess("修改成功"); this.open = false; this.getList(); }); } else { addNotice(this.form).then(response => { - this.msgSuccess("新增成功"); + this.$modal.msgSuccess("新增成功"); this.open = false; this.getList(); }); @@ -311,16 +302,12 @@ /** 删除按钮操作 */ handleDelete(row) { const noticeIds = row.noticeId || this.ids - this.$confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?', "警告", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }).then(function() { - return delNotice(noticeIds); - }).then(() => { - this.getList(); - this.msgSuccess("删除成功"); - }).catch(() => {}); + this.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项?').then(function() { + return delNotice(noticeIds); + }).then(() => { + this.getList(); + this.$modal.msgSuccess("删除成功"); + }).catch(() => {}); } } }; -- Gitblit v1.9.2