From a320a79c80564cf789c6e3230fd8989fc5292b56 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 26 Mar 2024 10:12:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/backblask/BackblastArticle.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/views/backblask/BackblastArticle.vue b/src/views/backblask/BackblastArticle.vue
index 41177fb..60b7560 100644
--- a/src/views/backblask/BackblastArticle.vue
+++ b/src/views/backblask/BackblastArticle.vue
@@ -5,22 +5,22 @@
@search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange"
@current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
<template slot="menuLeft">
- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_delete" @click="handleDelete">删
+ <!-- <el-button size="small" icon="el-icon-delete" plain v-if="permission.article_backblast_delete" @click="handleDelete">删
除
- </el-button>
+ </el-button> -->
</template>
<template slot-scope="{type,size,row }" slot="menu">
- <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)">
+ <el-button icon="el-icon-user" :size="size" :type="type" @click.stop="openUserPopup(row, 1)" v-if="permission.article_backblast_user">
浏览人员
</el-button>
- <el-button v-if="row.publish == '1'" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
+ <el-button v-if="row.publish == '1' && permission.article_backblast_addOrDel" icon="el-icon-close" :size="size" :type="type" @click.stop="updateFb(row)">
撤销
</el-button>
- <el-button v-if="row.publish == '0'" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
+ <el-button v-if="row.publish == '0' && permission.article_backblast_addOrDel" icon="el-icon-check" :size="size" :type="type" @click.stop="updateFb(row)">
发布
</el-button>
</template>
@@ -426,10 +426,10 @@
...mapGetters(["permission", "userInfo"]),
permissionList() {
return {
- addBtn: this.vaildData(this.permission.article_add, true),
- viewBtn: this.vaildData(this.permission.article_view, true),
- delBtn: this.vaildData(this.permission.article_delete, true),
- editBtn: this.vaildData(this.permission.article_edit, true),
+ addBtn: this.vaildData(this.permission.article_backblast_add, true),
+ viewBtn: this.vaildData(this.permission.article_backblast_view, true),
+ delBtn: this.vaildData(this.permission.article_backblast_delete, true),
+ editBtn: this.vaildData(this.permission.article_backblast_edit, true),
}
},
--
Gitblit v1.9.3