|
|
@@ -141,36 +141,36 @@
|
|
|
</vxe-column>
|
|
|
<vxe-column title="操作" min-width="200px" fixed="right" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3'||scope.row.status === '4')&&scope.row.createBy === this.userId" type="text" size="small" @click="registeredPush(scope.row)">修改</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3'||scope.row.status === '4')&&scope.row.createBy === createName" type="text" size="small" @click="registeredPush(scope.row)">修改</el-button>
|
|
|
<!--管理员角色登记完成后可修改-->
|
|
|
<el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && isAdmin && commonJS.isEmpty(scope.row.status1)" type="text" size="small" @click="edit(scope.row.id)">修改</el-button>
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '2'&&scope.row.createBy === this.userId" type="text" size="small" @click="registeredReback(scope.row)">撤回</el-button>
|
|
|
- <el-button v-if="hasPermission('program:registered:del')&&scope.row.status !== '2' && scope.row.status !== '5'&&scope.row.createBy === this.userId" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '2'&&scope.row.createBy === createName" type="text" size="small" @click="registeredReback(scope.row)">撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:del')&&scope.row.status !== '2' && scope.row.status !== '5'&&scope.row.createBy === createName" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
|
|
|
<!--管理员角色登记完成后可删除-->
|
|
|
<el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin && commonJS.isEmpty(scope.row.status1)" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
|
|
|
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === this.userId" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo) && scope.row.createBy === createName" type="text" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
|
|
|
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === this.userId && commonJS.isNotEmpty(scope.row.reportNo)&&scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4'" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === this.userId && commonJS.isNotEmpty(scope.row.reportNo)" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3'||scope.row.status1 === '4')" type="text" size="small" @click="firstAuditPush(scope.row)">一级校审</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&scope.row.createBy === createName && commonJS.isNotEmpty(scope.row.reportNo)" type="text" size="small" @click="firstAuditReback(scope.row)">校审撤回</el-button>
|
|
|
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === this.userId&&scope.row.status1 === '5'&&scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3'||scope.row.status2 === '4'" type="text" size="small" @click="secondAuditPush(scope.row)">二级校审</el-button>
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status2 === '2'&&scope.row.createBy === this.userId" type="text" size="small" @click="secondAuditReback(scope.row)">校审撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3'||scope.row.status2 === '4')" type="text" size="small" @click="secondAuditPush(scope.row)">二级校审</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status2 === '2'&&scope.row.createBy === createName" type="text" size="small" @click="secondAuditReback(scope.row)">校审撤回</el-button>
|
|
|
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === this.userId&&scope.row.status2 === '5' &&scope.row.status3 === '0'||scope.row.status3 === '1'||scope.row.status3 === '3'||scope.row.status3 === '4'" type="text" size="small" @click="thirdAuditPush(scope.row)">三级校审</el-button>
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === this.userId&&scope.row.status3 === '2'" type="text" size="small" @click="thirdAuditReback(scope.row)">校审撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status2 === '5' &&(scope.row.status3 === '0'||scope.row.status3 === '1'||scope.row.status3 === '3'||scope.row.status3 === '4')" type="text" size="small" @click="thirdAuditPush(scope.row)">三级校审</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.status3 === '2'" type="text" size="small" @click="thirdAuditReback(scope.row)">校审撤回</el-button>
|
|
|
|
|
|
<!--三神结束后，评估报告签发前进行资产评估项目（校对）-->
|
|
|
- <el-button v-if="hasPermission('program:registered:proo')&&scope.row.createBy === this.userId&&scope.row.status3 === '5'&&commonJS.isEmpty(scope.row.issuedStatus)" type="text" size="small" @click="proofread(scope.row.id)">校对</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:proo')&&scope.row.createBy === createName&&scope.row.status3 === '5'&&commonJS.isEmpty(scope.row.issuedStatus)" type="text" size="small" @click="proofread(scope.row.id)">校对</el-button>
|
|
|
<!--报告签发-->
|
|
|
- <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === this.userId &&scope.row.status3 === '5' && scope.row.issuedStatus !== '2' && scope.row.issuedStatus !== '5'" type="text" size="small" @click="issued(scope.row)">签发</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === createName &&scope.row.status3 === '5' && scope.row.issuedStatus !== '2' && scope.row.issuedStatus !== '5'" type="text" size="small" @click="issued(scope.row)">签发</el-button>
|
|
|
<!--报告签发撤回-->
|
|
|
- <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === this.userId && scope.row.issuedStatus === '2'" type="text" size="small" @click="issuedReback(scope.row)">签发撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === createName && scope.row.issuedStatus === '2'" type="text" size="small" @click="issuedReback(scope.row)">签发撤回</el-button>
|
|
|
<!--评估报告装订后的审核-->
|
|
|
- <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === this.userId&&scope.row.issuedStatus === '5'&&scope.row.archiveStatus === '0'" type="text" size="small" @click="browse(scope.row.id)">装订自校</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:browse')&&scope.row.createBy === createName&&scope.row.issuedStatus === '5'&&scope.row.archiveStatus === '0'" type="text" size="small" @click="browse(scope.row.id)">装订自校</el-button>
|
|
|
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === this.userId&&scope.row.issuedStatus === '5' &&scope.row.archiveStatus === '0'||scope.row.archiveStatus === '1'||scope.row.archiveStatus === '3'||scope.row.archiveStatus === '4'" type="text" size="small" @click="archivePush(scope.row)">项目归档</el-button>
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === this.userId&&scope.row.archiveStatus === '2'" type="text" size="small" @click="archiveReback(scope.row)">项目归档撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.issuedStatus === '5' &&(scope.row.archiveStatus === '0'||scope.row.archiveStatus === '1'||scope.row.archiveStatus === '3'||scope.row.archiveStatus === '4')" type="text" size="small" @click="archivePush(scope.row)">项目归档</el-button>
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.createBy === createName&&scope.row.archiveStatus === '2'" type="text" size="small" @click="archiveReback(scope.row)">项目归档撤回</el-button>
|
|
|
|
|
|
<!--一级校审ftl文件下载-->
|
|
|
<!-- <el-button v-if="hasPermission('program:registered:edit')" type="text" icon="el-icon-circle-check" size="small" @click="downloadFirstAuditTpl(scope.row)">一级校审下载</el-button>-->
|
|
|
@@ -238,6 +238,7 @@
|
|
|
pageSize: 10,
|
|
|
orders: []
|
|
|
},
|
|
|
+ createName: '',
|
|
|
loading: false,
|
|
|
processDefinitionAuditId: '',
|
|
|
procDefAuditKey: '',
|
|
|
@@ -285,11 +286,8 @@
|
|
|
return JSON.parse(localStorage.getItem('user')).name
|
|
|
},
|
|
|
user () {
|
|
|
- this.create = JSON.parse(localStorage.getItem('user')).id
|
|
|
+ this.createName = JSON.parse(localStorage.getItem('user')).name
|
|
|
return JSON.parse(localStorage.getItem('user'))
|
|
|
- },
|
|
|
- userId () {
|
|
|
- return JSON.parse(localStorage.getItem('user')).id
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -311,6 +309,7 @@
|
|
|
// 获取数据列表
|
|
|
refreshList () {
|
|
|
this.loading = true
|
|
|
+ this.createName = JSON.parse(localStorage.getItem('user')).name
|
|
|
this.programProjectListInfoService.list({
|
|
|
'current': this.tablePage.currentPage,
|
|
|
'size': this.tablePage.pageSize,
|
