From 2af534eea471f4adb104906c7a814bcc66d4d68d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 13 九月 2021 13:03:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/system/notice/index.vue | 40 ++++++++++++----------------------------
1 files changed, 12 insertions(+), 28 deletions(-)
diff --git a/ruoyi-ui/src/views/system/notice/index.vue b/ruoyi-ui/src/views/system/notice/index.vue
index 1f570a8..b90168c 100644
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -80,20 +80,16 @@
prop="noticeTitle"
:show-overflow-tooltip="true"
/>
- <el-table-column
- label="鍏憡绫诲瀷"
- align="center"
- prop="noticeType"
- :formatter="typeFormat"
- width="100"
- />
- <el-table-column
- label="鐘舵��"
- align="center"
- prop="status"
- :formatter="statusFormat"
- width="100"
- />
+ <el-table-column label="鍏憡绫诲瀷" align="center" prop="noticeType" width="100">
+ <template slot-scope="scope">
+ <dict-tag :options="typeOptions" :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"/>
+ </template>
+ </el-table-column>
<el-table-column label="鍒涘缓鑰�" align="center" prop="createBy" width="100" />
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="100">
<template slot-scope="scope">
@@ -176,14 +172,10 @@
</template>
<script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
-import Editor from '@/components/Editor';
+import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice";
export default {
name: "Notice",
- components: {
- Editor
- },
data() {
return {
// 閬僵灞�
@@ -247,14 +239,6 @@
this.total = response.total;
this.loading = false;
});
- },
- // 鍏憡鐘舵�佸瓧鍏哥炕璇�
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
- },
- // 鍏憡鐘舵�佸瓧鍏哥炕璇�
- typeFormat(row, column) {
- return this.selectDictLabel(this.typeOptions, row.noticeType);
},
// 鍙栨秷鎸夐挳
cancel() {
@@ -336,7 +320,7 @@
}).then(() => {
this.getList();
this.msgSuccess("鍒犻櫎鎴愬姛");
- })
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.3