From f95f6e8390c355bd601849de26b338bb64c97b90 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期五, 07 六月 2024 21:38:17 +0800
Subject: [PATCH] update 优化审批按钮判断
---
src/components/Process/submitVerify.vue | 289 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 245 insertions(+), 44 deletions(-)
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index da30ed7..bcbc657 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -1,5 +1,5 @@
<template>
- <el-dialog v-model="dialog.visible" :title="dialog.title" width="50%" draggable :before-close="cancel" :close-on-click-modal="false">
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="50%" draggable :before-close="cancel" center :close-on-click-modal="false">
<el-form v-loading="loading" :model="form" label-width="120px">
<el-form-item label="娑堟伅鎻愰啋">
<el-checkbox-group v-model="form.messageType">
@@ -8,27 +8,81 @@
<el-checkbox label="3" name="type">鐭俊</el-checkbox>
</el-checkbox-group>
</el-form-item>
- <el-form-item label="闄勪欢">
- <fileUpload v-model="form.fileId" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :fileSize="'20'"/>
+ <el-form-item v-if="task.businessStatus === 'waiting'" label="闄勪欢">
+ <fileUpload v-model="form.fileId" :file-type="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :file-size="'20'" />
</el-form-item>
<el-form-item label="鎶勯��">
- <el-button type="primary" @click="openUserSelectCopy" icon="Plus" circle />
- <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
- {{ user.userName }}
- </el-tag>
+ <el-button type="primary" icon="Plus" circle @click="openUserSelectCopy" />
+ <el-tag v-for="user in selectCopyUserList" :key="user.userId" closable style="margin: 2px" @close="handleCopyCloseTag(user)">
+ {{ user.userName }}
+ </el-tag>
</el-form-item>
- <el-form-item label="瀹℃壒鎰忚" v-if="businessStatus === 'waiting'">
+ <el-form-item v-if="task.businessStatus === 'waiting'" label="瀹℃壒鎰忚">
<el-input v-model="form.message" type="textarea" resize="none" />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
- <el-button v-loading="buttonLoading" @click="cancel">鍙栨秷</el-button>
- <el-button v-loading="buttonLoading" type="primary" @click="handleCompleteTask"> 鎻愪氦 </el-button>
- <el-button v-if="businessStatus === 'waiting'" v-loading="buttonLoading" type="danger" @click="handleBackProcess"> 閫�鍥� </el-button>
+ <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 鎻愪氦 </el-button>
+ <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 濮旀墭 </el-button>
+ <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 杞姙 </el-button>
+ <el-button
+ v-if="task.businessStatus === 'waiting' && task.multiInstance"
+ :disabled="buttonDisabled"
+ type="primary"
+ @click="addMultiInstanceUser"
+ >
+ 鍔犵
+ </el-button>
+ <el-button
+ v-if="task.businessStatus === 'waiting' && task.multiInstance"
+ :disabled="buttonDisabled"
+ type="primary"
+ @click="deleteMultiInstanceUser"
+ >
+ 鍑忕
+ </el-button>
+ <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 缁堟 </el-button>
+ <el-button v-if="task.businessStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 閫�鍥� </el-button>
+ <el-button :disabled="buttonDisabled" @click="cancel">鍙栨秷</el-button>
</span>
</template>
- <UserSelect ref="userSelectCopyRef" :data="selectCopyUserIds" @confirm-call-back="userSelectCopyCallBack"></UserSelect>
+ <!-- 鎶勯�� -->
+ <UserSelect ref="userSelectCopyRef" :multiple="true" :data="selectCopyUserIds" @confirm-call-back="userSelectCopyCallBack"></UserSelect>
+ <!-- 杞姙 -->
+ <UserSelect ref="transferTaskRef" :multiple="false" @confirm-call-back="handleTransferTask"></UserSelect>
+ <!-- 濮旀墭 -->
+ <UserSelect ref="delegateTaskRef" :multiple="false" @confirm-call-back="handleDelegateTask"></UserSelect>
+ <!-- 鍔犵缁勪欢 -->
+ <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="closeDialog" />
+
+ <!-- 椹冲洖寮�濮� -->
+ <el-dialog v-model="backVisible" draggable title="椹冲洖" width="40%" :close-on-click-modal="false">
+ <el-form v-if="task.businessStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
+ <el-form-item label="椹冲洖鑺傜偣">
+ <el-select v-model="backForm.targetActivityId" clearable placeholder="璇烽�夋嫨" style="width: 300px">
+ <el-option v-for="item in taskNodeList" :key="item.nodeId" :label="item.nodeName" :value="item.nodeId" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="娑堟伅鎻愰啋">
+ <el-checkbox-group v-model="backForm.messageType">
+ <el-checkbox label="1" name="type" disabled>绔欏唴淇�</el-checkbox>
+ <el-checkbox label="2" name="type">閭欢</el-checkbox>
+ <el-checkbox label="3" name="type">鐭俊</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ <el-form-item label="瀹℃壒鎰忚">
+ <el-input v-model="backForm.message" type="textarea" resize="none" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer" style="float: right; padding-bottom: 20px">
+ <el-button :disabled="backButtonDisabled" type="primary" @click="handleBackProcess">纭</el-button>
+ <el-button :disabled="backButtonDisabled" @click="backVisible = false">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ <!-- 椹冲洖缁撴潫 -->
</el-dialog>
</template>
@@ -36,11 +90,18 @@
import { ref } from 'vue';
import { ComponentInternalInstance } from 'vue';
import { ElForm } from 'element-plus';
-import { completeTask, backProcess, getBusinessStatus } from '@/api/workflow/task';
+import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getTaskNodeList, delegateTask } from '@/api/workflow/task';
import UserSelect from '@/components/UserSelect';
+import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
import { UserVO } from '@/api/system/user/types';
+import { TaskVO } from '@/api/workflow/task/types';
const userSelectCopyRef = ref<InstanceType<typeof UserSelect>>();
+const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
+const delegateTaskRef = ref<InstanceType<typeof UserSelect>>();
+
+//鍔犵缁勪欢
+const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
const props = defineProps({
taskVariables: {
@@ -51,17 +112,50 @@
//閬僵灞�
const loading = ref(true);
//鎸夐挳
-const buttonLoading = ref(true);
-//娴佺▼鐘舵��
-const businessStatus = ref<string>('');
+const buttonDisabled = ref(true);
//浠诲姟id
const taskId = ref<string>('');
//鎶勯�佷汉
const selectCopyUserList = ref<UserVO[]>([]);
//鎶勯�佷汉id
const selectCopyUserIds = ref<string>(undefined);
-
-
+// 椹冲洖鏄惁鏄剧ず
+const backVisible = ref(false);
+const backLoading = ref(true);
+const backButtonDisabled = ref(true);
+// 鍙┏鍥炲緱浠诲姟鑺傜偣
+const taskNodeList = ref([]);
+//浠诲姟
+const task = ref<TaskVO>({
+ id: undefined,
+ name: undefined,
+ description: undefined,
+ priority: undefined,
+ owner: undefined,
+ assignee: undefined,
+ assigneeName: undefined,
+ processInstanceId: undefined,
+ executionId: undefined,
+ taskDefinitionId: undefined,
+ processDefinitionId: undefined,
+ endTime: undefined,
+ taskDefinitionKey: undefined,
+ dueDate: undefined,
+ category: undefined,
+ parentTaskId: undefined,
+ tenantId: undefined,
+ claimTime: undefined,
+ businessStatus: undefined,
+ businessStatusName: undefined,
+ processDefinitionName: undefined,
+ processDefinitionKey: undefined,
+ participantVo: undefined,
+ multiInstance: undefined,
+ businessKey: undefined,
+ wfNodeConfigVo: undefined
+});
+//鍔犵 鍑忕鏍囬
+const title = ref('');
const dialog = reactive<DialogOption>({
visible: false,
title: '鎻愮ず'
@@ -74,21 +168,31 @@
messageType: ['1'],
wfCopyList: []
});
+const backForm = ref<Record<string, any>>({
+ taskId: undefined,
+ targetActivityId: undefined,
+ message: undefined,
+ variables: {},
+ messageType: ['1']
+});
+const closeDialog = () => {
+ dialog.visible = false;
+};
//鎵撳紑寮圭獥
const openDialog = (id?: string) => {
- selectCopyUserIds.value = undefined
- selectCopyUserList.value = []
- form.value.fileId = undefined
+ selectCopyUserIds.value = undefined;
+ selectCopyUserList.value = [];
+ form.value.fileId = undefined;
taskId.value = id;
form.value.message = undefined;
dialog.visible = true;
loading.value = true;
- buttonLoading.value = true;
+ buttonDisabled.value = true;
nextTick(() => {
- getBusinessStatus(taskId.value).then((response) => {
- businessStatus.value = response.data;
+ getTaskById(taskId.value).then((response) => {
+ task.value = response.data;
loading.value = false;
- buttonLoading.value = false;
+ buttonDisabled.value = false;
});
});
};
@@ -100,41 +204,62 @@
const handleCompleteTask = async () => {
form.value.taskId = taskId.value;
form.value.taskVariables = props.taskVariables;
- if(selectCopyUserList && selectCopyUserList.value.length > 0){
- let wfCopyList = []
- selectCopyUserList.value.forEach( e=> {
+ if (selectCopyUserList.value && selectCopyUserList.value.length > 0) {
+ let wfCopyList = [];
+ selectCopyUserList.value.forEach((e) => {
let copyUser = {
userId: e.userId,
userName: e.nickName
- }
- wfCopyList.push(copyUser)
- })
- form.value.wfCopyList = wfCopyList
+ };
+ wfCopyList.push(copyUser);
+ });
+ form.value.wfCopyList = wfCopyList;
}
await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
loading.value = true;
- buttonLoading.value = true;
- await completeTask(form.value).finally(() => (loading.value = false));
- dialog.visible = false;
- emits('submitCallback');
- proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ buttonDisabled.value = true;
+ try {
+ await completeTask(form.value);
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ } finally {
+ loading.value = false;
+ buttonDisabled.value = false;
+ }
};
+/** 椹冲洖寮圭獥鎵撳紑 */
+const handleBackProcessOpen = async () => {
+ backForm.value = {};
+ backForm.value.messageType = ['1'];
+ backVisible.value = true;
+ backLoading.value = true;
+ backButtonDisabled.value = true;
+ let data = await getTaskNodeList(task.value.processInstanceId);
+ taskNodeList.value = data.data;
+ backLoading.value = false;
+ backButtonDisabled.value = false;
+ backForm.value.targetActivityId = taskNodeList.value[0].nodeId;
+};
/** 椹冲洖娴佺▼ */
const handleBackProcess = async () => {
- form.value.taskId = taskId.value;
+ backForm.value.taskId = taskId.value;
await proxy?.$modal.confirm('鏄惁纭椹冲洖鍒扮敵璇蜂汉锛�');
loading.value = true;
- buttonLoading.value = true;
- await backProcess(form.value).finally(() => (loading.value = false));
+ backLoading.value = true;
+ backButtonDisabled.value = true;
+ await backProcess(backForm.value).finally(() => (loading.value = false));
dialog.visible = false;
+ backLoading.value = false;
+ backButtonDisabled.value = false;
emits('submitCallback');
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
};
//鍙栨秷
const cancel = async () => {
dialog.visible = false;
- buttonLoading.value = false;
+ buttonDisabled.value = false;
emits('cancelCallback');
};
//鎵撳紑鎶勯�佷汉鍛�
@@ -143,11 +268,11 @@
};
//纭鎶勯�佷汉鍛�
const userSelectCopyCallBack = (data: UserVO[]) => {
- if(data && data.length > 0){
- selectCopyUserList.value = data
+ if (data && data.length > 0) {
+ selectCopyUserList.value = data;
selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
}
-}
+};
//鍒犻櫎鎶勯�佷汉鍛�
const handleCopyCloseTag = (user: UserVO) => {
const userId = user.userId;
@@ -156,6 +281,82 @@
selectCopyUserList.value.splice(index, 1);
selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
};
+//鍔犵
+const addMultiInstanceUser = () => {
+ if (multiInstanceUserRef.value) {
+ title.value = '鍔犵浜哄憳';
+ multiInstanceUserRef.value.getAddMultiInstanceList(taskId.value, []);
+ }
+};
+//鍑忕
+const deleteMultiInstanceUser = () => {
+ if (multiInstanceUserRef.value) {
+ title.value = '鍑忕浜哄憳';
+ multiInstanceUserRef.value.getDeleteMultiInstanceList(taskId.value);
+ }
+};
+//鎵撳紑杞姙
+const openTransferTask = () => {
+ transferTaskRef.value.open();
+};
+//杞姙
+const handleTransferTask = async (data) => {
+ if (data && data.length > 0) {
+ let params = {
+ taskId: taskId.value,
+ userId: data[0].userId,
+ comment: form.value.message
+ };
+ await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
+ loading.value = true;
+ buttonDisabled.value = true;
+ await transferTask(params).finally(() => (loading.value = false));
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ } else {
+ proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
+ }
+};
+
+//鎵撳紑濮旀墭
+const openDelegateTask = () => {
+ delegateTaskRef.value.open();
+};
+//濮旀墭
+const handleDelegateTask = async (data) => {
+ if (data && data.length > 0) {
+ let params = {
+ taskId: taskId.value,
+ userId: data[0].userId,
+ nickName: data[0].nickName
+ };
+ await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
+ loading.value = true;
+ buttonDisabled.value = true;
+ await delegateTask(params).finally(() => (loading.value = false));
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ } else {
+ proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
+ }
+};
+//缁堟浠诲姟
+const handleTerminationTask = async (data) => {
+ let params = {
+ taskId: taskId.value,
+ comment: form.value.message
+ };
+ await proxy?.$modal.confirm('鏄惁纭缁堟锛�');
+ loading.value = true;
+ buttonDisabled.value = true;
+ await terminationTask(params).finally(() => (loading.value = false));
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+};
+
/**
* 瀵瑰鏆撮湶瀛愮粍浠舵柟娉�
*/
--
Gitblit v1.9.3