From 8d7721c95cc004e3af1493b6289ace05658bb967 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 一月 2024 21:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/desk/notice.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/desk/notice.vue b/Source/UBCS-WEB/src/views/desk/notice.vue
index 7886ec9..71e8485 100644
--- a/Source/UBCS-WEB/src/views/desk/notice.vue
+++ b/Source/UBCS-WEB/src/views/desk/notice.vue
@@ -23,7 +23,7 @@
size="small"
icon="el-icon-delete"
plain
- v-if="permission.notice_delete"
+ v-if="permissionList.delBtn"
@click="handleDelete">鍒� 闄�
</el-button>
</template>
@@ -53,8 +53,9 @@
selectionList: [],
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
dialogWidth: 950,
+ columnBtn:false,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -80,7 +81,7 @@
{
label: "閫氱煡绫诲瀷",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=notice",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=notice",
props: {
label: "dictValue",
value: "dictKey"
@@ -130,7 +131,7 @@
prop: "content",
component: 'AvueUeditor',
options: {
- action: '/api/blade-resource/oss/endpoint/put-file',
+ action: '/api/ubcs-resource/oss/endpoint/put-file',
props: {
res: "data",
url: "link",
@@ -149,10 +150,10 @@
...mapGetters(["permission"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.notice_add, false),
- viewBtn: this.vaildData(this.permission.notice_view, false),
- delBtn: this.vaildData(this.permission.notice_delete, false),
- editBtn: this.vaildData(this.permission.notice_edit, false)
+ addBtn: this.vaildData(this.permission.notice.notice_add, false),
+ viewBtn: this.vaildData(this.permission.notice.notice_view, false),
+ delBtn: this.vaildData(this.permission.notice.notice_delete, false),
+ editBtn: this.vaildData(this.permission.notice.notice_edit, false)
};
},
ids() {
--
Gitblit v1.9.3