From 4d62184a9b98a65c78c3aac586fcda2855cf87f4 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期一, 02 十一月 2026 13:35:06 +0800
Subject: [PATCH] Merge branch 'master' into dev_新高电力
---
src/pages/hrm/attendance-record/index.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/pages/hrm/attendance-record/index.vue b/src/pages/hrm/attendance-record/index.vue
index a31c770..3ea2629 100644
--- a/src/pages/hrm/attendance-record/index.vue
+++ b/src/pages/hrm/attendance-record/index.vue
@@ -9,6 +9,12 @@
const pageSize = 15;
const canQuery = computed(() => hasPermission("hrm:attendance-record:query"));
const hasMore = computed(() => rows.value.length < total.value);
+const leaveNames: Record<string, string> = { "1":"浜嬪亣", "2":"鐥呭亣", "3":"骞村亣", "4":"濠氬亣", "5":"浜у亣", "6":"涓у亣" };
+function leaveText(row: AttendanceRecord) {
+ if (!row.leaveFlag) return "";
+ const names = String(row.leaveTypes || "").split(",").map(type => leaveNames[type.trim()] || type.trim()).filter(Boolean).join("銆�") || "璇峰亣";
+ return Number(row.leaveHours) > 0 ? `${names} ${Number(row.leaveHours).toFixed(2)}h` : names;
+}
async function load(reset = true) {
if (!state.accessToken || !canQuery.value || loading.value) return;
if (reset) { pageNo.value = 1; total.value = 0; }
@@ -24,4 +30,4 @@
onShow(() => load(true));
onPullDownRefresh(() => load(true));
onReachBottom(() => { if (hasMore.value) load(false); });
-</script><template><view class="page"><template v-if="canQuery"><view class="search"><input v-model="keyword" placeholder="鎼滅储鍛樺伐濮撳悕" @confirm="load"/><text @click="load">鎼滅储</text></view><view v-for="row in rows" :key="row.id" class="card"><view class="head"><view class="head-main"><text class="name">{{row.userName||'--'}}</text><text class="sub">{{row.deptName||'--'}} 路 {{row.date||'--'}}</text></view><text class="tag tag-blue">{{row.dataSourceName||'鑰冨嫟'}}</text></view><view class="grid"><text>涓婄彮锛歿{row.clockInTime||'--'}}</text><text>涓嬬彮锛歿{row.clockOutTime||'--'}}</text><text>涓婄彮鐘舵�侊細{{row.clockInTypeName||'--'}}</text><text>涓嬬彮鐘舵�侊細{{row.clockOutTypeName||'--'}}</text><text>宸ユ椂锛歿{row.workHours??0}} 灏忔椂</text><text>鍔犵彮锛歿{row.overtimeHours??0}} 灏忔椂</text><text>鍦扮偣锛歿{row.location||'--'}}</text></view></view><view v-if="!rows.length" class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤鑰冨嫟璁板綍'}}</view><view v-else class="state more">{{loading ? "鍔犺浇涓�..." : hasMore ? "涓婃媺鍔犺浇鏇村" : "娌℃湁鏇村浜�"}}</view></template><view v-else class="state">鏆傛棤鑰冨嫟璁板綍鏌ョ湅鏉冮檺</view></view></template><style scoped lang="scss">@import "../list.scss";</style>
+</script><template><view class="page"><template v-if="canQuery"><view class="search"><input v-model="keyword" placeholder="鎼滅储鍛樺伐濮撳悕" @confirm="load"/><text @click="load">鎼滅储</text></view><view v-for="row in rows" :key="row.id" class="card"><view class="head"><view class="head-main"><text class="name">{{row.userName||'--'}}</text><text class="sub">{{row.deptName||'--'}} 路 {{row.date||'--'}}</text></view><view class="tags"><text v-if="row.leaveFlag" class="tag tag-blue">{{leaveText(row)}}</text><text class="tag tag-blue">{{row.dataSourceName||'鑰冨嫟'}}</text></view></view><view class="grid"><text>涓婄彮锛歿{row.clockInTime||'--'}}</text><text>涓嬬彮锛歿{row.clockOutTime||'--'}}</text><text>涓婄彮鐘舵�侊細{{row.clockInTypeName||'--'}}</text><text>涓嬬彮鐘舵�侊細{{row.clockOutTypeName||'--'}}</text><text>宸ユ椂锛歿{row.workHours??0}} 灏忔椂</text><text>鍔犵彮锛歿{row.overtimeHours??0}} 灏忔椂</text><text>鍦扮偣锛歿{row.location||'--'}}</text></view></view><view v-if="!rows.length" class="state">{{loading?'鍔犺浇涓�...':'鏆傛棤鑰冨嫟璁板綍'}}</view><view v-else class="state more">{{loading ? "鍔犺浇涓�..." : hasMore ? "涓婃媺鍔犺浇鏇村" : "娌℃湁鏇村浜�"}}</view></template><view v-else class="state">鏆傛棤鑰冨嫟璁板綍鏌ョ湅鏉冮檺</view></view></template><style scoped lang="scss">@import "../list.scss";</style>
--
Gitblit v1.9.3