From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/components/Process/submitVerify.vue | 226 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 139 insertions(+), 87 deletions(-)
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 09fc82e..4c2ea88 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -3,47 +3,47 @@
<el-form v-loading="loading" :model="form" label-width="120px">
<el-form-item label="娑堟伅鎻愰啋">
<el-checkbox-group v-model="form.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 value="1" name="type" disabled>绔欏唴淇�</el-checkbox>
+ <el-checkbox value="2" name="type">閭欢</el-checkbox>
+ <el-checkbox value="3" name="type">鐭俊</el-checkbox>
</el-checkbox-group>
</el-form-item>
- <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 v-if="task.flowStatus === 'waiting'" label="闄勪欢">
+ <fileUpload v-model="form.fileId" :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xlsx', 'xls', 'ppt', 'txt', 'pdf']" :file-size="20" />
</el-form-item>
<el-form-item label="鎶勯��">
<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 }}
+ {{ user.nickName }}
</el-tag>
</el-form-item>
- <el-form-item v-if="task.businessStatus === 'waiting'" label="瀹℃壒鎰忚">
+ <el-form-item v-if="task.flowStatus === '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 :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.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openDelegateTask"> 濮旀墭 </el-button>
+ <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="primary" @click="openTransferTask"> 杞姙 </el-button>
<el-button
- v-if="task.businessStatus === 'waiting' && task.multiInstance"
+ v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
:disabled="buttonDisabled"
type="primary"
- @click="addMultiInstanceUser"
+ @click="openMultiInstanceUser"
>
鍔犵
</el-button>
<el-button
- v-if="task.businessStatus === 'waiting' && task.multiInstance"
+ v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
:disabled="buttonDisabled"
type="primary"
- @click="deleteMultiInstanceUser"
+ @click="handleTaskUser"
>
鍑忕
</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 v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleTerminationTask"> 缁堟 </el-button>
+ <el-button v-if="task.flowStatus === 'waiting'" :disabled="buttonDisabled" type="danger" @click="handleBackProcessOpen"> 閫�鍥� </el-button>
<el-button :disabled="buttonDisabled" @click="cancel">鍙栨秷</el-button>
</span>
</template>
@@ -54,14 +54,14 @@
<!-- 濮旀墭 -->
<UserSelect ref="delegateTaskRef" :multiple="false" @confirm-call-back="handleDelegateTask"></UserSelect>
<!-- 鍔犵缁勪欢 -->
- <multiInstanceUser ref="multiInstanceUserRef" :title="title" @submit-callback="closeDialog" />
+ <UserSelect ref="multiInstanceUserRef" :multiple="true" @confirm-call-back="addMultiInstanceUser"></UserSelect>
<!-- 椹冲洖寮�濮� -->
<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 v-if="task.flowStatus === '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 v-model="backForm.nodeCode" clearable placeholder="璇烽�夋嫨" style="width: 300px">
+ <el-option v-for="item in taskNodeList" :key="item.nodeCode" :label="item.nodeName" :value="item.nodeCode" />
</el-select>
</el-form-item>
<el-form-item label="娑堟伅鎻愰啋">
@@ -83,6 +83,19 @@
</template>
</el-dialog>
<!-- 椹冲洖缁撴潫 -->
+ <el-dialog v-model="deleteSignatureVisible" draggable title="鍑忕浜哄憳" width="700px" height="400px" append-to-body :close-on-click-modal="false">
+ <div>
+ <el-table :data="deleteUserList" border>
+ <el-table-column prop="nodeName" label="浠诲姟鍚嶇О" />
+ <el-table-column prop="nickName" label="鍔炵悊浜�" />
+ <el-table-column label="鎿嶄綔" align="center" width="160">
+ <template #default="scope">
+ <el-button type="danger" size="small" icon="Delete" @click="deleteMultiInstanceUser(scope.row)">鍒犻櫎 </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </el-dialog>
</el-dialog>
</template>
@@ -90,18 +103,17 @@
import { ref } from 'vue';
import { ComponentInternalInstance } from 'vue';
import { ElForm } from 'element-plus';
-import { completeTask, backProcess, getTaskById, transferTask, terminationTask, getTaskNodeList, delegateTask } from '@/api/workflow/task';
+import { completeTask, backProcess, getTask, taskOperation, terminationTask, getBackTaskNode, currentTaskAllUser } 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';
+import { FlowTaskVO, TaskOperationBo } 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 multiInstanceUserRef = ref<InstanceType<typeof UserSelect>>();
const props = defineProps({
taskVariables: {
@@ -119,65 +131,53 @@
const selectCopyUserList = ref<UserVO[]>([]);
//鎶勯�佷汉id
const selectCopyUserIds = ref<string>(undefined);
-// 椹冲洖鏄惁鏄剧ず
+//鍙噺绛剧殑浜哄憳
+const deleteUserList = ref<any>([]);
+//椹冲洖鏄惁鏄剧ず
const backVisible = ref(false);
const backLoading = ref(true);
const backButtonDisabled = ref(true);
// 鍙┏鍥炲緱浠诲姟鑺傜偣
const taskNodeList = ref([]);
//浠诲姟
-const task = ref<TaskVO>({
+const task = ref<FlowTaskVO>({
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,
+ createTime: undefined,
+ updateTime: undefined,
tenantId: undefined,
- claimTime: undefined,
- businessStatus: undefined,
- businessStatusName: undefined,
- processDefinitionName: undefined,
- processDefinitionKey: undefined,
- participantVo: undefined,
- multiInstance: undefined,
- businessKey: undefined,
- wfNodeConfigVo: undefined
+ definitionId: undefined,
+ instanceId: undefined,
+ flowName: undefined,
+ businessId: undefined,
+ nodeCode: undefined,
+ nodeName: undefined,
+ flowCode: undefined,
+ flowStatus: undefined,
+ formCustom: undefined,
+ formPath: undefined,
+ nodeType: undefined,
+ nodeRatio: undefined
});
-//鍔犵 鍑忕鏍囬
-const title = ref('');
const dialog = reactive<DialogOption>({
visible: false,
title: '鎻愮ず'
});
-
+//鍑忕寮圭獥
+const deleteSignatureVisible = ref(false);
const form = ref<Record<string, any>>({
taskId: undefined,
message: undefined,
variables: {},
messageType: ['1'],
- wfCopyList: []
+ flowCopyList: []
});
const backForm = ref<Record<string, any>>({
taskId: undefined,
- targetActivityId: undefined,
+ nodeCode: undefined,
message: undefined,
variables: {},
messageType: ['1']
});
-const closeDialog = () => {
- dialog.visible = false;
-};
//鎵撳紑寮圭獥
const openDialog = (id?: string) => {
selectCopyUserIds.value = undefined;
@@ -189,7 +189,7 @@
loading.value = true;
buttonDisabled.value = true;
nextTick(() => {
- getTaskById(taskId.value).then((response) => {
+ getTask(taskId.value).then((response) => {
task.value = response.data;
loading.value = false;
buttonDisabled.value = false;
@@ -205,15 +205,15 @@
form.value.taskId = taskId.value;
form.value.taskVariables = props.taskVariables;
if (selectCopyUserList.value && selectCopyUserList.value.length > 0) {
- let wfCopyList = [];
+ let flowCopyList = [];
selectCopyUserList.value.forEach((e) => {
let copyUser = {
userId: e.userId,
userName: e.nickName
};
- wfCopyList.push(copyUser);
+ flowCopyList.push(copyUser);
});
- form.value.wfCopyList = wfCopyList;
+ form.value.flowCopyList = flowCopyList;
}
await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
loading.value = true;
@@ -236,11 +236,11 @@
backVisible.value = true;
backLoading.value = true;
backButtonDisabled.value = true;
- let data = await getTaskNodeList(task.value.processInstanceId);
+ let data = await getBackTaskNode(task.value.definitionId, task.value.nodeCode);
taskNodeList.value = data.data;
backLoading.value = false;
backButtonDisabled.value = false;
- backForm.value.targetActivityId = taskNodeList.value[0].nodeId;
+ backForm.value.nodeCode = taskNodeList.value[0].nodeCode;
};
/** 椹冲洖娴佺▼ */
const handleBackProcess = async () => {
@@ -249,7 +249,10 @@
loading.value = true;
backLoading.value = true;
backButtonDisabled.value = true;
- await backProcess(backForm.value).finally(() => (loading.value = false));
+ await backProcess(backForm.value).finally(() => {
+ loading.value = false;
+ buttonDisabled.value = false;
+ });
dialog.visible = false;
backLoading.value = false;
backButtonDisabled.value = false;
@@ -282,18 +285,48 @@
selectCopyUserIds.value = selectCopyUserList.value.map((item) => item.userId).join(',');
};
//鍔犵
-const addMultiInstanceUser = () => {
- if (multiInstanceUserRef.value) {
- title.value = '鍔犵浜哄憳';
- multiInstanceUserRef.value.getAddMultiInstanceList(taskId.value, []);
+const openMultiInstanceUser = async () => {
+ multiInstanceUserRef.value.open();
+};
+//鍔犵
+const addMultiInstanceUser = async (data) => {
+ if (data && data.length > 0) {
+ const taskOperationBo = reactive<TaskOperationBo>({
+ userIds: data.map((e) => e.userId),
+ taskId: taskId.value,
+ message: form.value.message
+ });
+ await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
+ loading.value = true;
+ buttonDisabled.value = true;
+ await taskOperation(taskOperationBo, 'addSignature').finally(() => {
+ loading.value = false;
+ buttonDisabled.value = false;
+ });
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ } else {
+ proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
}
};
//鍑忕
-const deleteMultiInstanceUser = () => {
- if (multiInstanceUserRef.value) {
- title.value = '鍑忕浜哄憳';
- multiInstanceUserRef.value.getDeleteMultiInstanceList(taskId.value);
- }
+const deleteMultiInstanceUser = async (row) => {
+ await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
+ loading.value = true;
+ buttonDisabled.value = true;
+ const taskOperationBo = reactive<TaskOperationBo>({
+ userIds: [row.userId],
+ taskId: taskId.value,
+ message: form.value.message
+ });
+ await taskOperation(taskOperationBo, 'reductionSignature').finally(() => {
+ loading.value = false;
+ buttonDisabled.value = false;
+ });
+ dialog.visible = false;
+ emits('submitCallback');
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
};
//鎵撳紑杞姙
const openTransferTask = () => {
@@ -302,15 +335,18 @@
//杞姙
const handleTransferTask = async (data) => {
if (data && data.length > 0) {
- let params = {
- taskId: taskId.value,
+ const taskOperationBo = reactive<TaskOperationBo>({
userId: data[0].userId,
- comment: form.value.message
- };
+ taskId: taskId.value,
+ message: form.value.message
+ });
await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
loading.value = true;
buttonDisabled.value = true;
- await transferTask(params).finally(() => (loading.value = false));
+ await taskOperation(taskOperationBo, 'transferTask').finally(() => {
+ loading.value = false;
+ buttonDisabled.value = false;
+ });
dialog.visible = false;
emits('submitCallback');
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
@@ -326,15 +362,18 @@
//濮旀墭
const handleDelegateTask = async (data) => {
if (data && data.length > 0) {
- let params = {
- taskId: taskId.value,
+ const taskOperationBo = reactive<TaskOperationBo>({
userId: data[0].userId,
- nickName: data[0].nickName
- };
+ taskId: taskId.value,
+ message: form.value.message
+ });
await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
loading.value = true;
buttonDisabled.value = true;
- await delegateTask(params).finally(() => (loading.value = false));
+ await taskOperation(taskOperationBo, 'delegateTask').finally(() => {
+ loading.value = false;
+ buttonDisabled.value = false;
+ });
dialog.visible = false;
emits('submitCallback');
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
@@ -343,7 +382,7 @@
}
};
//缁堟浠诲姟
-const handleTerminationTask = async (data) => {
+const handleTerminationTask = async () => {
let params = {
taskId: taskId.value,
comment: form.value.message
@@ -351,11 +390,24 @@
await proxy?.$modal.confirm('鏄惁纭缁堟锛�');
loading.value = true;
buttonDisabled.value = true;
- await terminationTask(params).finally(() => (loading.value = false));
+ await terminationTask(params).finally(() => {
+ loading.value = false;
+ buttonDisabled.value = false;
+ });
dialog.visible = false;
emits('submitCallback');
proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
};
+const handleTaskUser = async () => {
+ let data = await currentTaskAllUser(taskId.value);
+ deleteUserList.value = data.data;
+ if (deleteUserList.value && deleteUserList.value.length > 0) {
+ deleteUserList.value.forEach((e) => {
+ e.nodeName = task.value.nodeName;
+ });
+ }
+ deleteSignatureVisible.value = true;
+};
/**
* 瀵瑰鏆撮湶瀛愮粍浠舵柟娉�
--
Gitblit v1.9.3