From 5cb040b560b0c04bdf3fd5d7bbe660fc886a0261 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 21 May 2026 14:47:58 +0800
Subject: [PATCH] =?UTF-8?q?1.1.51=20=E6=88=91=E7=9A=84=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=B7=BB=E5=8A=A0=E6=A3=80=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E3=80=81=E4=BC=98=E5=8C=96=E5=88=97=E5=AE=BD=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/workflow/instance/types.ts       |   2 +
 src/api/workflow/task/types.ts           |   2 +
 src/views/workflow/task/myDocument.vue   |  96 +++++++++++++----
 src/views/workflow/task/taskCopyList.vue | 105 ++++++++++++++-----
 src/views/workflow/task/taskFinish.vue   | 128 +++++++++++++++++------
 src/views/workflow/task/taskWaiting.vue  | 116 ++++++++++++++------
 6 files changed, 336 insertions(+), 113 deletions(-)

diff --git a/src/api/workflow/instance/types.ts b/src/api/workflow/instance/types.ts
index 7cb7f97..3a337ba 100644
--- a/src/api/workflow/instance/types.ts
+++ b/src/api/workflow/instance/types.ts
@@ -7,6 +7,8 @@ export interface FlowInstanceQuery extends PageQuery {
   flowName?: string;
   createByIds?: string[] | number[];
   businessId?: string;
+  businessCode?: string;
+  businessTitle?: string;
 }
 
 export interface FlowInstanceVO extends BaseEntity {
diff --git a/src/api/workflow/task/types.ts b/src/api/workflow/task/types.ts
index e3c9abf..3950b5d 100644
--- a/src/api/workflow/task/types.ts
+++ b/src/api/workflow/task/types.ts
@@ -2,6 +2,8 @@ export interface TaskQuery extends PageQuery {
   nodeName?: string;
   flowCode?: string;
   flowName?: string;
+  businessCode?: string;
+  businessTitle?: string;
   createByIds?: string[] | number[];
 }
 
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 18f3c39..957b23c 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -23,14 +23,30 @@
         <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="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>
-                </el-form-item>
+              <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" label-width="100px">
+                <el-row :gutter="20">
+                  <el-col :span="6">
+                    <el-form-item label="业务编码" prop="businessCode">
+                      <el-input v-model="queryParams.businessCode" placeholder="请输入业务编码" clearable @keyup.enter="handleQuery" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="业务标题" prop="businessTitle">
+                      <el-input v-model="queryParams.businessTitle" placeholder="请输入业务标题" clearable @keyup.enter="handleQuery" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label="流程定义名称" prop="flowName">
+                      <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" clearable @keyup.enter="handleQuery" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                    <el-form-item label-width="0">
+                      <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                      <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
               </el-form>
             </el-card>
           </div>
@@ -38,33 +54,56 @@
         <el-card shadow="hover">
           <template #header>
             <el-row :gutter="10" class="mb8">
-              <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
+              <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @query-table="handleQuery"></right-toolbar>
             </el-row>
           </template>
 
           <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>
+            <el-table-column align="center" type="index" label="序号" width="55"></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="流程定义编码"></el-table-column>
-            <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
-            <el-table-column align="center" prop="version" label="版本号" width="90">
+            <el-table-column
+              v-if="columns[0].visible"
+              :show-overflow-tooltip="true"
+              prop="businessCode"
+              align="center"
+              label="业务编码"
+              width="140"
+            />
+            <el-table-column
+              v-if="columns[1].visible"
+              :show-overflow-tooltip="true"
+              prop="businessTitle"
+              align="center"
+              label="业务标题"
+              min-width="160"
+            />
+            <el-table-column
+              v-if="columns[2].visible"
+              :show-overflow-tooltip="true"
+              prop="flowName"
+              align="center"
+              label="流程定义名称"
+              min-width="140"
+            />
+            <el-table-column v-if="columns[3].visible" align="center" prop="flowCode" label="流程定义编码" width="130" show-overflow-tooltip />
+            <el-table-column v-if="columns[4].visible" align="center" prop="categoryName" label="流程分类" width="110" show-overflow-tooltip />
+            <el-table-column v-if="columns[5].visible" align="center" prop="version" label="版本号" width="90">
               <template #default="scope"> v{{ scope.row.version }}.0</template>
             </el-table-column>
-            <el-table-column v-if="tab === 'running'" align="center" prop="isSuspended" label="状态" min-width="70">
+            <el-table-column v-if="tab === 'running' && columns[6].visible" align="center" prop="isSuspended" label="状态" width="80">
               <template #default="scope">
                 <el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
                 <el-tag v-else type="danger">挂起</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="流程状态" min-width="70">
+            <el-table-column v-if="columns[7].visible" align="center" label="流程状态" width="100">
               <template #default="scope">
                 <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></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="162">
+            <el-table-column v-if="columns[8].visible" align="center" prop="createTime" label="启动时间" width="160" />
+            <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
               <template #default="scope">
                 <el-row :gutter="10" class="mb8">
                   <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
@@ -79,9 +118,7 @@
                     <el-button type="primary" size="small" icon="View" @click="handleOpen(scope.row, 'view')">查看</el-button>
                   </el-col>
                   <el-col :span="1.5" v-if="scope.row.flowStatus === 'waiting'">
-                    <el-button type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)"
-                      >撤销</el-button
-                    >
+                    <el-button type="primary" size="small" icon="Notification" @click="handleCancelProcessApply(scope.row.businessId)">撤销</el-button>
                   </el-col>
                 </el-row>
               </template>
@@ -134,11 +171,26 @@ const categoryOptions = ref<CategoryTreeVO[]>([]);
 const categoryName = ref('');
 
 const tab = ref('running');
+
+const columns = ref<FieldOption[]>([
+  { key: 0, label: '业务编码', visible: true },
+  { key: 1, label: '业务标题', visible: true },
+  { key: 2, label: '流程定义名称', visible: true },
+  { key: 3, label: '流程定义编码', visible: false },
+  { key: 4, label: '流程分类', visible: false },
+  { key: 5, label: '版本号', visible: false },
+  { key: 6, label: '状态', visible: true },
+  { key: 7, label: '流程状态', visible: true },
+  { key: 8, label: '启动时间', visible: true }
+]);
+
 // 查询参数
 const queryParams = ref<FlowInstanceQuery>({
   pageNum: 1,
   pageSize: 10,
-  flowCode: undefined,
+  flowName: undefined,
+  businessCode: undefined,
+  businessTitle: undefined,
   category: undefined
 });
 
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index f66d098..574ca12 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -3,20 +3,37 @@
     <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="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="流程定义编码" 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>
-            </el-form-item>
+          <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="业务编码" prop="businessCode">
+                  <el-input v-model="queryParams.businessCode" placeholder="请输入业务编码" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="业务标题" prop="businessTitle">
+                  <el-input v-model="queryParams.businessTitle" placeholder="请输入业务标题" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="流程定义名称" prop="flowName">
+                  <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="任务名称" prop="nodeName">
+                  <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label-width="0">
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </el-card>
       </div>
@@ -24,28 +41,48 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @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="businessCode" align="center" label="业务编码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></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="categoryName" label="流程分类"></el-table-column>
-        <el-table-column align="center" prop="version" label="版本号" width="90">
+        <el-table-column
+          v-if="columns[0].visible"
+          :show-overflow-tooltip="true"
+          prop="businessCode"
+          align="center"
+          label="业务编码"
+          width="140"
+        />
+        <el-table-column
+          v-if="columns[1].visible"
+          prop="businessTitle"
+          align="center"
+          label="业务标题"
+          min-width="160"
+        />
+        <el-table-column
+          v-if="columns[2].visible"
+          :show-overflow-tooltip="true"
+          prop="flowName"
+          align="center"
+          label="流程定义名称"
+          min-width="140"
+        />
+        <el-table-column v-if="columns[3].visible" align="center" prop="flowCode" label="流程定义编码" width="130" show-overflow-tooltip />
+        <el-table-column v-if="columns[4].visible" align="center" prop="categoryName" label="流程分类" width="110" show-overflow-tooltip />
+        <el-table-column v-if="columns[5].visible" 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="流程状态" min-width="70">
+        <el-table-column v-if="columns[6].visible" align="center" prop="nodeName" label="任务名称"   min-width="140" show-overflow-tooltip />
+        <el-table-column v-if="columns[7].visible" align="center" label="流程状态" width="100">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column label="操作" align="center" fixed="right" width="88" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
           </template>
@@ -64,7 +101,7 @@
 
 <script setup lang="ts">
 import { pageByTaskCopy } from '@/api/workflow/task';
-import { TaskQuery } from '@/api/workflow/task/types';
+import { TaskQuery, FlowTaskVO } from '@/api/workflow/task/types';
 import workflowCommon from '@/api/workflow/workflowCommon';
 import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
@@ -85,13 +122,27 @@ const showSearch = ref(true);
 const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
+
+const columns = ref<FieldOption[]>([
+  { key: 0, label: '业务编码', visible: true },
+  { key: 1, label: '业务标题', visible: true },
+  { key: 2, label: '流程定义名称', visible: true },
+  { key: 3, label: '流程定义编码', visible: false },
+  { key: 4, label: '流程分类', visible: false },
+  { key: 5, label: '版本号', visible: false },
+  { key: 6, label: '任务名称', visible: true },
+  { key: 7, label: '流程状态', visible: true }
+]);
+
 // 查询参数
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
   pageSize: 10,
   nodeName: undefined,
   flowName: undefined,
-  flowCode: undefined
+  flowCode: undefined,
+  businessCode: undefined,
+  businessTitle: undefined
 });
 /** 搜索按钮操作 */
 const handleQuery = () => {
@@ -121,7 +172,7 @@ const getTaskCopyList = () => {
 };
 
 /** 查看按钮操作 */
-const handleView = (row) => {
+const handleView = (row: FlowTaskVO) => {
   const routerJumpVo = reactive<RouterJumpVo>({
     businessId: row.businessId,
     taskId: row.id,
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 38925b4..994b818 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -3,25 +3,49 @@
     <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>
-              <el-badge :value="userSelectCount" :max="10" class="item">
-                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
-              </el-badge>
-            </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="流程定义编码" 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>
-            </el-form-item>
+          <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="业务编码" prop="businessCode">
+                  <el-input v-model="queryParams.businessCode" placeholder="请输入业务编码" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="业务标题" prop="businessTitle">
+                  <el-input v-model="queryParams.businessTitle" placeholder="请输入业务标题" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="流程定义名称" prop="flowName">
+                  <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item>
+                  <el-badge :value="userSelectCount" :max="10" class="item">
+                    <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+                  </el-badge>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="任务名称" prop="nodeName">
+                  <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="流程定义编码" prop="flowCode">
+                  <el-input v-model="queryParams.flowCode" placeholder="请输入流程定义编码" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label-width="0">
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </el-card>
       </div>
@@ -29,42 +53,62 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @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="businessCode" align="center" label="业务编码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></el-table-column>
-        <el-table-column align="center" prop="flowName" width="120" label="流程定义名称"></el-table-column>
-        <el-table-column align="center" prop="flowCode" width="120" label="流程定义编码"></el-table-column>
-        <el-table-column align="center" prop="categoryName" label="流程分类"></el-table-column>
-        <el-table-column align="center" prop="version" label="版本号" width="90">
+        <el-table-column
+          v-if="columns[0].visible"
+          :show-overflow-tooltip="true"
+          prop="businessCode"
+          align="center"
+          label="业务编码"
+          width="140"
+        />
+        <el-table-column
+          v-if="columns[1].visible"
+          prop="businessTitle"
+          align="center"
+          label="业务标题"
+          min-width="160"
+        />
+        <el-table-column
+          v-if="columns[2].visible"
+          :show-overflow-tooltip="true"
+          prop="flowName"
+          align="center"
+          label="流程定义名称"
+          min-width="140"
+        />
+        <el-table-column v-if="columns[3].visible" align="center" prop="flowCode" label="流程定义编码" width="130" show-overflow-tooltip />
+        <el-table-column v-if="columns[4].visible" align="center" prop="categoryName" label="流程分类" width="110" show-overflow-tooltip />
+        <el-table-column v-if="columns[5].visible" 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" :show-overflow-tooltip="true" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="createByName" :show-overflow-tooltip="true" label="申请人"></el-table-column>
-        <el-table-column align="center" prop="approverName" label="办理人">
+        <el-table-column v-if="columns[6].visible" align="center" prop="nodeName" label="任务名称" width="120" show-overflow-tooltip />
+        <el-table-column v-if="columns[7].visible" align="center" prop="createByName" label="申请人" width="100" show-overflow-tooltip />
+        <el-table-column v-if="columns[8].visible" align="center" label="办理人" min-width="100">
           <template #default="scope">
             <el-tag type="success">
               {{ scope.row.approveName || '无' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="流程状态" prop="flowStatus" min-width="80">
+        <el-table-column v-if="columns[9].visible" align="center" label="流程状态" width="100">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="任务状态" prop="flowTaskStatus" min-width="80">
+        <el-table-column v-if="columns[10].visible" align="center" label="任务状态" width="100">
           <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="创建时间" :show-overflow-tooltip="true" width="150"></el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column v-if="columns[11].visible" align="center" prop="createTime" label="创建时间" width="160" show-overflow-tooltip />
+        <el-table-column label="操作" align="center" fixed="right" width="88" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
           </template>
@@ -112,6 +156,22 @@ const showSearch = ref(true);
 const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
+
+const columns = ref<FieldOption[]>([
+  { key: 0, label: '业务编码', visible: true },
+  { key: 1, label: '业务标题', visible: true },
+  { key: 2, label: '流程定义名称', visible: true },
+  { key: 3, label: '流程定义编码', visible: false },
+  { key: 4, label: '流程分类', visible: false },
+  { key: 5, label: '版本号', visible: false },
+  { key: 6, label: '任务名称', visible: true },
+  { key: 7, label: '申请人', visible: true },
+  { key: 8, label: '办理人', visible: true },
+  { key: 9, label: '流程状态', visible: true },
+  { key: 10, label: '任务状态', visible: true },
+  { key: 11, label: '创建时间', visible: true }
+]);
+
 // 查询参数
 const queryParams = ref<TaskQuery>({
   pageNum: 1,
@@ -119,6 +179,8 @@ const queryParams = ref<TaskQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
+  businessCode: undefined,
+  businessTitle: undefined,
   createByIds: []
 });
 //申请人id
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 434c674..3c1f370 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -3,25 +3,44 @@
     <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>
-              <el-badge :value="userSelectCount" :max="10" class="item">
-                <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
-              </el-badge>
-            </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="流程定义编码" 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>
-            </el-form-item>
+          <el-form v-show="showSearch" ref="queryFormRef" :model="queryParams" label-width="100px">
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="业务编码" prop="businessCode">
+                  <el-input v-model="queryParams.businessCode" placeholder="请输入业务编码" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="业务标题" prop="businessTitle">
+                  <el-input v-model="queryParams.businessTitle" placeholder="请输入业务标题" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="流程定义名称" prop="flowName">
+                  <el-input v-model="queryParams.flowName" placeholder="请输入流程定义名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item>
+                  <el-badge :value="userSelectCount" :max="10" class="item">
+                    <el-button type="primary" @click="openUserSelect">选择申请人</el-button>
+                  </el-badge>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="6">
+                <el-form-item label="任务名称" prop="nodeName">
+                  <el-input v-model="queryParams.nodeName" placeholder="请输入任务名称" clearable @keyup.enter="handleQuery" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label-width="0">
+                  <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                  <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                </el-form-item>
+              </el-col>
+            </el-row>
           </el-form>
         </el-card>
       </div>
@@ -29,21 +48,41 @@
     <el-card shadow="hover">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
+          <right-toolbar v-model:show-search="showSearch" :columns="columns" :search="true" @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="businessCode" align="center" label="业务编码"></el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="businessTitle" align="center" label="业务标题"></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="categoryName" label="流程分类"></el-table-column>
-        <el-table-column align="center" prop="nodeName" label="任务名称"></el-table-column>
-        <el-table-column align="center" prop="createByName" label="申请人"></el-table-column>
-        <el-table-column align="center" label="办理人">
+        <el-table-column
+          v-if="columns[0].visible"
+          :show-overflow-tooltip="true"
+          prop="businessCode"
+          align="center"
+          label="业务编码"
+          width="140"
+        />
+        <el-table-column
+          v-if="columns[1].visible"
+          prop="businessTitle"
+          align="center"
+          label="业务标题"
+          min-width="160"
+        />
+        <el-table-column
+          v-if="columns[2].visible"
+          :show-overflow-tooltip="true"
+          prop="flowName"
+          align="center"
+          label="流程定义名称"
+          min-width="140"
+        />
+        <el-table-column v-if="columns[3].visible" align="center" prop="flowCode" label="流程定义编码" width="130" show-overflow-tooltip />
+        <el-table-column v-if="columns[4].visible" align="center" prop="categoryName" label="流程分类" width="110" show-overflow-tooltip />
+        <el-table-column v-if="columns[5].visible" align="center" prop="nodeName" label="任务名称" width="140" show-overflow-tooltip />
+        <el-table-column v-if="columns[6].visible" align="center" prop="createByName" label="申请人" width="100" show-overflow-tooltip />
+        <el-table-column v-if="columns[7].visible" align="center" label="办理人" min-width="80">
           <template #default="scope">
             <template v-if="scope.row.assigneeNames">
               <el-tag v-for="(name, index) in scope.row.assigneeNames.split(',')" :key="index" type="success">
@@ -55,13 +94,13 @@
             </template>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="流程状态" prop="flowStatusName" min-width="70">
+        <el-table-column v-if="columns[8].visible" align="center" label="流程状态" width="100">
           <template #default="scope">
             <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></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="200">
+        <el-table-column v-if="columns[9].visible" align="center" prop="createTime" label="创建时间" width="160" />
+        <el-table-column label="操作" align="center" fixed="right" width="88" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row)">办理</el-button>
           </template>
@@ -110,6 +149,19 @@ const total = ref(0);
 // 模型定义表格数据
 const taskList = ref([]);
 
+const columns = ref<FieldOption[]>([
+  { key: 0, label: '业务编码', visible: true },
+  { key: 1, label: '业务标题', visible: true },
+  { key: 2, label: '流程定义名称', visible: true },
+  { key: 3, label: '流程定义编码', visible: false },
+  { key: 4, label: '流程分类', visible: false },
+  { key: 5, label: '任务名称', visible: true },
+  { key: 6, label: '申请人', visible: true },
+  { key: 7, label: '办理人', visible: true },
+  { key: 8, label: '流程状态', visible: true },
+  { key: 9, label: '创建时间', visible: true }
+]);
+
 //申请人id
 const selectUserIds = ref<Array<number | string>>([]);
 //申请人选择数量
@@ -121,6 +173,8 @@ const queryParams = ref<TaskQuery>({
   nodeName: undefined,
   flowName: undefined,
   flowCode: undefined,
+  businessCode: undefined,
+  businessTitle: undefined,
   createByIds: []
 });
 onMounted(() => {