From d1c199d4bf895e3a1c8ecfbb1414c44c4a0fc718 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期五, 08 三月 2024 18:22:28 +0800
Subject: [PATCH] update 优化流程预览
---
src/components/Process/submitVerify.vue | 108 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 96 insertions(+), 12 deletions(-)
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index da30ed7..54e6678 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,7 +8,7 @@
<el-checkbox label="3" name="type">鐭俊</el-checkbox>
</el-checkbox-group>
</el-form-item>
- <el-form-item label="闄勪欢">
+ <el-form-item label="闄勪欢" v-if="task.businessStatus === 'waiting'">
<fileUpload v-model="form.fileId" :fileType="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :fileSize="'20'"/>
</el-form-item>
<el-form-item label="鎶勯��">
@@ -17,18 +17,26 @@
{{ user.userName }}
</el-tag>
</el-form-item>
- <el-form-item label="瀹℃壒鎰忚" v-if="businessStatus === 'waiting'">
+ <el-form-item label="瀹℃壒鎰忚" v-if="task.businessStatus === 'waiting'">
<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 v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="openTransferTask"> 杞姙 </el-button>
+ <el-button v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="addMultiInstanceUser"> 鍔犵 </el-button>
+ <el-button v-if="task.businessStatus === 'waiting' && task.multiInstance" v-loading="buttonLoading" type="primary" @click="deleteMultiInstanceUser"> 鍑忕 </el-button>
+ <el-button v-if="task.businessStatus === 'waiting'" v-loading="buttonLoading" type="danger" @click="handleBackProcess"> 閫�鍥� </el-button>
+ <el-button v-loading="buttonLoading" @click="cancel">鍙栨秷</el-button>
</span>
</template>
- <UserSelect ref="userSelectCopyRef" :data="selectCopyUserIds" @confirm-call-back="userSelectCopyCallBack"></UserSelect>
+ <!-- 鎶勯�� -->
+ <UserSelect ref="userSelectCopyRef" :multiple="userMultiple" :data="selectCopyUserIds" @confirm-call-back="userSelectCopyCallBack"></UserSelect>
+ <!-- 杞姙 -->
+ <UserSelect ref="transferTaskRef" :multiple="userMultiple" @confirm-call-back="handleTransferTask"></UserSelect>
+ <!-- 鍔犵缁勪欢 -->
+ <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback='closeDialog' />
</el-dialog>
</template>
@@ -36,11 +44,16 @@
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 } 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 multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
const props = defineProps({
taskVariables: {
@@ -52,16 +65,44 @@
const loading = ref(true);
//鎸夐挳
const buttonLoading = ref(true);
-//娴佺▼鐘舵��
-const businessStatus = ref<string>('');
//浠诲姟id
const taskId = ref<string>('');
//鎶勯�佷汉
const selectCopyUserList = ref<UserVO[]>([]);
//鎶勯�佷汉id
const selectCopyUserIds = ref<string>(undefined);
-
+//鏄惁澶氶�変汉鍛�
+const userMultiple = ref(false);
+//浠诲姟
+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
+});
+//鍔犵 鍑忕鏍囬
+const title = ref('');
const dialog = reactive<DialogOption>({
visible: false,
title: '鎻愮ず'
@@ -74,6 +115,9 @@
messageType: ['1'],
wfCopyList: []
});
+const closeDialog = () => {
+ dialog.visible = false
+}
//鎵撳紑寮圭獥
const openDialog = (id?: string) => {
selectCopyUserIds.value = undefined
@@ -85,8 +129,8 @@
loading.value = true;
buttonLoading.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;
});
@@ -139,6 +183,7 @@
};
//鎵撳紑鎶勯�佷汉鍛�
const openUserSelectCopy = () => {
+ userMultiple.value = true
userSelectCopyRef.value.open();
};
//纭鎶勯�佷汉鍛�
@@ -156,6 +201,45 @@
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 = () => {
+ userMultiple.value = false
+ 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;
+ buttonLoading.value = true;
+ await transferTask(params).finally(() => (loading.value = false));
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ }else{
+ proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
+ }
+}
+
/**
* 瀵瑰鏆撮湶瀛愮粍浠舵柟娉�
*/
--
Gitblit v1.9.3