From 76b905089ea7f8b3ffc9b43d0182f9f7aec8942c Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 3 Mar 2024 21:25:13 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/workflow/leave/index.vue            |   2 +-
 src/views/workflow/task/taskFinish.vue        | 128 ++++++++++++++++++
 .../task/{index.vue => taskWaiting.vue}       |  54 +-------
 3 files changed, 136 insertions(+), 48 deletions(-)
 create mode 100644 src/views/workflow/task/taskFinish.vue
 rename src/views/workflow/task/{index.vue => taskWaiting.vue} (78%)

diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index 1c682f7..c7550b2 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -340,7 +340,7 @@ const handleExport = () => {
 
 //提交申请
 const handleStartWorkFlow = async (data: LeaveVO) => {
-  submitFormData.value.processKey = 'leave1';
+  submitFormData.value.processKey = 'leave7';
   submitFormData.value.businessKey = data.id;
   //流程变量
   taskVariables.value = {
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
new file mode 100644
index 0000000..3e8adba
--- /dev/null
+++ b/src/views/workflow/task/taskFinish.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
+            <el-form-item label="任务名称" prop="name">
+              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义名称" label-width="100" prop="processDefinitionName">
+              <el-input v-model="queryParams.processDefinitionName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义KEY" label-width="100" prop="processDefinitionKey">
+              <el-input v-model="queryParams.processDefinitionKey" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+    <el-card shadow="hover">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <right-toolbar v-model:showSearch="showSearch" @query-table="handleQuery"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" :data="taskList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column fixed align="center" type="index" label="序号" width="50"></el-table-column>
+        <el-table-column fixed align="center" prop="processDefinitionName" label="流程定义名称"></el-table-column>
+        <el-table-column fixed align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
+        <el-table-column fixed align="center" prop="name" label="任务名称"></el-table-column>
+        <el-table-column fixed align="center" prop="assigneeName" label="办理人">
+          <template #default="scope">
+            <el-tag type="success">
+              {{ scope.row.assigneeName }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
+        <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">审批记录</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total > 0"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        :total="total"
+        @pagination="handleQuery"
+      />
+    </el-card>
+    <!-- 审批记录 -->
+    <approvalRecord ref="approvalRecordRef" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { getTaskFinishByPage } from '@/api/workflow/task';
+import ApprovalRecord from '@/components/Process/approvalRecord.vue';
+import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+//审批记录组件
+const approvalRecordRef = ref<InstanceType<typeof ApprovalRecord>>();
+const queryFormRef = ref<ElFormInstance>();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 遮罩层
+const loading = ref(true);
+// 选中数组
+const ids = ref<Array<any>>([]);
+// 非单个禁用
+const single = ref(true);
+// 非多个禁用
+const multiple = ref(true);
+// 显示搜索条件
+const showSearch = ref(true);
+// 总条数
+const total = ref(0);
+// 模型定义表格数据
+const taskList = ref([]);
+// 查询参数
+const queryParams = ref<TaskQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  name: undefined,
+  processDefinitionName: undefined,
+  processDefinitionKey: undefined
+});
+onMounted(() => {
+  getFinishList();
+});
+//审批记录
+const handleApprovalRecord = (row: TaskVO) => {
+  if (approvalRecordRef.value) {
+    approvalRecordRef.value.init(row.processInstanceId);
+  }
+};
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getFinishList();
+};
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  queryParams.value.pageNum = 1;
+  queryParams.value.pageSize = 10;
+  handleQuery();
+};
+// 多选框选中数据
+const handleSelectionChange = (selection: any) => {
+  ids.value = selection.map((item: any) => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
+};
+const getFinishList = () => {
+  loading.value = true;
+  getTaskFinishByPage(queryParams.value).then((resp) => {
+    taskList.value = resp.rows;
+    total.value = resp.total;
+    loading.value = false;
+  });
+};
+</script>
diff --git a/src/views/workflow/task/index.vue b/src/views/workflow/task/taskWaiting.vue
similarity index 78%
rename from src/views/workflow/task/index.vue
rename to src/views/workflow/task/taskWaiting.vue
index a14cabd..c3f34aa 100644
--- a/src/views/workflow/task/index.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -1,13 +1,5 @@
 <template>
   <div class="p-2">
-    <div class="mb-[10px]">
-      <el-card shadow="hover" class="text-center">
-        <el-radio-group v-model="tab" @change="changeTab(tab)">
-          <el-radio-button label="waiting">待办任务</el-radio-button>
-          <el-radio-button label="finish">已办任务</el-radio-button>
-        </el-radio-group>
-      </el-card>
-    </div>
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
@@ -43,7 +35,7 @@
         <el-table-column fixed align="center" prop="processDefinitionKey" label="流程定义KEY"></el-table-column>
         <el-table-column fixed align="center" prop="name" label="任务名称"></el-table-column>
         <el-table-column fixed align="center" prop="assigneeName" label="办理人">
-          <template v-if="tab === 'waiting'" #default="scope">
+          <template #default="scope">
             <template v-if="scope.row.participantVo && scope.row.assignee === null">
               <el-tag v-for="(item, index) in scope.row.participantVo.candidateName" :key="index" type="success">
                 {{ item }}
@@ -55,16 +47,10 @@
               </el-tag>
             </template>
           </template>
-          <template v-else-if="tab === 'finish'" #default="scope">
-            <el-tag type="success">
-              {{ scope.row.assigneeName }}
-            </el-tag>
-          </template>
         </el-table-column>
         <el-table-column align="center" prop="businessStatusName" label="流程状态" min-width="70">
           <template #default="scope">
-            <el-tag v-if="tab === 'waiting'" type="success">{{ scope.row.businessStatusName }}</el-tag>
-            <el-tag v-else type="success">已完成</el-tag>
+            <el-tag type="success">{{ scope.row.businessStatusName }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="createTime" label="创建时间" width="160"></el-table-column>
@@ -74,18 +60,13 @@
               <el-col :span="1.5">
                 <el-button link type="primary" size="small" icon="Document" @click="handleApprovalRecord(scope.row)">审批记录</el-button>
               </el-col>
-              <el-col
-                v-if="
-                  tab === 'waiting' && scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)
-                "
-                :span="1.5"
-              >
+              <el-col v-if="scope.row.participantVo && (scope.row.participantVo.claim === null || scope.row.participantVo.claim === true)" :span="1.5">
                 <el-button link type="primary" size="small" icon="Edit" @click="submitVerifyOpen(scope.row.id)">办理</el-button>
               </el-col>
-              <el-col v-if="tab === 'waiting' && scope.row.participantVo && scope.row.participantVo.claim === true" :span="1.5">
+              <el-col v-if="scope.row.participantVo && scope.row.participantVo.claim === true" :span="1.5">
                 <el-button link type="primary" size="small" icon="Document" @click="handleReturnTask(scope.row.id)">归还</el-button>
               </el-col>
-              <el-col v-if="tab === 'waiting' && scope.row.participantVo && scope.row.participantVo.claim === false" :span="1.5">
+              <el-col v-if="scope.row.participantVo && scope.row.participantVo.claim === false" :span="1.5">
                 <el-button link type="primary" size="small" icon="Document" @click="handleClaimTask(scope.row.id)">认领</el-button>
               </el-col>
             </el-row>
@@ -108,7 +89,7 @@
 </template>
 
 <script lang="ts" setup>
-import { getTaskWaitByPage, getTaskFinishByPage, claim, returnTask } from '@/api/workflow/task';
+import { getTaskWaitByPage, claim, returnTask } from '@/api/workflow/task';
 import ApprovalRecord from '@/components/Process/approvalRecord.vue';
 import SubmitVerify from '@/components/Process/submitVerify.vue';
 import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
@@ -140,7 +121,6 @@ const queryParams = ref<TaskQuery>({
   processDefinitionName: undefined,
   processDefinitionKey: undefined
 });
-const tab = ref('waiting');
 onMounted(() => {
   getWaitingList();
 });
@@ -152,11 +132,7 @@ const handleApprovalRecord = (row: TaskVO) => {
 };
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  if ('waiting' === tab.value) {
-    getWaitingList();
-  } else {
-    getFinishList();
-  }
+  getWaitingList();
 };
 /** 重置按钮操作 */
 const resetQuery = () => {
@@ -171,14 +147,6 @@ const handleSelectionChange = (selection: any) => {
   single.value = selection.length !== 1;
   multiple.value = !selection.length;
 };
-const changeTab = async (data: string) => {
-  queryParams.value.pageNum = 1;
-  if ('waiting' === data) {
-    getWaitingList();
-  } else {
-    getFinishList();
-  }
-};
 //分页
 const getWaitingList = () => {
   loading.value = true;
@@ -188,14 +156,6 @@ const getWaitingList = () => {
     loading.value = false;
   });
 };
-const getFinishList = () => {
-  loading.value = true;
-  getTaskFinishByPage(queryParams.value).then((resp) => {
-    taskList.value = resp.rows;
-    total.value = resp.total;
-    loading.value = false;
-  });
-};
 //提交
 const submitVerifyOpen = async (id: string) => {
   if (submitVerifyRef.value) {