From 822b68aef531a3a0ff1bb8aefc20ab4700bcdd55 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 十一月 2026 17:30:28 +0800
Subject: [PATCH] fix(app): 对齐北方科技请假流程
---
src/pages/hrm/leave/index.vue | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/pages/hrm/leave/index.vue b/src/pages/hrm/leave/index.vue
index b6866de..ba173c5 100644
--- a/src/pages/hrm/leave/index.vue
+++ b/src/pages/hrm/leave/index.vue
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { computed, ref } from "vue";
import { onPullDownRefresh, onReachBottom, onShow } from "@dcloudio/uni-app";
-import { deleteLeave, getAutoApprovalPolicy, getHrmDicts, getLeavePage, getLeaveProcesses, submitLeave, type ApproveProcess, type Leave } from "../../../api/hrm";
+import { cancelLeave, deleteLeave, getHrmDicts, getLeavePage, getLeaveProcesses, submitLeave, type ApproveProcess, type Leave } from "../../../api/hrm";
import type { DictData } from "../../../api/crm";
import { useAuth } from "../../../stores/auth";
import { auditClass, displayDate, HRM_DICT, label } from "../shared";
@@ -60,16 +60,11 @@
async function submit(row: Leave) {
if (!state.accessToken || !row.id || !canOperate(row)) return;
try {
- const automaticApproval = await getAutoApprovalPolicy(state.accessToken).catch(() => false);
- let processKey = "hrm_leave";
- if (!automaticApproval) {
- const processes = await getLeaveProcesses(state.accessToken);
- if (!processes.length) throw new Error("鏆傛棤鍙敤瀹℃壒娴佺▼");
- const process = await chooseProcess(processes);
- if (!process) return;
- processKey = process.key;
- }
- await submitLeave(state.accessToken, row.id, processKey);
+ const processes = await getLeaveProcesses(state.accessToken);
+ if (!processes.length) throw new Error("鏆傛棤鍙敤瀹℃壒娴佺▼");
+ const process = await chooseProcess(processes);
+ if (!process) return;
+ await submitLeave(state.accessToken, row.id, process.key);
uni.showToast({ title: "鎻愪氦鎴愬姛", icon: "success" });
await load(true);
} catch (cause) {
@@ -77,6 +72,14 @@
}
}
+function cancel(row: Leave) {
+ if (!state.accessToken || !row.id || !canOperate(row)) return;
+ uni.showModal({ title: "鎾ら攢鐢宠", content: "纭畾鎾ら攢璇ヨ鍋囩敵璇峰悧锛�", success: async result => {
+ if (!result.confirm || !state.accessToken) return;
+ try { await cancelLeave(state.accessToken, row.id!); uni.showToast({ title: "鎾ら攢鎴愬姛", icon: "success" }); await load(true); }
+ catch (cause) { uni.showToast({ title: cause instanceof Error ? cause.message : "鎾ら攢澶辫触", icon: "none" }); }
+ }});
+}
function remove(row: Leave) {
if (!state.accessToken || !row.id || !canOperate(row)) return;
uni.showModal({
@@ -106,7 +109,7 @@
<view v-for="row in rows" :key="row.id" class="card">
<view class="head"><view><text class="name">{{ row.userName || "--" }}鐨勮鍋囩敵璇�</text><text class="sub">鐢宠缂栧彿 {{ row.id }} 路 {{ row.deptName || "鏈垎閰嶉儴闂�" }}</text></view><text :class="['tag', auditClass(row.status)]">{{ label(dicts, HRM_DICT.auditStatus, row.status) }}</text></view>
<view class="grid"><text>绫诲瀷锛歿{ label(dicts, HRM_DICT.leaveType, row.leaveType) }}</text><text>鏃堕暱锛歿{ row.duration ?? "--" }} 澶�</text><text>寮�濮嬶細{{ displayDate(row.startTime) }}</text><text>缁撴潫锛歿{ displayDate(row.endTime) }}</text></view>
- <view class="actions"><button @click="go(row.id, 'detail')">璇︽儏</button><button v-if="canOperate(row)&&row.status===0&&hasPermission('hrm:leave:update')" @click="go(row.id)">缂栬緫</button><button v-if="canOperate(row)&&row.status===0&&hasPermission('hrm:leave:submit')" @click="submit(row)">鎻愪氦</button><button v-if="canOperate(row)&&(row.status===0||row.status===40)&&hasPermission('hrm:leave:delete')" class="danger" @click="remove(row)">鍒犻櫎</button></view>
+ <view class="actions"><button @click="go(row.id, 'detail')">璇︽儏</button><button v-if="canOperate(row)&&row.status===0&&hasPermission('hrm:leave:update')" @click="go(row.id)">缂栬緫</button><button v-if="canOperate(row)&&row.status===0&&hasPermission('hrm:leave:submit')" @click="submit(row)">鎻愪氦</button><button v-if="canOperate(row)&&row.status===10&&hasPermission('hrm:leave:cancel')" @click="cancel(row)">鎾ら攢</button><button v-if="canOperate(row)&&(row.status===0||row.status===40)&&hasPermission('hrm:leave:delete')" class="danger" @click="remove(row)">鍒犻櫎</button></view>
</view>
<view v-if="!rows.length&&!loading&&!error" class="state">鏆傛棤鏈汉鎻愪氦鐨勮鍋囩敵璇�</view>
<view v-else-if="rows.length" class="more">{{ hasMore ? (loading ? "鍔犺浇涓�..." : "涓婃媺鍔犺浇鏇村") : "娌℃湁鏇村浜�" }}</view>
--
Gitblit v1.9.3