From 8994e3ad3e9d60eafbfa0abb124ed86edc686941 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 22 一月 2025 11:13:38 +0800
Subject: [PATCH] update 优化 驳回增加附件上传

---
 src/components/Process/submitVerify.vue |  377 +++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 293 insertions(+), 84 deletions(-)

diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 9e2a7be..1c985de 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -3,36 +3,102 @@
     <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 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 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" @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.nickName }}
+        </el-tag>
       </el-form-item>
-      <el-form-item label="瀹℃壒鎰忚" v-if="task.businessStatus === 'waiting'">
+      <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 v-loading="buttonLoading" type="primary" @click="handleCompleteTask"> 鎻愪氦 </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>
+        <el-button :disabled="buttonDisabled" type="primary" @click="handleCompleteTask"> 鎻愪氦 </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.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="openMultiInstanceUser"
+        >
+          鍔犵
+        </el-button>
+        <el-button
+          v-if="task.flowStatus === 'waiting' && Number(task.nodeRatio) > 0"
+          :disabled="buttonDisabled"
+          type="primary"
+          @click="handleTaskUser"
+        >
+          鍑忕
+        </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>
-    <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="handleQuery" />
+    <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.flowStatus === 'waiting'" v-loading="backLoading" :model="backForm" label-width="120px">
+        <el-form-item label="椹冲洖鑺傜偣">
+          <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="娑堟伅鎻愰啋">
+          <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 v-if="task.flowStatus === 'waiting'" label="闄勪欢">
+          <fileUpload v-model="backForm.fileId" :file-type="['png', 'jpg', 'jpeg', 'doc', 'docx', 'xlsx', 'xls', 'ppt', 'txt', 'pdf']" :file-size="20" />
+        </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 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>
 
@@ -40,88 +106,96 @@
 import { ref } from 'vue';
 import { ComponentInternalInstance } from 'vue';
 import { ElForm } from 'element-plus';
-import { completeTask, backProcess, getTaskById } 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 multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
+const transferTaskRef = ref<InstanceType<typeof UserSelect>>();
+const delegateTaskRef = ref<InstanceType<typeof UserSelect>>();
+const multiInstanceUserRef = ref<InstanceType<typeof UserSelect>>();
 
 const props = defineProps({
   taskVariables: {
     type: Object as () => Record<string, any>,
-    default: {}
+    default: () => {}
   }
 });
 //閬僵灞�
 const loading = ref(true);
 //鎸夐挳
-const buttonLoading = ref(true);
+const buttonDisabled = ref(true);
 //浠诲姟id
 const taskId = ref<string>('');
 //鎶勯�佷汉
 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
+  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,
+  nodeCode: undefined,
+  message: undefined,
+  variables: {},
+  messageType: ['1']
 });
 //鎵撳紑寮圭獥
 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(() => {
-    getTaskById(taskId.value).then((response) => {
+    getTask(taskId.value).then((response) => {
       task.value = response.data;
       loading.value = false;
-      buttonLoading.value = false;
+      buttonDisabled.value = false;
     });
   });
 };
@@ -133,41 +207,65 @@
 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 flowCopyList = [];
+    selectCopyUserList.value.forEach((e) => {
       let copyUser = {
         userId: e.userId,
         userName: e.nickName
-      }
-      wfCopyList.push(copyUser)
-    })
-    form.value.wfCopyList = wfCopyList
+      };
+      flowCopyList.push(copyUser);
+    });
+    form.value.flowCopyList = flowCopyList;
   }
   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 getBackTaskNode(task.value.definitionId, task.value.nodeCode);
+  taskNodeList.value = data.data;
+  backLoading.value = false;
+  backButtonDisabled.value = false;
+  backForm.value.nodeCode = taskNodeList.value[0].nodeCode;
+};
 /** 椹冲洖娴佺▼ */
 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;
+    buttonDisabled.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');
 };
 //鎵撳紑鎶勯�佷汉鍛�
@@ -176,11 +274,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;
@@ -190,19 +288,130 @@
   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 = () => {
+  transferTaskRef.value.open();
+};
+//杞姙
+const handleTransferTask = async (data) => {
+  if (data && data.length > 0) {
+    const taskOperationBo = reactive<TaskOperationBo>({
+      userId: data[0].userId,
+      taskId: taskId.value,
+      message: form.value.message
+    });
+    await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
+    loading.value = true;
+    buttonDisabled.value = true;
+    await taskOperation(taskOperationBo, 'transferTask').finally(() => {
+      loading.value = false;
+      buttonDisabled.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) {
+    const taskOperationBo = reactive<TaskOperationBo>({
+      userId: data[0].userId,
+      taskId: taskId.value,
+      message: form.value.message
+    });
+    await proxy?.$modal.confirm('鏄惁纭鎻愪氦锛�');
+    loading.value = true;
+    buttonDisabled.value = true;
+    await taskOperation(taskOperationBo, 'delegateTask').finally(() => {
+      loading.value = false;
+      buttonDisabled.value = false;
+    });
+    dialog.visible = false;
+    emits('submitCallback');
+    proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+  } else {
+    proxy?.$modal.msgWarning('璇烽�夋嫨鐢ㄦ埛锛�');
+  }
+};
+//缁堟浠诲姟
+const handleTerminationTask = async () => {
+  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;
+    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