|
|
@@ -12,7 +12,7 @@
|
|
|
<UserSelect :limit='1' :readonly="true" :modelValue="searchForm.createById" @update:modelValue='(value) => {searchForm.createById = value}'></UserSelect>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-if="showHideItem" label="项目负责人" prop="projectLeader">
|
|
|
- <el-input v-model="searchForm.projectLeader" placeholder="请输入项目负责人" clearable></el-input>
|
|
|
+ <UserSelect :limit='1' :readonly="true" :modelValue="searchForm.projectLeader" @update:modelValue='(value) => {searchForm.projectLeader = value}'></UserSelect>
|
|
|
</el-form-item>
|
|
|
<el-form-item v-if="showHideItem" label="合同名称" prop="contractName">
|
|
|
<el-input v-model="searchForm.contractName" placeholder="请输入合同名称" clearable></el-input>
|
|
|
@@ -218,31 +218,31 @@
|
|
|
</vxe-column>
|
|
|
<vxe-column title="操作" min-width="200px" fixed="right" align="center">
|
|
|
<template #default="scope">
|
|
|
- <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary" @click="registeredPush(scope.row)">修改</el-button>
|
|
|
+ <el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy === $store.state.user.id" text type="primary" @click="registeredPush(scope.row)">修改</el-button>
|
|
|
<!--管理员角色登记完成后可修改-->
|
|
|
<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && isAdmin" text type="primary" @click="edit(scope.row.id)">修改</el-button>
|
|
|
<!--项目负责人修改-->
|
|
|
<el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '5' && scope.row.projectLeader === $store.state.user.id" text type="primary" @click="edit(scope.row.id)">修改</el-button>
|
|
|
- <el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '2'&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary" @click="registeredReback(scope.row)">撤回</el-button>
|
|
|
+ <el-button v-if="hasPermission('jy_project:info:edit')&&scope.row.status === '2'&&scope.row.createBy === $store.state.user.id" text type="primary" @click="registeredReback(scope.row)">撤回</el-button>
|
|
|
<!--项目登记 审核-->
|
|
|
<el-button v-if="scope.row.status==='2' && checkIsAudit(scope.row)" text type="primary" @click="examine(scope.row)">登记审核</el-button>
|
|
|
<!--项目登记 被驳回后当前申请人重新调整-->
|
|
|
<el-button v-if="hasPermission('jy_project:info:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status === '4'" text type="primary" @click="adjust(scope.row)">驳回调整</el-button>
|
|
|
|
|
|
- <el-button v-if="hasPermission('jy_project:info:del')&&(scope.row.status === '1' || scope.row.status === '3')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary" @click="del(scope.row.id)">删除</el-button>
|
|
|
+ <el-button v-if="hasPermission('jy_project:info:del')&&(scope.row.status === '1' || scope.row.status === '3')&&scope.row.createBy === $store.state.user.id" text type="primary" @click="del(scope.row.id)">删除</el-button>
|
|
|
<!--管理员角色登记完成后可删除-->
|
|
|
<el-button v-if="hasPermission('jy_project:info:del')&&scope.row.status === '5' && isAdmin" text type="primary" @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 === $store.state.user.id" text type="primary" @click="saveReportNo(scope.row.id)">生成报告号</el-button>-->
|
|
|
|
|
|
<!-- <!– 一级校审 发起–>-->
|
|
|
-<!-- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&(scope.row.status1 === '0'||scope.row.status1 === '1'||scope.row.status1 === '3')" text type="primary" @click="firstAuditPush(scope.row)">一级校审</el-button>-->
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' &&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&(scope.row.firstInstanceStatus === '0'||scope.row.firstInstanceStatus === '1'||scope.row.firstInstanceStatus === '3')" text type="primary" @click="firstAuditPush(scope.row)">一级校审</el-button>
|
|
|
<!-- <!– 一级校审 撤回–>-->
|
|
|
-<!-- <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status1 === '2' &&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary" @click="firstAuditReback(scope.row)">校审撤回</el-button>-->
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&scope.row.firstInstanceStatus === '2' &&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))" text type="primary" @click="firstAuditReback(scope.row)">校审撤回</el-button>
|
|
|
<!-- <!– 一级校审 审核–>-->
|
|
|
-<!-- <el-button v-if="scope.row.status1==='2' && checkIsAuditFirst(scope.row)" text type="primary" @click="examineFirst(scope.row)">一级校审审核</el-button>-->
|
|
|
+ <el-button v-if="scope.row.firstInstanceStatus==='2' && checkIsAuditFirst(scope.row)" text type="primary" @click="examineFirst(scope.row)">一级校审审核</el-button>
|
|
|
<!-- <!– 一级校审 被驳回后当前申请人重新调整–>-->
|
|
|
-<!-- <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status1 === '4'" text type="primary" @click="adjustFirst(scope.row)">驳回调整</el-button>-->
|
|
|
+ <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.firstInstanceStatus === '4'" text type="primary" @click="adjustFirst(scope.row)">驳回调整</el-button>
|
|
|
|
|
|
<!-- <!– 二级校审 发起–>-->
|
|
|
<!-- <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.createBy === $store.state.user.id||haveProjectIds.includes(scope.row.id))&&scope.row.status1 === '5'&&(scope.row.status2 === '0'||scope.row.status2 === '1'||scope.row.status2 === '3')" text type="primary" @click="secondAuditPush(scope.row)">二级校审</el-button>-->
|
|
|
@@ -311,8 +311,9 @@
|
|
|
@page-change="currentChangeHandle">
|
|
|
</vxe-pager>
|
|
|
</div>
|
|
|
+ <ProjectDia ref="projectDia" @refreshDataList="refreshList"></ProjectDia>
|
|
|
</div>
|
|
|
- <ProjectDia ref="projectDia" @refreshDataList="refreshList"></ProjectDia>
|
|
|
+
|
|
|
<ProjectFormUpdate ref="projectFormUpdate" @refreshDataList="refreshList"></ProjectFormUpdate>
|
|
|
<ProofreadForm ref="proofreadForm" @refreshDataList="refreshList"></ProofreadForm>
|
|
|
<ProofreadBrowseForm ref="proofreadBrowseForm" @refreshDataList="refreshList"></ProofreadBrowseForm>
|
|
|
@@ -365,7 +366,9 @@ export default {
|
|
|
isAdmin: false,
|
|
|
processDefinitionId:'',
|
|
|
procDefKey:'',
|
|
|
- haveProjectIds:''
|
|
|
+ haveProjectIds:'',
|
|
|
+ processDefinitionId1:'',
|
|
|
+ procDefKey1:''
|
|
|
}
|
|
|
},
|
|
|
ProjectInfoService:null,
|
|
|
@@ -436,6 +439,7 @@ export default {
|
|
|
'orders': this.tablePage.orders,
|
|
|
...this.searchForm
|
|
|
}).then((data) => {
|
|
|
+ console.log('s',data.records)
|
|
|
this.dataList = data.records
|
|
|
this.tablePage.total = data.total
|
|
|
this.loading = false
|
|
|
@@ -456,6 +460,12 @@ export default {
|
|
|
this.procDefKey = data.key
|
|
|
}
|
|
|
})
|
|
|
+ processService.getByName('嘉溢-项目一级校审').then((data) => {
|
|
|
+ if (!this.commonJS.isEmpty(data.id)) {
|
|
|
+ this.processDefinitionId1 = data.id
|
|
|
+ this.procDefKey1 = data.key
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 当前页
|
|
|
currentChangeHandle ({ currentPage, pageSize }) {
|
|
|
@@ -532,38 +542,38 @@ export default {
|
|
|
console.log('is',this.isAdmin)
|
|
|
},
|
|
|
// 发起项目登记审批
|
|
|
- // registeredPush (row) {
|
|
|
- // // 读取流程表单
|
|
|
- // let title = `发起流程【项目登记审批】`
|
|
|
- // let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[项目登记审批]`
|
|
|
- // let status = 'startAndHold'
|
|
|
- // if (row.status === '3') {
|
|
|
- // status = 'startAndClose'
|
|
|
- // } else if (row.status === '4') {
|
|
|
- // status = 'reapplyFlag'
|
|
|
- // }
|
|
|
- // taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
|
|
|
- // businessId: row.id,
|
|
|
- // businessTable: 'program_project_list_info'}).then((data) => {
|
|
|
- // this.$router.push({
|
|
|
- // path: '/flowable/task/TaskForm',
|
|
|
- // query: {
|
|
|
- // ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
- // procDefId: this.processDefinitionAuditId,
|
|
|
- // procDefKey: this.procDefAuditKey,
|
|
|
- // title: title,
|
|
|
- // formType: data.formType,
|
|
|
- // formUrl: data.formUrl,
|
|
|
- // formTitle: processTitle,
|
|
|
- // businessTable: 'program_project_list_info',
|
|
|
- // businessId: row.id,
|
|
|
- // isShow: 'false',
|
|
|
- // status: status,
|
|
|
- // routePath: '/program/registered/ProjectList'
|
|
|
- // }
|
|
|
- // })
|
|
|
- // })
|
|
|
- // },
|
|
|
+ registeredPush (row) {
|
|
|
+ // 读取流程表单
|
|
|
+ let title = `发起流程【嘉溢-项目登记】`
|
|
|
+ let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[嘉溢-项目登记]`
|
|
|
+ let status = 'startAndHold'
|
|
|
+ if (row.status === '3') {
|
|
|
+ status = 'startAndClose'
|
|
|
+ } else if (row.status === '4') {
|
|
|
+ status = 'reapplyFlag'
|
|
|
+ }
|
|
|
+ taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
+ businessId: row.id,
|
|
|
+ businessTable: 'jy_project_record'}).then((data) => {
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskForm',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
+ procDefId: this.processDefinitionId,
|
|
|
+ procDefKey: this.procDefKey,
|
|
|
+ title: title,
|
|
|
+ formType: data.formType,
|
|
|
+ formUrl: data.formUrl,
|
|
|
+ formTitle: processTitle,
|
|
|
+ businessTable: 'jy_project_record',
|
|
|
+ businessId: row.id,
|
|
|
+ isShow: 'false',
|
|
|
+ status: status,
|
|
|
+ routePath: '/jy/project/ProjectList'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
// // 查看项目登记审批流程结果
|
|
|
registeredDetail (row) {
|
|
|
if (row.status !== '0' && row.status !== '1') {
|
|
|
@@ -669,13 +679,14 @@ export default {
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskForm',
|
|
|
query: {
|
|
|
- ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId'),
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId','method'),
|
|
|
isShow: false,
|
|
|
formReadOnly: true,
|
|
|
formTitle: `${data.taskName}`,
|
|
|
cUser: cUser,
|
|
|
title: `审批【${data.taskName || ''}】`,
|
|
|
- routePath: '/jy/project/ProjectList' // 数据处理后需要跳转的页面路径
|
|
|
+ routePath: '/jy/project/ProjectList' , // 数据处理后需要跳转的页面路径
|
|
|
+ method:'view'
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
@@ -683,6 +694,39 @@ export default {
|
|
|
viewContract (id) {
|
|
|
this.$refs.contractAddForm.init('view', id)
|
|
|
},
|
|
|
+ // 发起一级校审
|
|
|
+ firstAuditPush (row) {
|
|
|
+ // 读取流程表单
|
|
|
+ let title = `发起流程【嘉溢-项目一级校审】`
|
|
|
+ let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[嘉溢-项目一级校审]`
|
|
|
+ let status = 'startAndHold'
|
|
|
+ if (row.firstInstanceStatus === '3') {
|
|
|
+ status = 'startAndClose'
|
|
|
+ } else if (row.firstInstanceStatus === '4') {
|
|
|
+ status = 'reapplyFlag'
|
|
|
+ }
|
|
|
+ taskService.getTaskDef({ procDefId: this.processDefinitionId1,
|
|
|
+ businessId: row.auditId1,
|
|
|
+ businessTable: 'jy_project_audit'}).then((data) => {
|
|
|
+ this.$router.push({
|
|
|
+ path: '/flowable/task/TaskForm',
|
|
|
+ query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
+ procDefId: this.processDefinitionId1,
|
|
|
+ procDefKey: this.procDefKey1,
|
|
|
+ title: title,
|
|
|
+ formType: data.formType,
|
|
|
+ formUrl: data.formUrl,
|
|
|
+ formTitle: processTitle,
|
|
|
+ businessTable: 'program_audit',
|
|
|
+ businessId: row.auditId1,
|
|
|
+ isShow: 'false',
|
|
|
+ status: status,
|
|
|
+ routePath: '/program/registered/ProjectList'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ })
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
sangwenwei