|
|
@@ -235,6 +235,18 @@
|
|
|
</el-button>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
+ <vxe-column min-width="100px" align="center" title="撤回签章" field="rebackStatus" >
|
|
|
+ <template #default="scope">
|
|
|
+ <el-button @click="detailRevocation(scope.row)" effect="dark"
|
|
|
+ v-if="scope.row.rebackStatus !=='0'"
|
|
|
+ :type="$dictUtils.getDictLabel('cw_status_flag', scope.row.rebackStatus, '-')">
|
|
|
+ {{$dictUtils.getDictLabel("cw_status", scope.row.rebackStatus, '未发起')}}
|
|
|
+ </el-button>
|
|
|
+ <el-button v-else effect="dark" >
|
|
|
+ 未发起
|
|
|
+ </el-button>
|
|
|
+ </template>
|
|
|
+ </vxe-column>
|
|
|
|
|
|
<vxe-column title="操作" width="200px" fixed="right" align="center">
|
|
|
<template #default="scope">
|
|
|
@@ -349,6 +361,18 @@
|
|
|
text type="primary"
|
|
|
@click="rebackSig(scope.row)"
|
|
|
>签字注师撤回</el-button>
|
|
|
+<!-- 撤回签章 发起-->
|
|
|
+ <el-button v-if="((
|
|
|
+ (scope.row.signatureType === '1' && scope.row.status1 === '5') ||
|
|
|
+ (scope.row.signatureType === '2' && scope.row.status2 === '5') ||
|
|
|
+ (scope.row.signatureType === '3' && scope.row.status3 === '5'))
|
|
|
+ && scope.row.newType !== '0' && scope.row.reviewStatus === '5' && scope.row.repetitionReviewFlag === false && (scope.row.rebackStatus === '5' ||scope.row.rebackStatus === '3' ||scope.row.rebackStatus === '1' ||scope.row.rebackStatus === '0' || scope.row.rebackStatus === null || scope.row.rebackStatus === '' || scope.row.rebackStatus === undefined))"
|
|
|
+ text type="primary" @click="revocationEdit(scope.row)">撤回签章</el-button>
|
|
|
+ <!-- 审核-->
|
|
|
+ <el-button v-if="scope.row.rebackStatus==='2' && checkIsAuditReview(scope.row)" text type="primary" @click="examineRevocation(scope.row)">审核</el-button>
|
|
|
+ <!-- 被驳回后当前申请人重新调整-->
|
|
|
+ <el-button v-if="hasPermission('cw:workContract:filed')&&scope.row.createById === $store.state.user.id&&scope.row.rebackStatus === '4'" text type="primary" @click="adjustRevocation(scope.row)">驳回调整</el-button>
|
|
|
+ <el-button v-if="hasPermission('cw:workContract:filed')&&scope.row.createById === $store.state.user.id&&scope.row.rebackStatus === '2'" text type="primary" @click="revocation(scope.row)">撤回</el-button>
|
|
|
</div>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
@@ -449,6 +473,8 @@
|
|
|
procDefSTakeNumberKey: '',
|
|
|
processDefinitionTakeNumberReviewAuditId: '',
|
|
|
procDefTakeNumberReviewAuditKey: '',
|
|
|
+ processDefinitionReId: '',
|
|
|
+ procDefReKey: '',
|
|
|
}
|
|
|
},
|
|
|
reportReviewService: null,
|
|
|
@@ -603,6 +629,12 @@
|
|
|
this.procDefSigKey = data.key
|
|
|
}
|
|
|
})
|
|
|
+ processService.getByName('会计-撤回签章').then((data) => {
|
|
|
+ if (!this.commonJS.isEmpty(data.id)) {
|
|
|
+ this.processDefinitionReId = data.id
|
|
|
+ this.procDefReKey = data.key
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 当前页
|
|
|
currentChangeHandle ({ currentPage, pageSize }) {
|
|
|
@@ -1829,7 +1861,130 @@
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
-
|
|
|
+ //撤回签章 发起
|
|
|
+ revocationEdit(row){
|
|
|
+ // 读取流程表单
|
|
|
+ let title = `发起流程【会计-撤回签章】`
|
|
|
+ let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[会计-撤回签章]`
|
|
|
+ let status = 'startAndHold'
|
|
|
+ if (row.rebackStatus === '3') {
|
|
|
+ status = 'startAndClose'
|
|
|
+ } else if (row.rebackStatus === '4') {
|
|
|
+ status = 'reapplyFlag'
|
|
|
+ }
|
|
|
+ taskService.getTaskDef({ procDefId: this.processDefinitionReId,
|
|
|
+ businessId: row.revocationId,
|
|
|
+ businessTable: 'cw_revocation_signature'}).then((data) => {
|
|
|
+ console.log('qqq',data)
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskForm',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
+ procDefId: this.processDefinitionReId,
|
|
|
+ procDefKey: this.procDefReKey,
|
|
|
+ title: title,
|
|
|
+ formType: data.formType,
|
|
|
+ formUrl: data.formUrl,
|
|
|
+ formTitle: processTitle,
|
|
|
+ businessTable: 'cw_revocation_signature',
|
|
|
+ businessId: row.id,
|
|
|
+ isShow: 'false',
|
|
|
+ status: status,
|
|
|
+ routePath: '/cw/reportManagement/ReportManagementList'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //撤回签章 撤回
|
|
|
+ revocation(row){
|
|
|
+ console.log('row',row)
|
|
|
+ this.$confirm(`确定要撤回该申请吗?`, '提示', {
|
|
|
+ confirmButtonText: '确定',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+ projectReportService.queryByReId(row.revocationId).then((data) => {
|
|
|
+ if (data.rebackStatus !== '2') { // status的值不等于“审核中”，就弹出提示
|
|
|
+ this.$message.error('数据已发生改变或不存在，请刷新数据')
|
|
|
+ this.refreshList()
|
|
|
+ } else {
|
|
|
+ processService.revokeProcIns(row.procInsReId).then((data) => {
|
|
|
+ let form = {rebackStatus: '3', revocationId: row.revocationId}
|
|
|
+ projectReportService.updateStatusByIdRe(form)
|
|
|
+ this.$message.success(data)
|
|
|
+ this.refreshList()
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 撤回签章 审核或重新调整跳转
|
|
|
+ examineRevocation (row) {
|
|
|
+ let cUser = false
|
|
|
+ taskService.getTaskDefInfo({
|
|
|
+ taskId: row.revocationTaskId
|
|
|
+ }).then((data) => {
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskForm',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
|
|
|
+ isShow: false,
|
|
|
+ formReadOnly: true,
|
|
|
+ formTitle: `${data.taskName}`,
|
|
|
+ cUser: cUser,
|
|
|
+ title: `审批【${data.taskName || ''}】`,
|
|
|
+ routePath: '/cw/reportManagement/ReportManagementList' // 数据处理后需要跳转的页面路径
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //驳回后重新调整
|
|
|
+ adjustRevocation(row){
|
|
|
+ console.log('XXX',row)
|
|
|
+ let cUser = false
|
|
|
+ taskService.getTaskDefInfo({
|
|
|
+ taskId: row.revocationTaskId
|
|
|
+ }).then((data) => {
|
|
|
+ console.log('data',data)
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskForm',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
|
|
|
+ isShow: false,
|
|
|
+ formReadOnly: true,
|
|
|
+ formTitle: `${data.taskName}`,
|
|
|
+ cUser: cUser,
|
|
|
+ title: `审批【${data.taskName || ''}】`,
|
|
|
+ routePath: '/cw/reportManagement/ReportManagementList' // 数据处理后需要跳转的页面路径
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //查看报告-修改签字注师流程信息
|
|
|
+ detailRevocation(row){
|
|
|
+ console.log('sigrow',row)
|
|
|
+ if (row.rebackStatus !== '0' && row.rebackStatus !== '1') {
|
|
|
+ // eslint-disable-next-line eqeqeq
|
|
|
+ taskService.getTaskDef({
|
|
|
+ procInsId: row.procInsReId,
|
|
|
+ procDefId: this.processDefinitionReId
|
|
|
+ }).then((data) => {
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskFormDetail',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
+ isShow: 'false',
|
|
|
+ readOnly: true,
|
|
|
+ title: '会计-撤回签章' + '流程详情',
|
|
|
+ formTitle: '会计-撤回签章' + '流程详情',
|
|
|
+ businessId: row.revocationId,
|
|
|
+ status: 'reback',
|
|
|
+ sigId:row.id
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ }
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
sangwenwei