diff --git a/src/api/modules/report.js b/src/api/modules/report.js index ee23838..e2bf45d 100644 --- a/src/api/modules/report.js +++ b/src/api/modules/report.js @@ -95,7 +95,7 @@ labelUpdate(data){ // 报告列表 reportList (data) { return request({ - url: '/api/report/list', + url: '/api/report/page', method: 'POST', data }) diff --git a/src/components/Header.vue b/src/components/Header.vue index a257652..f198717 100644 --- a/src/components/Header.vue +++ b/src/components/Header.vue @@ -80,7 +80,7 @@ export default { this.$store.commit('savePathUrl', null) this.$store.commit('saveMenuName', null) this.$store.commit('saveMenuData', null) - this.store.commit('setHandleProcess', null) + this.$store.commit('setHandleProcess', null) // var sevice = "http://"+window.location.host+"/"; // var serviceUrl = encodeURIComponent(sevice); // 正式 diff --git a/src/views/Report/ReportList.vue b/src/views/Report/ReportList.vue index f046d9a..8c1c073 100644 --- a/src/views/Report/ReportList.vue +++ b/src/views/Report/ReportList.vue @@ -96,26 +96,31 @@ + + 权限申请 +
- - - - - - - - - - + + + + + + + + + + + @@ -239,7 +244,9 @@ export default { filterText:'', treeData: [ ], - checkedKeys:[] + checkIds: [], + checkList: [], + checkedKeys:[] } }, watch: { @@ -269,6 +276,41 @@ export default { 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() @@ -434,7 +476,9 @@ export default { color: #262626; } } - + .tag-btn{ + padding: 10px 13px; + } .tag-search { padding-top: 9px; diff --git a/src/views/permissionApplication/launch.vue b/src/views/permissionApplication/launch.vue index 8c6236e..d3c68d1 100644 --- a/src/views/permissionApplication/launch.vue +++ b/src/views/permissionApplication/launch.vue @@ -196,9 +196,9 @@ export default { created() { // 第一次进入此页面 需要清楚校验 if (this.$route.query.ids) { - if (this.$route.query.ids.split(',').length > 0) { - this.reportList(this.$route.query.ids) - } + // if (this.$route.query.ids.split(',').length > 0) { + // this.reportList(this.$route.query.ids) + // } this.handleReset() } if (this.$store.getters.handleProcess.taskDefinitionKey == 'aid4') { diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue index c0ff838..1b84e60 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorDetail.vue @@ -233,7 +233,7 @@ export default { if(check.length > 0){ this.$message.warning("请选择状态为未完成的数据") }else{ - this.$refs.monitorModal.open(this.checkIds[0].taskId,this.prcId,this.checkList[0].assigneeId) + this.$refs.monitorModal.open(this.checkList[0].id,this.prcId,this.checkList[0].assigneeId) } } }, diff --git a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue index 2508d2f..2e7161e 100644 --- a/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue +++ b/src/views/userCenter/processCenter/monitorProcesses/monitorModal.vue @@ -120,6 +120,8 @@ export default { //转办完应该跳到哪个页面? //转办完这个人还能看到这个监控流程吗 this.dialogVisible = false + this.$message.success(res.data.message) + this.sysUserList() }) } }