From a6b2ac5dcd7e7fb5466c4c63f33ad7425134ce5f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 28 十月 2022 19:57:35 +0800
Subject: [PATCH] 升级oshi到最新版本6.3.0
---
ruoyi-ui/src/views/system/notice/index.vue | 68 +++++++++++++---------------------
1 files changed, 26 insertions(+), 42 deletions(-)
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 143408c..7982b54 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -1,12 +1,11 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="公告标题" prop="noticeTitle">
<el-input
v-model="queryParams.noticeTitle"
placeholder="请输入公告标题"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -15,17 +14,16 @@
v-model="queryParams.createBy"
placeholder="请输入操作人员"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="类型" prop="noticeType">
- <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
+ <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
<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 +80,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" />
@@ -135,12 +133,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="公告类型" prop="noticeType">
- <el-select v-model="form.noticeType" placeholder="请选择">
+ <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 +147,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 +174,7 @@
export default {
name: "Notice",
+ dicts: ['sys_notice_status', 'sys_notice_type'],
data() {
return {
// 遮罩层
@@ -196,15 +195,10 @@
title: "",
// 是否显示弹出层
open: false,
- // 类型数据字典
- statusOptions: [],
- // 状态数据字典
- typeOptions: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
- reasonable: true,
noticeTitle: undefined,
createBy: undefined,
status: undefined
@@ -224,12 +218,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: {
/** 查询公告列表 */
@@ -295,13 +283,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();
});
@@ -312,16 +300,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