|
@@ -192,7 +192,7 @@
|
|
|
},
|
|
},
|
|
|
// 表格字段配置
|
|
// 表格字段配置
|
|
|
columns: [
|
|
columns: [
|
|
|
- /* { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 }, */
|
|
|
|
|
|
|
+ // { prop: 'subject', label: '任务标题', link: 'dialog', width: 250 },
|
|
|
{ prop: 'tYear', label: '年份', width: 58 },
|
|
{ prop: 'tYear', label: '年份', width: 58 },
|
|
|
{ prop: 'tDept', label: '部门', width: 120 },
|
|
{ prop: 'tDept', label: '部门', width: 120 },
|
|
|
{ prop: 'procDefName', label: '表单名称' },
|
|
{ prop: 'procDefName', label: '表单名称' },
|
|
@@ -227,7 +227,7 @@
|
|
|
this.loadData()
|
|
this.loadData()
|
|
|
this.getConfig() //获取配置的报表
|
|
this.getConfig() //获取配置的报表
|
|
|
let roleArr = this.$store.getters.userInfo.role
|
|
let roleArr = this.$store.getters.userInfo.role
|
|
|
- console.log(roleArr)
|
|
|
|
|
|
|
+ // console.log(roleArr)
|
|
|
const hasRole = roleArr.some(item => item.name === '系统管理角色')
|
|
const hasRole = roleArr.some(item => item.name === '系统管理角色')
|
|
|
if (hasRole) {
|
|
if (hasRole) {
|
|
|
this.listConfig.toolbars.push({ key: 'remove' })
|
|
this.listConfig.toolbars.push({ key: 'remove' })
|
|
@@ -294,10 +294,7 @@
|
|
|
if (options[1]) {
|
|
if (options[1]) {
|
|
|
let yersOption = options[1]
|
|
let yersOption = options[1]
|
|
|
if (yersOption) {
|
|
if (yersOption) {
|
|
|
- result =
|
|
|
|
|
- result +
|
|
|
|
|
- '/' +
|
|
|
|
|
- yersOption.substring(1, yersOption.length - 1)
|
|
|
|
|
|
|
+ result = result + '/' + yersOption.substring(1, yersOption.length - 1)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|