From 39b3680a9bc3e7c29a4bbf3b277c14de1e1283d0 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期四, 06 三月 2025 10:52:37 +0800 Subject: [PATCH] 容缺接口 --- src/views/flowable/task/myProcess/send/index.vue | 55 ++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/views/flowable/task/myProcess/send/index.vue b/src/views/flowable/task/myProcess/send/index.vue index 02da72f..4d5e6e1 100644 --- a/src/views/flowable/task/myProcess/send/index.vue +++ b/src/views/flowable/task/myProcess/send/index.vue @@ -20,7 +20,7 @@ <!-- <el-button size="small" type="primary" disabled @click="submitForm">鍗忓悓鍔炵悊(鍔熻兘寮�鍙戜腑)</el-button>--> <el-button size="small" type="primary" :disabled="formDataObj.taskStatus === '鎸傝捣'" @click="openDelegation(formDataList[0].beforeNodeName)">杞姙</el-button> <el-button v-if="formDataObj.canJump" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="jumpTask()">璺宠繃</el-button> - <el-button v-if="formDataObj.canWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" >瀹圭己</el-button> + <el-button v-if="formDataObj.canWait" :disabled="formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="waitTask()">瀹圭己</el-button> <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus !== '鎸傝捣'" size="small" type="primary" @click="hangup">鎸傝捣</el-button> <el-button v-if="formDataObj.canHangup && formDataObj.taskStatus === '鎸傝捣'" size="small" type="primary" @click="cancelHangup">缁撴潫鎸傝捣</el-button> </div> @@ -30,19 +30,18 @@ <!-- 鍓嶇疆鑺傜偣鍙┏鍥� --> <div class="reject-but"> <el-button type="danger" size="small" @click="openRejectTask(formDataObj.beforeNodeName)">椹� 鍥�</el-button> - <div style="margin-left: 10px" v-if="formDataObj.events.length > 0"> - <el-popover - placement="right-start" - title="浠诲姟鏃ュ織" - width="600" - trigger="hover" - > - <div v-if="formDataObj.events.length > 0"> - <log-view :log-list="formDataObj.events"/> - </div> - <el-button slot="reference">浠诲姟鏃ュ織</el-button> - </el-popover> - </div> + <el-popover + style="margin-left: 10px" v-if="formDataObj.events.length > 0" + placement="right-start" + title="浠诲姟鏃ュ織" + width="800" + trigger="hover" + > + <div v-if="formDataObj.events.length > 0"> + <log-view :log-list="formDataObj.events"/> + </div> + <el-button slot="reference">浠诲姟鏃ュ織</el-button> + </el-popover> </div> <div class="before">鍓嶇疆闃舵锛�<span>{{formDataObj.beforeNodeName}}</span></div> </div> @@ -189,8 +188,9 @@ import {completeSubmitFormTask} from "@/api/flowable/process"; import { flowTaskForm } from "@/api/flowable/todo"; import {getNextFlowNodeByStart} from "@/api/flowable/todo"; +import LogView from "@/views/projectProcess/components/LogView"; import {rejectTask} from "@/api/flowable/process"; -import {cancelTaskHangup, taskDelegation, taskHangup, taskJump} from "@/api/projectProcess/projectProcess"; +import {cancelTaskHangup, taskDelegation, taskHangup, taskJump, taskWait} from "@/api/projectProcess/projectProcess"; export default { name: "Record", @@ -200,6 +200,7 @@ MyDept, SingleUser, MultUser, + LogView }, props: {}, data() { @@ -335,6 +336,30 @@ }) }) }, + // 瀹圭己浠诲姟 + waitTask() { + this.$prompt('澶囨敞璇存槑', '纭畾瑕佸缂烘浠诲姟鍚�', { + confirmButtonText: '纭畾', + cancelButtonText: '鍙栨秷', + inputType: 'textarea' + }).then(({ value }) => { + let waitForm = { + taskId: this.taskId, + projectId: this.projectId, + processInsId: this.procInsId, + desc: value + } + taskWait(waitForm).then(res => { + this.$message.success("鎿嶄綔鎴愬姛") + this.goBack() + }) + }).catch(() => { + this.$message({ + type: 'info', + message: '宸插彇娑堝缂烘搷浣�' + }); + }); + }, // 璺宠繃浠诲姟 jumpTask() { this.$prompt('澶囨敞璇存槑', '纭畾瑕佽烦杩囨浠诲姟鍚�', { -- Gitblit v1.8.0