clay commit : 第一阶段完成
This commit is contained in:
@@ -146,11 +146,11 @@
|
||||
<!-- disable-transitions>完成-->
|
||||
<!-- </el-tag>-->
|
||||
<!-- </template>-->
|
||||
<!-- <el-table-column label="修改时间 " align="center" prop="createTime" width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="发布时间 " align="center" prop="publishTime" width="180">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.publishTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>
|
||||
@@ -183,7 +183,7 @@
|
||||
@click="handleApprova(scope.row)"
|
||||
>审批
|
||||
</el-button>
|
||||
<span v-show="scope.row.approvalUserId===userId && scope.row.status === '3'">
|
||||
<span v-show="(scope.row.approvalUserId===userId || isAdmin) && scope.row.status === '3'">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
@@ -363,6 +363,19 @@ export default {
|
||||
this.getList()
|
||||
},
|
||||
created() {
|
||||
|
||||
|
||||
let roles = JSON.parse(sessionStorage.getItem("roles"))
|
||||
console.log(roles,"roles")
|
||||
for (const role of roles) {
|
||||
console.log(role)
|
||||
if (role.roleName == 'admin'){
|
||||
this.isAdmin = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
getArticleNav().then(res=>{
|
||||
let data = res.data
|
||||
this.articleTypeOptions = data
|
||||
@@ -385,6 +398,11 @@ export default {
|
||||
this.getDicts('article_status').then(response => {
|
||||
this.statusOptions = response.data
|
||||
})
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
},
|
||||
// activated() {
|
||||
// this.getList()
|
||||
|
||||
Reference in New Issue
Block a user