diff --git a/src/api/workflow/processInstance/index.ts b/src/api/workflow/processInstance/index.ts
index 3efbca3..ec9c675 100644
--- a/src/api/workflow/processInstance/index.ts
+++ b/src/api/workflow/processInstance/index.ts
@@ -100,13 +100,14 @@ export const getPageByCurrent = (query: ProcessInstanceQuery): AxiosPromise<Proc
 
 /**
  * 撤销流程
- * @param businessKey 业务id
+ * @param data 参数
  * @returns
  */
-export const cancelProcessApply = (businessKey: string) => {
+export const cancelProcessApply = (data: any) => {
   return request({
-    url: `/workflow/processInstance/cancelProcessApply/${businessKey}`,
-    method: 'put'
+    url: `/workflow/processInstance/cancelProcessApply`,
+    method: 'put',
+    data: data
   });
 };
 
diff --git a/src/components/Process/approvalRecord.vue b/src/components/Process/approvalRecord.vue
index 8ed9e07..22dd00a 100644
--- a/src/components/Process/approvalRecord.vue
+++ b/src/components/Process/approvalRecord.vue
@@ -17,7 +17,7 @@
               </el-table-column>
               <el-table-column prop="flowStatus" label="状态" width="80" sortable align="center">
                 <template #default="scope">
-                  <dict-tag :options="wf_business_status" :value="scope.row.flowStatus"></dict-tag>
+                  <dict-tag :options="wf_task_status" :value="scope.row.flowStatus"></dict-tag>
                 </template>
               </el-table-column>
               <el-table-column prop="message" label="审批意见" :show-overflow-tooltip="true" sortable align="center"></el-table-column>
@@ -53,7 +53,7 @@ import processApi from '@/api/workflow/processInstance';
 import { propTypes } from '@/utils/propTypes';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
 const props = defineProps({
   width: propTypes.string.def('80%'),
   height: propTypes.string.def('100%')
diff --git a/src/components/Process/submitVerify.vue b/src/components/Process/submitVerify.vue
index 5286b1f..afaa86f 100644
--- a/src/components/Process/submitVerify.vue
+++ b/src/components/Process/submitVerify.vue
@@ -8,7 +8,7 @@
           <el-checkbox label="3" name="type">短信</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
-      <el-form-item v-if="task.flowStatus === 1" label="附件">
+      <el-form-item v-if="task.flowStatus === 'waiting'" label="附件">
         <fileUpload v-model="form.fileId" :file-type="['doc', 'xls', 'ppt', 'txt', 'pdf', 'xlsx', 'docx', 'zip']" :file-size="'20'" />
       </el-form-item>
       <el-form-item label="抄送">
@@ -17,7 +17,7 @@
           {{ user.userName }}
         </el-tag>
       </el-form-item>
-      <el-form-item v-if="task.flowStatus === 1" label="审批意见">
+      <el-form-item v-if="task.flowStatus === 'waiting'" label="审批意见">
         <el-input v-model="form.message" type="textarea" resize="none" />
       </el-form-item>
     </el-form>
@@ -233,7 +233,10 @@ const handleBackProcess = async () => {
   loading.value = true;
   backLoading.value = true;
   backButtonDisabled.value = true;
-  await backProcess(backForm.value).finally(() => (loading.value = false));
+  await backProcess(backForm.value).finally(() => {
+    loading.value = false
+    buttonDisabled.value = false
+  });
   dialog.visible = false;
   backLoading.value = false;
   backButtonDisabled.value = false;
@@ -294,7 +297,10 @@ const handleTransferTask = async (data) => {
     await proxy?.$modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
-    await transferTask(params).finally(() => (loading.value = false));
+    await transferTask(params).finally(() => {
+      loading.value = false
+      buttonDisabled.value = false
+    });
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
@@ -318,7 +324,10 @@ const handleDelegateTask = async (data) => {
     await proxy?.$modal.confirm('是否确认提交？');
     loading.value = true;
     buttonDisabled.value = true;
-    await delegateTask(params).finally(() => (loading.value = false));
+    await delegateTask(params).finally(() => {
+      loading.value = false
+      buttonDisabled.value = false
+    });
     dialog.visible = false;
     emits('submitCallback');
     proxy?.$modal.msgSuccess('操作成功');
@@ -335,7 +344,10 @@ const handleTerminationTask = async (data) => {
   await proxy?.$modal.confirm('是否确认终止？');
   loading.value = true;
   buttonDisabled.value = true;
-  await terminationTask(params).finally(() => (loading.value = false));
+  await terminationTask(params).finally(() => {
+    loading.value = false
+    buttonDisabled.value = false
+  });
   dialog.visible = false;
   emits('submitCallback');
   proxy?.$modal.msgSuccess('操作成功');
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index cd12fd4..ee86fa6 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -31,7 +31,7 @@
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="leaveList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border :data="leaveList" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column v-if="false" label="主键" align="center" prop="id" />
         <el-table-column label="请假类型" align="center">
@@ -56,31 +56,36 @@
             <dict-tag :options="wf_business_status" :value="scope.row.status"></dict-tag>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="162">
           <template #default="scope">
-            <el-button
-              v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'"
-              v-hasPermi="['workflow:leave:edit']"
-              size="small"
-              link
-              type="primary"
-              icon="Edit"
-              @click="handleUpdate(scope.row)"
-              >修改</el-button
-            >
-            <el-button v-hasPermi="['workflow:leave:remove']" size="small" link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-              >删除</el-button
-            >
-            <el-button link type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
-            <el-button
-              v-if="scope.row.status === '1'"
-              link
-              size="small"
-              type="primary"
-              icon="Notification"
-              @click="handleCancelProcessApply(scope.row.id)"
-              >撤销</el-button
-            >
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+                <el-button
+                  v-hasPermi="['workflow:leave:edit']"
+                  size="small"
+                  type="primary"
+                  icon="Edit"
+                  @click="handleUpdate(scope.row)"
+                  >修改</el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.status === 'draft' || scope.row.status === 'cancel' || scope.row.status === 'back'">
+                <el-button v-hasPermi="['workflow:leave:remove']" size="small" type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                >删除</el-button>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="1.5">
+                <el-button type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
+              </el-col>
+              <el-col :span="1.5" v-if="scope.row.status === 'waiting'">
+                <el-button
+                  size="small"
+                  type="primary"
+                  icon="Notification"
+                  @click="handleCancelProcessApply(scope.row.id)"
+                  >撤销</el-button>
+              </el-col>
+            </el-row>
           </template>
         </el-table-column>
       </el-table>
@@ -225,7 +230,11 @@ const handleExport = () => {
 const handleCancelProcessApply = async (id: string) => {
   await proxy?.$modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
-  await cancelProcessApply(id).finally(() => (loading.value = false));
+  let data = {
+    businessId:id,
+    message:'撤销流程！'
+  }
+  await cancelProcessApply(data).finally(() => (loading.value = false));
   await getList();
   proxy?.$modal.msgSuccess('撤销成功');
 };
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 5e88dd1..7c47090 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -70,6 +70,11 @@
             <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' ? '80' : '151'">
           <template #default="scope">
@@ -144,6 +149,7 @@ const userSelectRef = ref<InstanceType<typeof UserSelect>>();
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
 // 遮罩层
 const loading = ref(true);
 // 选中数组
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index fe38a77..ee1c1a7 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -63,28 +63,24 @@
               </template>
             </el-table-column>
             <el-table-column align="center" prop="createTime" label="启动时间" width="160"></el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="162">
               <template #default="scope">
-                <el-tooltip
-                  v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
-                  content="修改"
-                  placement="top"
-                >
-                  <el-button link type="primary" icon="Edit" @click="handleOpen(scope.row, 'update')"></el-button>
-                </el-tooltip>
-                <el-tooltip
-                  v-if="scope.row.businessStatus === 'draft' || scope.row.businessStatus === 'cancel' || scope.row.businessStatus === 'back'"
-                  content="删除"
-                  placement="top"
-                >
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
-                </el-tooltip>
-                <el-tooltip placement="top" content="查看">
-                  <el-button link type="primary" icon="View" @click="handleOpen(scope.row, 'view')"></el-button>
-                </el-tooltip>
-                <el-tooltip v-if="scope.row.businessStatus === 'waiting'" content="撤销" placement="top">
-                  <el-button link type="primary" icon="Notification" @click="handleCancelProcessApply(scope.row.businessKey)"></el-button>
-                </el-tooltip>
+                <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'">
+                    <el-button type="primary" size="small" icon="Edit" @click="handleOpen(scope.row, 'update')">编辑</el-button>
+                  </el-col>
+                  <el-col :span="1.5" v-if="scope.row.flowStatus === 'draft' || scope.row.flowStatus === 'cancel' || scope.row.flowStatus === 'back'">
+                    <el-button type="primary" size="small" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="10" class="mb8">
+                  <el-col :span="1.5">
+                    <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-col>
+                </el-row>
               </template>
             </el-table-column>
           </el-table>
@@ -226,11 +222,15 @@ const handleDelete = async (row: ProcessInstanceVO) => {
 };
 
 /** 撤销按钮操作 */
-const handleCancelProcessApply = async (businessKey: string) => {
+const handleCancelProcessApply = async (businessId: string) => {
   await proxy?.$modal.confirm('是否确认撤销当前单据？');
   loading.value = true;
   if ('running' === tab.value) {
-    await cancelProcessApply(businessKey).finally(() => (loading.value = false));
+    let data = {
+      businessId:businessId,
+      message:'撤销流程！'
+    }
+    await cancelProcessApply(data).finally(() => (loading.value = false));
     getList();
   }
   proxy?.$modal.msgSuccess('撤销成功');
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 52013c8..cdd2017 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -45,6 +45,16 @@
             </el-tag>
           </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 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="200">
           <template #default="scope">
@@ -71,6 +81,8 @@ import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { wf_business_status } = toRefs<any>(proxy?.useDict('wf_business_status'));
+const { wf_task_status } = toRefs<any>(proxy?.useDict('wf_task_status'));
 // 遮罩层
 const loading = ref(true);
 // 选中数组