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/leave/index.vue |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/pages/hrm/leave/index.vue b/src/pages/hrm/leave/index.vue
index 16237a2..b6866de 100644
--- a/src/pages/hrm/leave/index.vue
+++ b/src/pages/hrm/leave/index.vue
@@ -13,18 +13,24 @@
 const total = ref(0);
 const loading = ref(false);
 const error = ref("");
-const canQuery = computed(() => hasPermission("hrm:leave:query"));
 const canCreate = computed(() => hasPermission("hrm:leave:create"));
 const hasMore = computed(() => rows.value.length < total.value);
 
+const isOwn = (row: Leave) => Number(row.userId) === Number(state.user?.id);
+const canOperate = (row: Leave) => isOwn(row);
+
 async function load(reset = false) {
-  if (!state.accessToken || loading.value || !canQuery.value) return;
+  if (!state.accessToken || loading.value) return;
   if (reset) { pageNo.value = 1; rows.value = []; }
   loading.value = true;
   error.value = "";
   try {
     if (!dicts.value.length) dicts.value = await getHrmDicts(state.accessToken);
-    const data = await getLeavePage(state.accessToken, { pageNo: pageNo.value, pageSize: 15, userId: state.user?.id });
+    const data = await getLeavePage(state.accessToken, {
+      pageNo: pageNo.value,
+      pageSize: 15,
+      userId: state.user?.id,
+    });
     const page = data.list || [];
     total.value = data.total || 0;
     rows.value = reset ? page : rows.value.concat(page);
@@ -42,8 +48,8 @@
 
 function chooseProcess(processes: ApproveProcess[]) {
   return new Promise<ApproveProcess | undefined>(resolve => {
-    if (processes.length === 1) return resolve(processes[0]);
     uni.showActionSheet({
+      title: "璇烽�夋嫨璇峰亣瀹℃壒娴佺▼",
       itemList: processes.map(item => item.name || item.key),
       success: result => resolve(processes[result.tapIndex]),
       fail: () => resolve(undefined)
@@ -52,7 +58,7 @@
 }
 
 async function submit(row: Leave) {
-  if (!state.accessToken || !row.id) return;
+  if (!state.accessToken || !row.id || !canOperate(row)) return;
   try {
     const automaticApproval = await getAutoApprovalPolicy(state.accessToken).catch(() => false);
     let processKey = "hrm_leave";
@@ -72,7 +78,7 @@
 }
 
 function remove(row: Leave) {
-  if (!state.accessToken || !row.id) return;
+  if (!state.accessToken || !row.id || !canOperate(row)) return;
   uni.showModal({
     title: "鍒犻櫎鐢宠",
     content: "纭畾鍒犻櫎璇ヨ鍋囩敵璇峰悧锛�",
@@ -96,14 +102,13 @@
 
 <template>
   <view class="page">
-    <view v-if="!canQuery" class="state">鏆傛棤璇峰亣鐢宠鏌ョ湅鏉冮檺</view>
     <view v-if="error" class="state error" @click="load(true)">{{ error }}</view>
     <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="row.status===0&&hasPermission('hrm:leave:update')" @click="go(row.id)">缂栬緫</button><button v-if="row.status===0&&hasPermission('hrm:leave:submit')" @click="submit(row)">鎻愪氦</button><button v-if="row.status===0&&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===0||row.status===40)&&hasPermission('hrm:leave:delete')" class="danger" @click="remove(row)">鍒犻櫎</button></view>
     </view>
-    <view v-if="canQuery&&!rows.length&&!loading" class="state">鏆傛棤鏈汉鎻愪氦鐨勮鍋囩敵璇�</view>
+    <view v-if="!rows.length&&!loading&&!error" class="state">鏆傛棤鏈汉鎻愪氦鐨勮鍋囩敵璇�</view>
     <view v-else-if="rows.length" class="more">{{ hasMore ? (loading ? "鍔犺浇涓�..." : "涓婃媺鍔犺浇鏇村") : "娌℃湁鏇村浜�" }}</view>
     <button v-if="canCreate" class="fab" @click="go()"><view /></button>
   </view>

--
Gitblit v1.9.3