From 5d88de78c732a9fc25f01753779f0a3fc1e34e62 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Fri, 18 Jul 2025 11:55:25 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=AF=B7=E5=81=87=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E6=8C=89=E9=92=AE=E5=8C=BA=E5=9F=9F=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../src/views/workflow/leave/index.vue        | 95 +++++++++++--------
 2 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a7193c4..1b59365a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - Modal/Drawer中使用VxeTable tooltip需要设置更高的z-index 防止被遮挡
 - 字典(DictTag)使用tsx写法重构
+- 请假申请 按钮区域重构
 
 **OTHERS**
 
diff --git a/apps/web-antd/src/views/workflow/leave/index.vue b/apps/web-antd/src/views/workflow/leave/index.vue
index 8e46ab00..f0224f82 100644
--- a/apps/web-antd/src/views/workflow/leave/index.vue
+++ b/apps/web-antd/src/views/workflow/leave/index.vue
@@ -60,11 +60,27 @@ const gridOptions: VxeGridProps = {
   },
   // 表格全局唯一表示 保存列配置需要用到
   id: 'workflow-leave-index',
+  cellClassName: ({ row }) => {
+    // 草稿状态 可点击
+    if (row.status === 'draft') {
+      return 'cursor-pointer';
+    }
+  },
 };
 
 const [BasicTable, tableApi] = useVbenVxeGrid({
   formOptions,
   gridOptions,
+  gridEvents: {
+    cellClick: ({ row }) => {
+      // 非草稿状态 不做处理
+      if (row.status !== 'draft') {
+        return;
+      }
+      // 查看详情
+      handleInfo(row);
+    },
+  },
 });
 
 const router = useRouter();
@@ -152,47 +168,50 @@ function handleInfo(row: Required<LeaveForm>) {
         </Space>
       </template>
       <template #action="{ row }">
-        <Space>
-          <ghost-button
-            v-if="['draft', 'cancel', 'back'].includes(row.status)"
+        <a-button
+          size="small"
+          type="link"
+          :disabled="!['draft', 'cancel', 'back'].includes(row.status)"
+          v-access:code="['workflow:leave:edit']"
+          @click.stop="handleEdit(row)"
+        >
+          {{ $t('pages.common.edit') }}
+        </a-button>
+        <Popconfirm
+          :get-popup-container="getVxePopupContainer"
+          placement="left"
+          title="确认撤销？"
+          @confirm.stop="handleRevoke(row)"
+          @cancel.stop=""
+        >
+          <a-button
+            size="small"
+            type="link"
+            :disbaled="!['waiting'].includes(row.status)"
             v-access:code="['workflow:leave:edit']"
-            @click.stop="handleEdit(row)"
+            @click.stop=""
           >
-            {{ $t('pages.common.edit') }}
-          </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认撤销？"
-            @confirm="handleRevoke(row)"
+            撤销
+          </a-button>
+        </Popconfirm>
+        <Popconfirm
+          :get-popup-container="getVxePopupContainer"
+          placement="left"
+          title="确认删除？"
+          @confirm.stop="handleDelete(row)"
+          @cancel.stop=""
+        >
+          <a-button
+            size="small"
+            type="link"
+            :disabled="!['draft', 'cancel', 'back'].includes(row.status)"
+            danger
+            v-access:code="['workflow:leave:remove']"
+            @click.stop=""
           >
-            <ghost-button
-              v-if="['waiting'].includes(row.status)"
-              v-access:code="['workflow:leave:edit']"
-              @click.stop=""
-            >
-              撤销
-            </ghost-button>
-          </Popconfirm>
-          <ghost-button v-if="row.status !== 'draft'" @click="handleInfo(row)">
-            详情
-          </ghost-button>
-          <Popconfirm
-            :get-popup-container="getVxePopupContainer"
-            placement="left"
-            title="确认删除？"
-            @confirm="handleDelete(row)"
-          >
-            <ghost-button
-              v-if="['draft', 'cancel', 'back'].includes(row.status)"
-              danger
-              v-access:code="['workflow:leave:remove']"
-              @click.stop=""
-            >
-              {{ $t('pages.common.delete') }}
-            </ghost-button>
-          </Popconfirm>
-        </Space>
+            {{ $t('pages.common.delete') }}
+          </a-button>
+        </Popconfirm>
       </template>
     </BasicTable>
     <FlowInfoModal />