diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index 8c1c073..80ab138 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -141,9 +141,9 @@
{{row.year}} + alt="">{{row?.year}} {{getKeyContent(row.keyContent)}} + alt="">{{getKeyContent(row?.keyContent)}} + 下载 @@ -246,7 +246,8 @@ export default { ], checkIds: [], checkList: [], - checkedKeys:[] + checkedKeys:[], + isAdmin: false //是否是管理员 } }, watch: { @@ -256,17 +257,21 @@ export default { }, methods: { getKeyContent(list){ - let keyContent=[] - list = JSON.parse(list) - list.forEach(item => { - keyContent.push(item.text) - }) - keyContent = keyContent.toString().replace(/,/g, '/'); - if(keyContent=='') keyContent='---' - // if(keyContent.length>15){ - // keyContent=keyContent.slice(0,15) +'...' - // } - return keyContent + if(list){ + let keyContent=[] + list = JSON.parse(list) + list.forEach(item => { + keyContent.push(item.text) + }) + keyContent = keyContent.toString().replace(/,/g, '/'); + if(keyContent=='') keyContent='---' + // if(keyContent.length>15){ + // keyContent=keyContent.slice(0,15) +'...' + // } + return keyContent + }else{ + return '' + } }, getHalfCheckedNode(node,data){ this.checkedKeys=data.checkedKeys @@ -313,7 +318,7 @@ export default { }, init () { this.getTreeLabel() - this.labelList() + // this.labelList() this.reportDateList() this.reportList() }, @@ -442,6 +447,8 @@ export default { }, created () { this.init() + // 判断当前人是不是管理员 + this.isAdmin = this.$store.getters.userInfo.roleIdList.indexOf('35LLRCAQ8D')>-1 } }