|
|
@@ -131,16 +131,16 @@
|
|
|
<el-button type="text" @click="detailFiled(scope.row)" :type="$dictUtils.getDictLabel('filed_type_status', scope.row.filedType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("filed_type", scope.row.filedType, '未归档')}} </el-button>
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
- <vxe-column width="100px" title="借用状态" field="borrowType" >
|
|
|
- <template slot-scope="scope">
|
|
|
- <el-button type="text" @click="detailBorrow(scope.row)" :type="$dictUtils.getDictLabel('borrow_type_status', scope.row.borrowType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("borrow_type", scope.row.borrowType, '未借用')}} </el-button>
|
|
|
- </template>
|
|
|
- </vxe-column>
|
|
|
+<!-- <vxe-column width="100px" title="借用状态" field="borrowType" >-->
|
|
|
+<!-- <template slot-scope="scope">-->
|
|
|
+<!-- <el-button type="text" @click="detailBorrow(scope.row)" :type="$dictUtils.getDictLabel('borrow_type_status', scope.row.borrowType, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("borrow_type", scope.row.borrowType, '未借用')}} </el-button>-->
|
|
|
+<!-- </template>-->
|
|
|
+<!-- </vxe-column>-->
|
|
|
|
|
|
<vxe-column title="操作" width="200px" fixed="right" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
<el-button v-if="hasPermission('sys:workContract:view')" type="text" size="small" @click="view(scope.row.id)">查看</el-button>
|
|
|
- <el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status !== '2' && scope.row.status !== '5' && scope.row.createId === create" type="text" size="small" @click="edit(scope.row)">修改</el-button>
|
|
|
+ <el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status !== '2' && scope.row.status !== '5' && scope.row.status !== '4' && scope.row.createId === create" type="text" size="small" @click="edit(scope.row)">修改</el-button>
|
|
|
<el-button v-if="hasPermission('sys:workContract:edit') && scope.row.status === '5' && isAdmin" type="text" size="small" @click="editForm(scope.row.id)">修改</el-button>
|
|
|
<el-button v-if="hasPermission('sys:workContract:del') && (scope.row.status === '1' || scope.row.status === '3' || scope.row.status === '4') && scope.row.createId === create" type="text" size="small" @click="del(scope.row.id)">删除</el-button>
|
|
|
<el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '2'" type="text" size="small" @click="reback(scope.row)">撤回</el-button>
|
|
|
@@ -148,15 +148,15 @@
|
|
|
<!--归档暂存修改-->
|
|
|
<el-button v-if="hasPermission('sys:workContract:filed') && scope.row.status === '5' && scope.row.createId === create && scope.row.filedType === '1'" type="text" size="small" @click="filed(scope.row.id)">修改</el-button>
|
|
|
<!--归档撤回驳回修改-->
|
|
|
- <el-button v-if="hasPermission('sys:workContract:filed') && scope.row.status === '5' && scope.row.createId === create && (scope.row.filedType === '3' || scope.row.filedType === '4')" type="text" size="small" @click="filedAndClose(scope.row.id)">修改</el-button>
|
|
|
+ <el-button v-if="hasPermission('sys:workContract:filed') && scope.row.status === '5' && scope.row.createId === create && (scope.row.filedType === '3')" type="text" size="small" @click="filedAndClose(scope.row)">修改</el-button>
|
|
|
<!--归档撤回-->
|
|
|
<el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '2'" type="text" size="small" @click="rebackFiled(scope.row)">撤回</el-button>
|
|
|
<!--合同借用-->
|
|
|
- <el-button v-if="hasPermission('sys:workContract:borrow') && scope.row.status === '5' && scope.row.filedType === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row.id)">借用</el-button>
|
|
|
- <!--借用撤回-->
|
|
|
- <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '5' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>
|
|
|
- <!--借用归还-->
|
|
|
- <el-button v-if="hasPermission('sys:workContract:reture') && scope.row.status === '5' && scope.row.filedType === '5' && scope.row.borrowType === '5'" type="text" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>
|
|
|
+<!-- <el-button v-if="hasPermission('sys:workContract:borrow') && scope.row.status === '5' && scope.row.filedType === '5' && (scope.row.borrowType === undefined || scope.row.borrowType === '0' || scope.row.borrowType === '1')" type="text" size="small" @click="borrow(scope.row.id)">借用</el-button>-->
|
|
|
+<!-- <!–借用撤回–>-->
|
|
|
+<!-- <el-button v-if="hasPermission('sys:workContract:back') && scope.row.status === '5' && scope.row.filedType === '5' && scope.row.borrowType === '2'" type="text" size="small" @click="rebackBorrow(scope.row)">撤回</el-button>-->
|
|
|
+<!-- <!–借用归还–>-->
|
|
|
+<!-- <el-button v-if="hasPermission('sys:workContract:reture') && scope.row.status === '5' && scope.row.filedType === '5' && scope.row.borrowType === '5'" type="text" size="small" @click="retureBorrow(scope.row)">归还合同</el-button>-->
|
|
|
</template>
|
|
|
</vxe-column>
|
|
|
</vxe-table>
|
|
|
@@ -299,7 +299,7 @@
|
|
|
add () {
|
|
|
this.start()
|
|
|
},
|
|
|
- // 详情
|
|
|
+ // 合同登记新建详情
|
|
|
detail (row) {
|
|
|
// eslint-disable-next-line eqeqeq
|
|
|
if (!this.commonJS.isEmpty(row.status) && row.status != '1') {
|
|
|
@@ -310,23 +310,18 @@
|
|
|
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.id,
|
|
|
- ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
|
|
|
+ status: 'reback'
|
|
|
+ }
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- // 修改
|
|
|
- edit (row) {
|
|
|
- if (row.status === '3' || row.status === '4') {
|
|
|
- this.editWithClose(row)
|
|
|
- } else {
|
|
|
- this.editWithHold(row)
|
|
|
- }
|
|
|
- },
|
|
|
// 管理员修改
|
|
|
editForm (id) {
|
|
|
id = id || this.$refs.workClientTable.getCheckboxRecords().map(item => {
|
|
|
@@ -373,6 +368,7 @@
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskForm',
|
|
|
query: {
|
|
|
+ ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
procDefId: this.processDefinitionId,
|
|
|
procDefKey: this.procDefKey,
|
|
|
status: 'startAndHold',
|
|
|
@@ -387,106 +383,176 @@
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- editWithHold (row) {
|
|
|
+ // 合同登记新建撤回驳回修改
|
|
|
+ edit (row) {
|
|
|
+ // if (row.status === '3' || row.status === '4') {
|
|
|
+ // this.editWithClose(row)
|
|
|
+ // } else {
|
|
|
+ // this.editWithHold(row)
|
|
|
+ // }
|
|
|
// 读取流程表单
|
|
|
- let tabTitle = `发起流程【合同登记新建】`
|
|
|
- let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
|
|
|
+ let tabTitle = `发起流程【发票申请】`
|
|
|
+ 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'
|
|
|
+ }
|
|
|
this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
businessId: row.id,
|
|
|
- businessTable: 'work_contract_info',
|
|
|
- status: 'startAndHold'}).then((data) => {
|
|
|
+ businessTable: 'work_contract_info'}).then((data) => {
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskForm',
|
|
|
query: {
|
|
|
+ ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
procDefId: this.processDefinitionId,
|
|
|
procDefKey: this.procDefKey,
|
|
|
- status: 'startAndHold',
|
|
|
title: tabTitle,
|
|
|
formType: data.data.formType,
|
|
|
formUrl: data.data.formUrl,
|
|
|
formTitle: processTitle,
|
|
|
businessTable: 'work_contract_info',
|
|
|
businessId: row.id,
|
|
|
- isShow: false,
|
|
|
+ isShow: 'false',
|
|
|
+ status: status,
|
|
|
routePath: '/sys/workContract/WorkContractList'
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
},
|
|
|
- editWithClose (row) {
|
|
|
- // 读取流程表单
|
|
|
- let tabTitle = `发起流程【合同登记新建】`
|
|
|
- let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
|
|
|
- this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
- businessId: row.id,
|
|
|
- businessTable: 'work_contract_info',
|
|
|
- status: 'startAndClose'
|
|
|
- }).then((data) => {
|
|
|
- this.$router.push({
|
|
|
- path: '/flowable/task/TaskForm',
|
|
|
- query: {
|
|
|
- procDefId: this.processDefinitionId,
|
|
|
- procDefKey: this.procDefKey,
|
|
|
- status: 'startAndClose',
|
|
|
- title: tabTitle,
|
|
|
- formType: data.data.formType,
|
|
|
- formUrl: data.data.formUrl,
|
|
|
- formTitle: processTitle,
|
|
|
- businessTable: 'work_contract_info',
|
|
|
- businessId: row.id,
|
|
|
- isShow: false,
|
|
|
- routePath: '/sys/workContract/WorkContractList'
|
|
|
- }
|
|
|
- })
|
|
|
- })
|
|
|
- },
|
|
|
+ // editWithHold (row) {
|
|
|
+ // // 读取流程表单
|
|
|
+ // let tabTitle = `发起流程【合同登记新建】`
|
|
|
+ // let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
|
|
|
+ // this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
+ // businessId: row.id,
|
|
|
+ // businessTable: 'work_contract_info',
|
|
|
+ // status: 'startAndHold'}).then((data) => {
|
|
|
+ // this.$router.push({
|
|
|
+ // path: '/flowable/task/TaskForm',
|
|
|
+ // query: {
|
|
|
+ // procDefId: this.processDefinitionId,
|
|
|
+ // procDefKey: this.procDefKey,
|
|
|
+ // status: 'startAndHold',
|
|
|
+ // title: tabTitle,
|
|
|
+ // formType: data.data.formType,
|
|
|
+ // formUrl: data.data.formUrl,
|
|
|
+ // formTitle: processTitle,
|
|
|
+ // businessTable: 'work_contract_info',
|
|
|
+ // businessId: row.id,
|
|
|
+ // isShow: false,
|
|
|
+ // routePath: '/sys/workContract/WorkContractList'
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ // editWithClose (row) {
|
|
|
+ // // 读取流程表单
|
|
|
+ // let tabTitle = `发起流程【合同登记新建】`
|
|
|
+ // let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记新建]`
|
|
|
+ // this.taskService.getTaskDef({ procDefId: this.processDefinitionId,
|
|
|
+ // businessId: row.id,
|
|
|
+ // businessTable: 'work_contract_info',
|
|
|
+ // status: 'startAndClose'
|
|
|
+ // }).then((data) => {
|
|
|
+ // this.$router.push({
|
|
|
+ // path: '/flowable/task/TaskForm',
|
|
|
+ // query: {
|
|
|
+ // procDefId: this.processDefinitionId,
|
|
|
+ // procDefKey: this.procDefKey,
|
|
|
+ // status: 'startAndClose',
|
|
|
+ // title: tabTitle,
|
|
|
+ // formType: data.data.formType,
|
|
|
+ // formUrl: data.data.formUrl,
|
|
|
+ // formTitle: processTitle,
|
|
|
+ // businessTable: 'work_contract_info',
|
|
|
+ // businessId: row.id,
|
|
|
+ // isShow: false,
|
|
|
+ // routePath: '/sys/workContract/WorkContractList'
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
+ // },
|
|
|
+ // 合同登记新建撤回
|
|
|
reback (row) {
|
|
|
- this.$confirm(`确定撤回流程吗?`, '提示', {
|
|
|
+ this.$confirm(`确定要撤回该申请吗?`, '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
- taskId: row.procInsId,
|
|
|
type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- this.taskService.backNodes(row.taskId).then(({data}) => {
|
|
|
- let backNodes = data
|
|
|
- if (backNodes.length > 0) {
|
|
|
- let backTaskDefKey = backNodes[0].taskDefKey
|
|
|
- this.taskService.back({
|
|
|
- taskId: row.taskId,
|
|
|
- backTaskDefKey: backTaskDefKey,
|
|
|
- isShow: false,
|
|
|
- ...this.auditForm
|
|
|
- }).then(({data}) => {
|
|
|
- this.updateStatusById(row, 'reback')
|
|
|
- this.$message.success('回退成功')
|
|
|
+ }).then(async () => {
|
|
|
+ await this.workContractService.findById(row.id).then(({data}) => {
|
|
|
+ if (data.status !== '2') { // status的值不等于“审核中”，就弹出提示
|
|
|
+ this.$message.error('数据已发生改变或不存在，请刷新数据')
|
|
|
+ this.refreshList()
|
|
|
+ } else {
|
|
|
+ this.processService.revokeProcIns(row.procInsId).then(async ({data}) => {
|
|
|
+ let form = {status: '3', id: row.id}
|
|
|
+ await this.workContractService.updateStatusById(form)
|
|
|
+ this.$message.success(data)
|
|
|
+ this.refreshList()
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
+ // this.taskService.backNodes(row.taskId).then(({data}) => {
|
|
|
+ // let backNodes = data
|
|
|
+ // if (backNodes.length > 0) {
|
|
|
+ // let backTaskDefKey = backNodes[0].taskDefKey
|
|
|
+ // this.taskService.back({
|
|
|
+ // taskId: row.taskId,
|
|
|
+ // backTaskDefKey: backTaskDefKey,
|
|
|
+ // isShow: false,
|
|
|
+ // ...this.auditForm
|
|
|
+ // }).then(({data}) => {
|
|
|
+ // this.updateStatusById(row, 'reback')
|
|
|
+ // this.$message.success('回退成功')
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
})
|
|
|
},
|
|
|
+ // 归档撤回
|
|
|
rebackFiled (row) {
|
|
|
- this.$confirm(`确定撤回流程吗?`, '提示', {
|
|
|
+ this.$confirm(`确定要撤回该申请吗?`, '提示', {
|
|
|
confirmButtonText: '确定',
|
|
|
cancelButtonText: '取消',
|
|
|
- taskId: row.taskFiledId,
|
|
|
type: 'warning'
|
|
|
- }).then(() => {
|
|
|
- console.log('datas', row.taskFiledId)
|
|
|
- this.taskService.backNodes(row.taskFiledId).then(({data}) => {
|
|
|
- let backNodes = data
|
|
|
- if (backNodes.length > 0) {
|
|
|
- let backTaskDefKey = backNodes[0].taskDefKey
|
|
|
- this.taskService.back({
|
|
|
- taskId: row.taskFiledId,
|
|
|
- backTaskDefKey: backTaskDefKey,
|
|
|
- isShow: false,
|
|
|
- ...this.auditForm
|
|
|
- }).then(({data}) => {
|
|
|
- this.updateStatusById(row, 'rebackFiled')
|
|
|
- this.$message.success('回退成功')
|
|
|
+ }).then(async () => {
|
|
|
+ await this.workContractFileService.findByContractInfoId(row.id).then(({data}) => {
|
|
|
+ if (data.filedType !== '2') { // status的值不等于“审核中”，就弹出提示
|
|
|
+ this.$message.error('数据已发生改变或不存在，请刷新数据')
|
|
|
+ this.refreshList()
|
|
|
+ } else {
|
|
|
+ this.processService.revokeProcIns(data.procInsId).then(async ({data}) => {
|
|
|
+ let form = {filedType: '3', id: row.id}
|
|
|
+ await this.workContractFileService.updateStatusById(form)
|
|
|
+ this.$message.success(data)
|
|
|
+ this.refreshList()
|
|
|
})
|
|
|
}
|
|
|
})
|
|
|
+ // this.$confirm(`确定撤回流程吗?`, '提示', {
|
|
|
+ // confirmButtonText: '确定',
|
|
|
+ // cancelButtonText: '取消',
|
|
|
+ // taskId: row.taskFiledId,
|
|
|
+ // type: 'warning'
|
|
|
+ // }).then(() => {
|
|
|
+ // console.log('datas', row.taskFiledId)
|
|
|
+ // this.taskService.backNodes(row.taskFiledId).then(({data}) => {
|
|
|
+ // let backNodes = data
|
|
|
+ // if (backNodes.length > 0) {
|
|
|
+ // let backTaskDefKey = backNodes[0].taskDefKey
|
|
|
+ // this.taskService.back({
|
|
|
+ // taskId: row.taskFiledId,
|
|
|
+ // backTaskDefKey: backTaskDefKey,
|
|
|
+ // isShow: false,
|
|
|
+ // ...this.auditForm
|
|
|
+ // }).then(({data}) => {
|
|
|
+ // this.updateStatusById(row, 'rebackFiled')
|
|
|
+ // this.$message.success('回退成功')
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ // })
|
|
|
})
|
|
|
},
|
|
|
updateStatusById (row, type) {
|
|
|
@@ -530,7 +596,6 @@
|
|
|
filed (id) {
|
|
|
this.processService.getByName('合同登记归档').then(({data}) => {
|
|
|
if (!this.commonJS.isEmpty(data.id)) {
|
|
|
- console.log('data', data)
|
|
|
// 读取流程表单
|
|
|
let tabTitle = `发起流程【合同登记归档】`
|
|
|
let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
|
|
|
@@ -541,6 +606,7 @@
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskForm',
|
|
|
query: {
|
|
|
+ ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
procDefId: data.id,
|
|
|
procDefKey: data.key,
|
|
|
status: 'startAndHoldFiled',
|
|
|
@@ -555,38 +621,91 @@
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
+ // 读取流程表单
|
|
|
+ // let tabTitle = `发起流程【合同登记归档】`
|
|
|
+ // let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
|
|
|
+ // this.taskService.getTaskDef({ procDefId: data.id,
|
|
|
+ // businessId: id,
|
|
|
+ // businessTable: 'work_contract_file',
|
|
|
+ // status: 'startAndHoldFiled'}).then((reture) => {
|
|
|
+ // this.$router.push({
|
|
|
+ // path: '/flowable/task/TaskForm',
|
|
|
+ // query: {
|
|
|
+ // procDefId: data.id,
|
|
|
+ // procDefKey: data.key,
|
|
|
+ // status: 'startAndHoldFiled',
|
|
|
+ // title: tabTitle,
|
|
|
+ // formType: reture.data.formType,
|
|
|
+ // formUrl: reture.data.formUrl,
|
|
|
+ // formTitle: processTitle,
|
|
|
+ // businessTable: 'work_contract_file',
|
|
|
+ // businessId: id,
|
|
|
+ // isShow: false,
|
|
|
+ // routePath: '/sys/workContract/WorkContractList'
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 归档
|
|
|
- filedAndClose (id) {
|
|
|
+ // 归档驳回撤回修改
|
|
|
+ filedAndClose (row) {
|
|
|
this.processService.getByName('合同登记归档').then(({data}) => {
|
|
|
if (!this.commonJS.isEmpty(data.id)) {
|
|
|
- console.log('data', data)
|
|
|
// 读取流程表单
|
|
|
let tabTitle = `发起流程【合同登记归档】`
|
|
|
- let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
|
|
|
+ let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[合同登记归档]`
|
|
|
+ let status = 'startAndCloseFiled'
|
|
|
+ if (row.filedType === '3') {
|
|
|
+ status = 'startAndClose'
|
|
|
+ } else if (row.filedType === '4') {
|
|
|
+ status = 'reapplyFlag'
|
|
|
+ }
|
|
|
this.taskService.getTaskDef({ procDefId: data.id,
|
|
|
- businessId: id,
|
|
|
- businessTable: 'work_contract_file',
|
|
|
- status: 'startAndCloseFiled'}).then((reture) => {
|
|
|
+ businessId: row.id,
|
|
|
+ businessTable: 'work_contract_file'}).then((reture) => {
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskForm',
|
|
|
query: {
|
|
|
+ ...pick(data.data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
procDefId: data.id,
|
|
|
procDefKey: data.key,
|
|
|
- status: 'startAndCloseFiled',
|
|
|
title: tabTitle,
|
|
|
formType: reture.data.formType,
|
|
|
formUrl: reture.data.formUrl,
|
|
|
formTitle: processTitle,
|
|
|
businessTable: 'work_contract_file',
|
|
|
- businessId: id,
|
|
|
- isShow: false,
|
|
|
+ businessId: row.id,
|
|
|
+ isShow: 'false',
|
|
|
+ status: status,
|
|
|
routePath: '/sys/workContract/WorkContractList'
|
|
|
}
|
|
|
})
|
|
|
})
|
|
|
+ // 读取流程表单
|
|
|
+ // let tabTitle = `发起流程【合同登记归档】`
|
|
|
+ // let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记归档]`
|
|
|
+ // this.taskService.getTaskDef({ procDefId: data.id,
|
|
|
+ // businessId: id,
|
|
|
+ // businessTable: 'work_contract_file',
|
|
|
+ // status: 'startAndCloseFiled'}).then((reture) => {
|
|
|
+ // this.$router.push({
|
|
|
+ // path: '/flowable/task/TaskForm',
|
|
|
+ // query: {
|
|
|
+ // procDefId: data.id,
|
|
|
+ // procDefKey: data.key,
|
|
|
+ // status: 'startAndCloseFiled',
|
|
|
+ // title: tabTitle,
|
|
|
+ // formType: reture.data.formType,
|
|
|
+ // formUrl: reture.data.formUrl,
|
|
|
+ // formTitle: processTitle,
|
|
|
+ // businessTable: 'work_contract_file',
|
|
|
+ // businessId: id,
|
|
|
+ // isShow: false,
|
|
|
+ // routePath: '/sys/workContract/WorkContractList'
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // })
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -595,7 +714,6 @@
|
|
|
if (row.filedType !== '4') {
|
|
|
this.workContractFileService.findByContractInfoId(row.id).then(({data}) => {
|
|
|
if (!this.commonJS.isEmpty(data.id)) {
|
|
|
- console.log('data', data)
|
|
|
this.taskService.getTaskDef({
|
|
|
procInsId: data.procInsId,
|
|
|
procDefId: data.processDefinitionId
|
|
|
@@ -603,11 +721,12 @@
|
|
|
this.$router.push({
|
|
|
path: '/flowable/task/TaskFormDetail',
|
|
|
query: {
|
|
|
+ ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
|
|
|
readOnly: true,
|
|
|
title: '归档流程详情',
|
|
|
formTitle: '归档流程详情',
|
|
|
- businessId: row.id,
|
|
|
- ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title', 'businessId')}
|
|
|
+ businessId: row.id
|
|
|
+ }
|
|
|
})
|
|
|
})
|
|
|
}
|
|
|
@@ -618,7 +737,6 @@
|
|
|
borrow (id) {
|
|
|
this.processService.getByName('合同登记借用').then(({data}) => {
|
|
|
if (!this.commonJS.isEmpty(data.id)) {
|
|
|
- console.log('data', data)
|
|
|
// 读取流程表单
|
|
|
let tabTitle = `发起流程【合同登记借用】`
|
|
|
let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同登记借用]`
|
wangqiang