From ca24c9b096fb3f688a9ef4e858680c0a850ad237 Mon Sep 17 00:00:00 2001
From: liyang <liyang1987jay@163.com>
Date: Thu, 12 Dec 2024 12:22:31 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=202.=E5=A2=9E=E5=8A=A0=E7=94=B3=E8=AF=B7=E4=BA=BA=203?=
 =?UTF-8?q?.=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/instance/types.ts           |   3 +-
 src/api/workflow/task/types.ts               |   7 +-
 src/views/workflow/processInstance/index.vue |  39 ++++--
 src/views/workflow/task/allTaskWaiting.vue   | 140 ++++++++++---------
 src/views/workflow/task/myDocument.vue       |   2 +-
 src/views/workflow/task/taskCopyList.vue     |  22 +--
 src/views/workflow/task/taskFinish.vue       |  23 +--
 src/views/workflow/task/taskWaiting.vue      |  23 +--
 8 files changed, 149 insertions(+), 110 deletions(-)

diff --git a/src/api/workflow/instance/types.ts b/src/api/workflow/instance/types.ts
index 33eadff..57b1161 100644
--- a/src/api/workflow/instance/types.ts
+++ b/src/api/workflow/instance/types.ts
@@ -2,9 +2,10 @@ import { FlowTaskVO } from '@/api/workflow/task/types';
 
 export interface FlowInstanceQuery extends PageQuery {
   categoryCode?: string;
+  nodeName?: string;
   flowCode?: string;
   flowName?: string;
-  createBy?: string;
+  nickName?: string;
   businessId?: string;
 }
 
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index ee869c4..ec9d707 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -1,9 +1,10 @@
 import { NodeConfigVO } from '@/api/workflow/nodeConfig/types';
 import { DefinitionConfigVO } from '@/api/workflow/definitionConfig/types';
 export interface TaskQuery extends PageQuery {
-  name?: string;
-  processDefinitionKey?: string;
-  processDefinitionName?: string;
+  nodeName?: string;
+  flowCode?: string;
+  flowName?: string;
+  nickName?: string;
 }
 
 export interface ParticipantVo {
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index d7ece88..16d27d6 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -20,23 +20,29 @@
         </el-card>
       </el-col>
       <el-col :lg="20" :xs="24">
-        <div class="mb-[10px]">
+<!--        <div class="mb-[10px]">
           <el-card shadow="hover" class="text-center">
             <el-radio-group v-model="tab" @change="changeTab(tab)">
               <el-radio-button value="running">运行中</el-radio-button>
               <el-radio-button value="finish">已完成</el-radio-button>
             </el-radio-group>
           </el-card>
-        </div>
+        </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">
-              <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
-                <el-form-item label="流程定义名称" prop="name">
+              <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
+                <el-form-item label="申请人" prop="nickName">
+                  <el-input v-model="queryParams.nickName" placeholder="请输入申请人" @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="任务名称" prop="nodeName">
+                  <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+                </el-form-item>
+                <el-form-item label="流程定义名称" label-width="100" prop="flowName">
                   <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
                 </el-form-item>
-                <el-form-item label="流程定义KEY" prop="key">
-                  <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义KEY" @keyup.enter="handleQuery" />
+                <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+                  <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
                 </el-form-item>
                 <el-form-item>
                   <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -55,7 +61,9 @@
               <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
             </el-row>
           </template>
-
+          <el-tabs v-model="tab" @tab-click="changeTab">
+            <el-tab-pane name="running" label="运行中"> </el-tab-pane>
+            <el-tab-pane name="finish" label="已完成"> </el-tab-pane>
           <el-table v-loading="loading" border :data="processInstanceList" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="55" align="center" />
             <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
@@ -64,7 +72,9 @@
                 <span>{{ scope.row.flowName }}v{{ scope.row.version }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="flowCode" label="流程定义KEY"></el-table-column>
+            <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+            <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+            <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
             <el-table-column align="center" prop="version" label="版本号" width="90">
               <template #default="scope"> v{{ scope.row.version }}.0</template>
             </el-table-column>
@@ -97,7 +107,7 @@
                     </el-popover>
                   </el-col>
                   <el-col :span="1.5">
-                    <el-button type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
                   </el-col>
                 </el-row>
                 <el-row :gutter="10" class="mb8">
@@ -105,7 +115,7 @@
                     <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
                   </el-col>
                   <el-col :span="1.5">
-                    <el-button type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)">变量</el-button>
+                    <el-button type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
                   </el-col>
                 </el-row>
               </template>
@@ -118,6 +128,7 @@
             :total="total"
             @pagination="handleQuery"
           />
+          </el-tabs>
         </el-card>
       </el-col>
     </el-row>
@@ -125,6 +136,7 @@
       <el-table v-loading="loading" :data="processDefinitionHistoryList">
         <el-table-column fixed align="center" type="index" label="序号" width="60"></el-table-column>
         <el-table-column fixed align="center" prop="name" label="流程定义名称"></el-table-column>
+        <el-table-column fixed align="center" prop="nodeName" label="任务名称"></el-table-column>
         <el-table-column align="center" prop="key" label="标识Key"></el-table-column>
         <el-table-column align="center" prop="version" label="版本号" width="90">
           <template #default="scope"> v{{ scope.row.version }}.0</template>
@@ -217,8 +229,10 @@ const deleteReason = ref('');
 const queryParams = ref<FlowInstanceQuery>({
   pageNum: 1,
   pageSize: 10,
-  flowCode: undefined,
+  nodeName: undefined,
   flowName: undefined,
+  flowCode: undefined,
+  nickName: undefined,
   categoryCode: undefined
 });
 
@@ -313,7 +327,7 @@ const handleDelete = async (row: FlowInstanceVO) => {
 const changeTab = async (data: string) => {
   processInstanceList.value = [];
   queryParams.value.pageNum = 1;
-  if ('running' === data) {
+  if ('running' === data.paneName) {
     getProcessInstanceRunningList();
   } else {
     getProcessInstanceFinishList();
@@ -369,6 +383,7 @@ function formatToJsonObject(data: string) {
     return data;
   }
 }
+
 onMounted(() => {
   getProcessInstanceRunningList();
   getTreeselect();
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 0b0c011..076d483 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -1,26 +1,29 @@
 <template>
   <div class="p-2">
-    <div class="mb-[10px]">
+<!--    <div class="mb-[10px]">
       <el-card shadow="hover" class="text-center">
         <el-radio-group v-model="tab" @change="changeTab(tab)">
           <el-radio-button value="waiting">待办任务</el-radio-button>
           <el-radio-button value="finish">已办任务</el-radio-button>
         </el-radio-group>
       </el-card>
-    </div>
+    </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">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item label="申请人" prop="nickName">
+              <el-input v-model="queryParams.nickName" 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 label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" 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 label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
             </el-form-item>
+<!--            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @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>
@@ -33,69 +36,73 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">修改办理人</el-button>
+            <el-button type="primary" plain icon="Edit" :disabled="multiple" @click="handleUpdate">修改办理人 </el-button>
           </el-col>
           <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
         </el-row>
       </template>
-
-      <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"> </el-table-column>
-        <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
-        <el-table-column align="center" prop="version" label="版本号" width="90">
-          <template #default="scope"> v{{ scope.row.version }}.0</template>
-        </el-table-column>
-        <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
-        <el-table-column align="center" label="办理人">
-          <template #default="scope">
-            <template v-if="tab === 'waiting'">
-              <template v-if="scope.row.transactorNames">
-                <el-tag v-for="(name, index) in scope.row.transactorNames.split(',')" :key="index" type="success">
-                  {{ name }}
-                </el-tag>
+      <el-tabs v-model="tab" @tab-click="changeTab">
+        <el-tab-pane name="waiting" label="待办任务"> </el-tab-pane>
+        <el-tab-pane name="finish" label="已办任务"> </el-tab-pane>
+        <el-table v-loading="loading" border :data="taskList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" />
+          <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
+          <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"></el-table-column>
+          <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
+          <el-table-column align="center" prop="version" label="版本号" width="90">
+            <template #default="scope"> v{{ scope.row.version }}.0</template>
+          </el-table-column>
+          <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+          <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
+          <el-table-column align="center" label="办理人">
+            <template #default="scope">
+              <template v-if="tab === 'waiting'">
+                <template v-if="scope.row.transactorNames">
+                  <el-tag v-for="(name, index) in scope.row.transactorNames.split(',')" :key="index" type="success">
+                    {{ name }}
+                  </el-tag>
+                </template>
+                <template v-else>
+                  <el-tag type="success"> 无</el-tag>
+                </template>
               </template>
               <template v-else>
-                <el-tag type="success"> 无 </el-tag>
+                <el-tag type="success"> {{ scope.row.approveName }}</el-tag>
               </template>
             </template>
-            <template v-else>
-              <el-tag type="success"> {{ scope.row.approveName }} </el-tag>
+          </el-table-column>
+          <el-table-column align="center" label="流程状态" prop="flowStatus" min-width="70">
+            <template #default="scope">
+              <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
             </template>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="流程状态" prop="flowStatus" min-width="70">
-          <template #default="scope">
-            <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
-          </template>
-        </el-table-column>
-        <el-table-column v-if="tab === 'finish'" align="center" label="任务状态" prop="flowTaskStatus" min-width="70">
-          <template #default="scope">
-            <dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></dict-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="tab === 'finish' ? '88' : '188'">
-          <template #default="scope">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5" v-if="tab === 'waiting' || tab === 'finish'">
-                <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
-              </el-col>
-              <el-col :span="1.5" v-if="tab === 'waiting'">
-                <el-button type="primary" size="small" icon="Setting" @click="handleMeddle(scope.row)">流程干预</el-button>
-              </el-col>
-            </el-row>
-          </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-table-column>
+          <el-table-column v-if="tab === 'finish'" align="center" label="任务状态" prop="flowTaskStatus" min-width="70">
+            <template #default="scope">
+              <dict-tag :options="wf_task_status" :value="scope.row.flowTaskStatus"></dict-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="tab === 'finish' ? '88' : '188'">
+            <template #default="scope">
+              <el-row :gutter="10" class="mb8">
+                <el-col :span="1.5" v-if="tab === 'waiting' || tab === 'finish'">
+                  <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+                </el-col>
+                <el-col :span="1.5" v-if="tab === 'waiting'">
+                  <el-button type="primary" size="small" icon="Setting" @click="handleMeddle(scope.row)">流程干预 </el-button>
+                </el-col>
+              </el-row>
+            </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-tabs>
     </el-card>
     <!-- 选人组件 -->
     <UserSelect ref="userSelectRef" :multiple="false" @confirm-call-back="submitCallback"></UserSelect>
@@ -139,9 +146,10 @@ const title = ref('');
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  nickName: undefined
 });
 const tab = ref('waiting');
 
@@ -169,7 +177,7 @@ const handleSelectionChange = (selection: any) => {
 const changeTab = async (data: string) => {
   taskList.value = [];
   queryParams.value.pageNum = 1;
-  if ('waiting' === data) {
+  if ('waiting' === data.paneName) {
     getWaitingList();
   } else {
     getFinishList();
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 38ca91e..3ee74f1 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -47,7 +47,7 @@
             <el-table-column align="center" type="index" label="序号" width="60"></el-table-column>
             <el-table-column v-if="false" align="center" prop="id" label="id"></el-table-column>
             <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"> </el-table-column>
-            <el-table-column align="center" prop="flowCode" label="流程定义KEY"></el-table-column>
+            <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
             <el-table-column align="center" prop="version" label="版本号" width="90">
               <template #default="scope"> v{{ scope.row.version }}.0</template>
             </el-table-column>
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index b017dfc..ec3740c 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -4,14 +4,17 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item label="申请人" prop="nickName">
+              <el-input v-model="queryParams.nickName" 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 label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" 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 label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -86,9 +89,10 @@ const taskList = ref([]);
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  nickName: undefined
 });
 /** 搜索按钮操作 */
 const handleQuery = () => {
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 14b1895..1f13f37 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -4,14 +4,17 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item label="申请人" prop="nickName">
+              <el-input v-model="queryParams.nickName" 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 label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" 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 label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -37,6 +40,7 @@
           <template #default="scope"> v{{ scope.row.version }}.0</template>
         </el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+        <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
         <el-table-column align="center" prop="approverName" label="办理人">
           <template #default="scope">
             <el-tag type="success">
@@ -100,9 +104,10 @@ const taskList = ref([]);
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  nickName: undefined
 });
 /** 搜索按钮操作 */
 const handleQuery = () => {
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 0f2163b..6c44494 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -4,14 +4,17 @@
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
           <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="任务名称" prop="name">
-              <el-input v-model="queryParams.name" placeholder="请输入任务名称" @keyup.enter="handleQuery" />
+            <el-form-item label="申请人" prop="nickName">
+              <el-input v-model="queryParams.nickName" 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 label="任务名称" prop="nodeName">
+              <el-input v-model="queryParams.nodeName" 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 label="流程定义名称" label-width="100" prop="flowName">
+              <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="流程定义编码" label-width="100" prop="flowCode">
+              <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" @keyup.enter="handleQuery" />
             </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -34,6 +37,7 @@
         <el-table-column :show-overflow-tooltip="true" prop="flowName" align="center" label="流程定义名称"> </el-table-column>
         <el-table-column align="center" prop="flowCode" label="流程定义编码"></el-table-column>
         <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
+        <el-table-column align="center" prop="nickName" label="申请人"></el-table-column>
         <el-table-column align="center" label="办理人">
           <template #default="scope">
             <template v-if="scope.row.transactorNames">
@@ -96,9 +100,10 @@ const taskList = ref([]);
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
-  name: undefined,
-  processDefinitionName: undefined,
-  processDefinitionKey: undefined
+  nodeName: undefined,
+  flowName: undefined,
+  flowCode: undefined,
+  nickName: undefined
 });
 onMounted(() => {
   getWaitingList();