From f561b4eb0b23fe483b71eb3ccf82c6d0a76957fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Wed, 11 Mar 2026 16:03:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AE=A1=E6=89=B9):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E5=AE=A1=E6=89=B9=E5=8A=9F=E8=83=BD=E5=B9=B6?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在approval.js中添加withdrawApproval API方法
- 在leave.vue和goout.vue中启用撤回按钮并调用新API
- 在todo/index.vue中优化审批状态显示逻辑
---
 klp-ui/src/api/wms/approval.js           | 13 ++++++
 klp-ui/src/views/wms/hrm/apply/goout.vue | 16 +++----
 klp-ui/src/views/wms/hrm/apply/leave.vue | 10 ++---
 klp-ui/src/views/wms/hrm/todo/index.vue  | 55 ++++++++++++++++--------
 4 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/klp-ui/src/api/wms/approval.js b/klp-ui/src/api/wms/approval.js
index 3b3a3c63..1321f852 100644
--- a/klp-ui/src/api/wms/approval.js
+++ b/klp-ui/src/api/wms/approval.js
@@ -42,3 +42,16 @@ export function delApproval(approvalId) {
     method: 'delete'
   })
 }
+
+/**
+ * 撤销审批
+ */
+export function withdrawApproval(approvalId) {
+  return request({
+    url: '/wms/approval/cancel',
+    method: 'post',
+    params: {
+      approvalId: approvalId
+    }
+  })
+}
diff --git a/klp-ui/src/views/wms/hrm/apply/goout.vue b/klp-ui/src/views/wms/hrm/apply/goout.vue
index 30923a47..e3258db4 100644
--- a/klp-ui/src/views/wms/hrm/apply/goout.vue
+++ b/klp-ui/src/views/wms/hrm/apply/goout.vue
@@ -63,13 +63,13 @@
             <el-button style="float: right;" icon="el-icon-refresh" @click="getList">刷新</el-button>
           </template>
           <el-table v-loading="loading" :data="leaveRequestList">
-            <!-- <el-table-column prop="approvalStatus" label="审批状态" align="center">
+            <el-table-column prop="approvalStatus" label="审批状态" align="center">
               <template slot-scope="scope">
                 <el-tag :type="getStatusTagType(scope.row.approvalStatus)">
                   {{ getStatusText(scope.row.approvalStatus) }}
                 </el-tag>
               </template>
-            </el-table-column> -->
+            </el-table-column>
             <el-table-column label="外出类型" align="center" prop="outType">
               <template slot-scope="scope">
                 <dict-tag :options="dict.type.hrm_out_type" :value="scope.row.outType" />
@@ -104,8 +104,8 @@
                   @click="handlePrint(scope.row)">打印</el-button>
                 <el-button icon="el-icon-edit" size="mini" @click="handleEdit(scope.row)"
                   v-if="scope.row.approvalStatus === '待审批'">修改</el-button>
-                <!-- <el-button icon="el-icon-delete" size="mini" @click="handleWithdraw(scope.row)"
-                  v-if="scope.row.approvalStatus === '待审批'">撤回</el-button> -->
+                <el-button icon="el-icon-delete" size="mini" @click="handleWithdraw(scope.row)"
+                  v-if="scope.row.approvalStatus === '待审批'">撤回</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -121,7 +121,7 @@
 
 <script>
 import { getOutRequest, addOutRequest, updateOutRequest } from "@/api/wms/outRequest";
-import { listApproval, updateApproval } from "@/api/wms/approval"
+import { listApproval, updateApproval, withdrawApproval } from "@/api/wms/approval"
 import { listDept } from "@/api/wms/dept"
 import FileUpload from '@/components/FileUpload'
 import EmployeeSelector from '@/components/EmployeeSelector'
@@ -324,10 +324,8 @@ export default {
     handleWithdraw(row) {
       this.$modal.confirm('是否确认撤回外出申请编号为"' + row.applyId + '"的数据项？').then(() => {
         this.loading = true;
-        return updateApproval({
-          approvalId: row.approvalId,
-          approvalStatus: '已撤销'
-        });
+        // 撤销审批
+        return withdrawApproval(row.approvalId)
       }).then(() => {
         this.loading = false;
         this.getList();
diff --git a/klp-ui/src/views/wms/hrm/apply/leave.vue b/klp-ui/src/views/wms/hrm/apply/leave.vue
index c5d1f738..7468e867 100644
--- a/klp-ui/src/views/wms/hrm/apply/leave.vue
+++ b/klp-ui/src/views/wms/hrm/apply/leave.vue
@@ -133,7 +133,7 @@
             <el-table-column label="操作" align="center" width="160">
               <template slot-scope="scope" v-if="scope.row.approvalStatus === '待审批'">
                 <el-button icon="el-icon-edit" size="mini" @click="handleEdit(scope.row)">修改</el-button>
-                <!-- <el-button icon="el-icon-delete" size="mini" @click="handleWithdraw(scope.row)">撤回</el-button> -->
+                <el-button icon="el-icon-delete" size="mini" @click="handleWithdraw(scope.row)">撤回</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -147,7 +147,7 @@
 
 <script>
 import { getLeaveRequest, addLeaveRequest, updateLeaveRequest } from "@/api/wms/leaveRequest";
-import { listApproval, updateApproval } from "@/api/wms/approval"
+import { listApproval, updateApproval, withdrawApproval } from "@/api/wms/approval"
 import { listDept } from "@/api/wms/dept"
 import FileUpload from '@/components/FileUpload'
 import EmployeeSelector from '@/components/EmployeeSelector'
@@ -390,10 +390,8 @@ export default {
     handleWithdraw(row) {
       this.$modal.confirm('是否确认撤回请假申请编号为"' + row.applyId + '"的数据项？').then(() => {
         this.loading = true;
-        return updateApproval({
-          approvalId: row.approvalId,
-          approvalStatus: '已撤销'
-        });
+        // 撤销审批
+        return withdrawApproval(row.approvalId)
       }).then(() => {
         this.loading = false;
         this.getList();
diff --git a/klp-ui/src/views/wms/hrm/todo/index.vue b/klp-ui/src/views/wms/hrm/todo/index.vue
index 439f4d13..931d506b 100644
--- a/klp-ui/src/views/wms/hrm/todo/index.vue
+++ b/klp-ui/src/views/wms/hrm/todo/index.vue
@@ -40,39 +40,32 @@
             <div class="custom-tabs-nav">
               <div 
                 class="custom-tabs-item"
-                :class="{ active: queryParams.approvalStatus === undefined || queryParams.approvalStatus === '' }"
-                @click="handleTabClick('approvalStatus', '')"
+                :class="{ active: queryParams.taskStatus === undefined || queryParams.taskStatus === '' }"
+                @click="handleTabClick('taskStatus', '')"
               >
                 全部
               </div>
               <div 
                 class="custom-tabs-item"
-                :class="{ active: queryParams.approvalStatus === '待审批' }"
-                @click="handleTabClick('approvalStatus', '待审批')"
+                :class="{ active: queryParams.taskStatus === 'pending' }"
+                @click="handleTabClick('taskStatus', 'pending')"
               >
                 待审批
               </div>
               <div 
                 class="custom-tabs-item"
-                :class="{ active: queryParams.approvalStatus === '已同意' }"
-                @click="handleTabClick('approvalStatus', '已同意')"
+                :class="{ active: queryParams.taskStatus === 'approved' }"
+                @click="handleTabClick('taskStatus', 'approved')"
               >
                 已同意
               </div>
               <div 
                 class="custom-tabs-item"
-                :class="{ active: queryParams.approvalStatus === '已驳回' }"
-                @click="handleTabClick('approvalStatus', '已驳回')"
+                :class="{ active: queryParams.taskStatus === 'rejected' }"
+                @click="handleTabClick('taskStatus', 'rejected')"
               >
                 已驳回
               </div>
-              <div 
-                class="custom-tabs-item"
-                :class="{ active: queryParams.approvalStatus === '已撤销' }"
-                @click="handleTabClick('approvalStatus', '已撤销')"
-              >
-                已撤回
-              </div>
             </div>
           </div>
 
@@ -110,6 +103,13 @@
               {{ scope.row.endTime ? formatTime(scope.row.endTime) : '-' }}
             </template>
           </el-table-column>
+          <el-table-column prop="taskStatus" label="整体状态" align="center">
+            <template slot-scope="scope">
+              <el-tag :type="getInstStatusTagType(scope.row.approvalStatus)">
+                {{ getInstStatusText(scope.row.approvalStatus) }}
+              </el-tag>
+            </template>
+          </el-table-column>
           <el-table-column prop="taskStatus" label="审批状态" align="center">
             <template slot-scope="scope">
               <el-tag :type="getStatusTagType(scope.row.taskStatus)">
@@ -127,7 +127,7 @@
                 详情
               </el-button>
               <el-button
-                v-if="scope.row.approvalStatus === '待审批'"
+                v-if="scope.row.taskStatus === 'pending'"
                 size="small"
                 icon="el-icon-check"
                 @click="handleApprove(scope.row)"
@@ -136,7 +136,7 @@
                 同意
               </el-button>
               <el-button
-                v-if="scope.row.approvalStatus === '待审批'"
+                v-if="scope.row.taskStatus === 'pending'"
                 size="small"
                 icon="el-icon-close"
                 @click="handleReject(scope.row)"
@@ -369,6 +369,27 @@ export default {
       return this.parseTime(time, '{y}-{m}-{d} {h}')
     },
 
+    // 获取审批状态对应的标签类型
+    getInstStatusTagType(status) {
+      const typeMap = {
+        '待审批': 'warning',
+        '已同意': 'success',
+        '已驳回': 'danger',
+        '已撤销': 'info',
+      }
+      return typeMap[status] || 'default'
+    },
+    // 获取审批状态的中文文本
+    getInstStatusText(status) {
+      const textMap = {
+        '待审批': '待审批',
+        '已同意': '已同意',
+        '已驳回': '已驳回',
+        '已撤销': '已撤销',
+      }
+      return textMap[status] || '未知状态'
+    },
+
     // 获取审批状态对应的标签类型
     getStatusTagType(status) {
       const typeMap = {