diff --git a/src/api/modules/report.js b/src/api/modules/report.js index 8eb9656..ee23838 100644 --- a/src/api/modules/report.js +++ b/src/api/modules/report.js @@ -37,16 +37,26 @@ export default { // 标签删除|单个 labelDeleteId (data) { return request({ - url: `api/tree-label/${data.id}`, + url: `api/tree-label/delete/${data.id}`, method: 'POST' }) }, -labelUpdate(){ + // 标签列表 + labelNodeList (id) { + return request({ + url: `api/tree-label/labelList/${id}`, + method: 'GET', + params: id + }) + }, +labelUpdate(data){ return request({ url: 'api/tree-label/update', - method: 'POST' + method: 'POST', + data }) }, + // 新增或编辑报告 reportAdd (data) { return request({ @@ -90,6 +100,14 @@ labelUpdate(){ data }) }, + // 报告管理列表 + reportListManager (data) { + return request({ + url: '/api/report/list-auth', + method: 'POST', + data + }) + }, // 获取报告日期列表 reportDateList (data) { return request({ diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index fde6b7f..f046d9a 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -8,7 +8,7 @@
- +
@@ -96,30 +96,26 @@ - - 权限申请 -
- - - - - - - - - - - + + + + + + + + + + @@ -141,9 +137,9 @@
{{row.year}} - @@ -155,8 +151,8 @@ @@ -171,7 +167,6 @@ :total="total"/> -
@@ -209,12 +204,10 @@ export default { q: { keyContent: '', year: [], - labelOneId: [], - labelTwoId: [], - labelThreeId: [], + name:'', pageNo: 1, - pageSize: 10 - }, + pageSize: 10, + }, total: 0, tableData: [], yearList: [], @@ -245,64 +238,8 @@ export default { content: '', filterText:'', treeData: [ - { - id: 0, - label: '根节点', - children: [ - { - id: 1, - label: '一级 1', - children: [ - { - id: 4, - label: '二级 1-1', - children: [ - { - id: 9, - label: '三级 1-1-1' - }, - { - id: 10, - label: '三级 1-1-2' - } - ] - } - ] - }, - { - id: 2, - label: '一级 2', - children: [ - { - id: 5, - label: '二级 2-1' - }, - { - id: 6, - label: '二级 2-2' - } - ] - }, - { - id: 3, - label: '一级 3', - children: [ - { - id: 7, - label: '二级 3-1' - }, - { - id: 8, - label: '二级 3-2' - } - ] - }, - ] - - } ], - checkIds: [], - checkList: [] + checkedKeys:[] } }, watch: { @@ -311,50 +248,39 @@ 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 + }, + getHalfCheckedNode(node,data){ + this.checkedKeys=data.checkedKeys + this.reportList() + }, filterNode(value, data) { if (!value) return true; return data.label.indexOf(value) !== -1; }, - selectAllEvent ({ checked }) { - const records = this.$refs.xTable.getCheckboxRecords() - this.checkList= records - this.checkIds = records.map(item => { - return item.id - }) - }, - selectChangeEvent ({ checked }) { - const records = this.$refs.xTable.getCheckboxRecords() - this.checkList= records - this.checkIds = records.map(item => { - return item.id - }) - }, - permissionApp () { - if(this.checkList.length <1){ - this.$message.warning("至少选择一条报告进行权限申请") - return - } - // 有预览权限的时候是否还让继续申请 - let temp=this.checkList.filter(item =>{ - if(+item.power == 1 || +item.power == 2){ - return item.name - } - }) - if(temp.length>0) { - this.$message.warning("当前选择的"+temp.toString()+"已经有权限，无须申请！") - return - } - - this.$router.push({ - path: '/permission/launch', - query: { id: 'AEHJB8YNJ3', ids: this.checkIds.toString() } - }) - }, init () { + this.getTreeLabel() this.labelList() this.reportDateList() this.reportList() }, + getTreeLabel(){ + this.$api.report.labelList().then(res => { + this.treeData=res.data + }) + }, + // 标签列表 labelList () { this.$api.report.labelList().then(({ data }) => { @@ -372,7 +298,7 @@ export default { }, // 列表 reportList () { - this.$api.report.reportList(this.q).then(({ data }) => { + this.$api.report.reportList({...this.q,labelId:this.checkedKeys}).then(({ data }) => { this.tableData = data.records this.total = data.total this.q.pageNo = data.current @@ -479,6 +405,22 @@ export default {