feat: There is no way the

This commit is contained in:
super_liu
2021-09-30 18:00:06 +08:00
parent ea6b80fe33
commit 4ac5dd4cfb
5 changed files with 1161 additions and 7 deletions
+8
View File
@@ -415,6 +415,14 @@ export function isEnd (data) {
}) })
} }
export function execTask (data) {
return axios({
url: '/api/lawss/activiti/execTask',
method: 'get',
params: data
})
}
export function get_verify_by_instance (data) { export function get_verify_by_instance (data) {
return axios({ return axios({
url: '/api/lawss/activiti/get_verify_by_instance', url: '/api/lawss/activiti/get_verify_by_instance',
@@ -1,6 +1,6 @@
<!-- ProcessFooter --> <!-- ProcessFooter -->
<template> <template>
<div class="process-footer" v-if="showSave || showSubmit || showSubmit2"> <div class="process-footer">
<div class="footer-line"></div> <div class="footer-line"></div>
<div class="btn-group-wrap"> <div class="btn-group-wrap">
<slot></slot> <slot></slot>
@@ -98,10 +98,10 @@
size="small" size="small"
class="common-button-primary" class="common-button-primary"
icon="el-icon-check" icon="el-icon-check"
@click="handleSubmit" @click="handleAccept"
:loading="submitLoading" :loading="submitLoading"
v-if="showConfirm" v-if="showConfirm"
>确认</el-button> >接收待办</el-button>
</div> </div>
<!-- 组织机构树 --> <!-- 组织机构树 -->
@@ -275,6 +275,9 @@ export default {
handleSubmit() { handleSubmit() {
this.$emit('submit') this.$emit('submit')
}, },
handleAccept() {
this.$emit('accept')
},
handleTransfer(){ handleTransfer(){
this.$emit('transfer') this.$emit('transfer')
}, },
@@ -62,11 +62,13 @@
<div class="button-list"> <div class="button-list">
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
:disabled="acceptShow"
@click="addModal" @click="addModal"
size="mini">新增 size="mini">新增
</el-button> </el-button>
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
:disabled="acceptShow"
@click="addDelete" @click="addDelete"
size="mini">删除 size="mini">删除
</el-button> </el-button>
@@ -216,11 +218,13 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit :show-submit="submitShow"
:show-confirm="acceptShow"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@save="handleSave" @save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
@accept="handleAccept"
show-transfer show-transfer
@transfer="handleTransfer" @transfer="handleTransfer"
> >
@@ -238,14 +242,15 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, processCreateStand, saveTaskForPub,changeAssigneeNew} from 'api/process' import {inboundLiaisonDetail, processCreateStand, saveTaskForPub,changeAssigneeNew,execTask} from 'api/process'
import axios from "axios"; import axios from "axios";
export default { export default {
name: "bzzqyjStep3", name: "bzzqyjStep3",
data() { data() {
return { return {
drawerModal: false, drawerModal: false,
todoId: '',
histortData: [], histortData: [],
idList: [], idList: [],
data: [], data: [],
@@ -266,6 +271,8 @@ export default {
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
submitShow: false,
acceptShow: false,
saveLoading: false, saveLoading: false,
form: { form: {
cid: '', // 编号 cid: '', // 编号
@@ -412,6 +419,18 @@ export default {
this.saveLoading = false; this.saveLoading = false;
}); });
}, },
handleAccept(){
this.isSubmit = true
execTask({
todoId: this.todoId // 当前节点ID
}).then(res => {
if (res.sign && res.sign === '0') {
this.$message.success('接收成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmit() { handleSubmit() {
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见') this.$message.warning('请输入征求意见')
@@ -466,11 +485,19 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
let commitStatus = res.commitStatus
if(commitStatus && commitStatus > 0){
this.acceptShow = true
this.submitShow = false
}else {
this.acceptShow = false
this.submitShow = true
}
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.form.fjListId = data.fjListId || data.form.fjListId this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cid = data.cid || data.form.cid this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname this.todoId = res.id
this.json = data this.json = data
this.data = data.info || data.data || data.form.data || [] this.data = data.info || data.data || data.form.data || []
}).catch(e => { }).catch(e => {
File diff suppressed because it is too large Load Diff
+9
View File
@@ -231,6 +231,15 @@ const routes = [
title: '流程详情' title: '流程详情'
} }
}, },
{
path: '/processAcceptDetail',
name: 'ProcessAcceptDetail',
component: () => import('@/pages/processCenter/pages/processAcceptDetail/index.vue'),
meta: {
requireAuth: true,
title: '流程详情'
}
},
{ {
path: '/bzffStep1', path: '/bzffStep1',
name: 'bzffStep1', name: 'bzffStep1',