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/form.vue |   89 +++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 78 insertions(+), 11 deletions(-)

diff --git a/src/pages/hrm/leave/form.vue b/src/pages/hrm/leave/form.vue
index e434588..4f3fa4c 100644
--- a/src/pages/hrm/leave/form.vue
+++ b/src/pages/hrm/leave/form.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, reactive, ref } from "vue";
 import { onLoad } from "@dcloudio/uni-app";
-import { createLeave, getHrmDicts, getLeave, updateLeave, type HrmAttachment, type Leave } from "../../../api/hrm";
+import { createLeave, getAutoApprovalPolicy, getHrmDicts, getLeave, getLeaveProcesses, submitLeave, updateLeave, type ApproveProcess, type HrmAttachment, type Leave } from "../../../api/hrm";
 import type { DictData } from "../../../api/crm";
 import { useAuth } from "../../../stores/auth";
 import { HRM_DICT, label, options, setDateTime } from "../shared";
@@ -11,33 +11,94 @@
 const id = ref<number>();
 const mode = ref("edit");
 const saving = ref(false);
+const submitting = ref(false);
 const dicts = ref<DictData[]>([]);
 const attachments = ref<HrmAttachment[]>([]);
 const form = reactive<Leave>({ userId: undefined, leaveType: undefined, startTime: "", endTime: "", duration: 0.5, reason: "", blobIds: [] });
 const readonly = computed(() => mode.value === "detail");
 const canSave = computed(() => !readonly.value && (id.value ? hasPermission("hrm:leave:update") : hasPermission("hrm:leave:create")));
+const canSubmit = computed(() => canSave.value && hasPermission("hrm:leave:submit"));
 const typeOptions = computed(() => options(dicts.value, HRM_DICT.leaveType));
 const userText = computed(() => form.userName || state.user?.nickname || state.user?.username || "褰撳墠鐧诲綍鐢ㄦ埛");
 
-async function save() {
+function validateForm() {
   if (!form.userId || form.leaveType === undefined || !form.startTime || !form.endTime || !form.duration || !form.reason?.trim()) {
-    return uni.showToast({ title: "璇峰畬鏁村~鍐欏繀濉」", icon: "none" });
+    uni.showToast({ title: "璇峰畬鏁村~鍐欏繀濉」", icon: "none" });
+    return false;
   }
   if (new Date(form.endTime.replace(/-/g, "/")) <= new Date(form.startTime.replace(/-/g, "/"))) {
-    return uni.showToast({ title: "缁撴潫鏃堕棿搴旀櫄浜庡紑濮嬫椂闂�", icon: "none" });
+    uni.showToast({ title: "缁撴潫鏃堕棿搴旀櫄浜庡紑濮嬫椂闂�", icon: "none" });
+    return false;
   }
-  if (!state.accessToken || saving.value) return;
+  return true;
+}
+
+async function persistDraft() {
+  if (!state.accessToken) throw new Error("鐧诲綍鐘舵�佸凡澶辨晥");
+  const data = { ...form, id: id.value, userId: state.user?.id };
+  if (id.value) await updateLeave(state.accessToken, data);
+  else id.value = await createLeave(state.accessToken, data);
+  if (!id.value) throw new Error("鑽夌淇濆瓨澶辫触");
+  const latest = await getLeave(state.accessToken, id.value);
+  Object.assign(form, latest, { blobIds: latest.attachmentList?.map(item => item.id) || latest.blobIds || [] });
+  attachments.value = latest.attachmentList || [];
+  return latest;
+}
+
+function chooseProcess(processes: ApproveProcess[]) {
+  return new Promise<ApproveProcess | undefined>(resolve => {
+    uni.showActionSheet({
+      title: "璇烽�夋嫨璇峰亣瀹℃壒娴佺▼",
+      itemList: processes.map(item => item.name || item.key),
+      success: result => resolve(processes[result.tapIndex]),
+      fail: () => resolve(undefined),
+    });
+  });
+}
+
+async function save() {
+  if (!validateForm() || !state.accessToken || saving.value || submitting.value) return;
   saving.value = true;
   try {
-    const data = { ...form, id: id.value, userId: state.user?.id };
-    if (id.value) await updateLeave(state.accessToken, data);
-    else id.value = await createLeave(state.accessToken, data);
+    await persistDraft();
     uni.showToast({ title: "淇濆瓨鎴愬姛", icon: "success" });
     setTimeout(() => uni.navigateBack(), 500);
   } catch (error) {
     uni.showToast({ title: error instanceof Error ? error.message : "淇濆瓨澶辫触", icon: "none" });
   } finally {
     saving.value = false;
+  }
+}
+
+async function saveAndSubmit() {
+  if (!validateForm() || !state.accessToken || saving.value || submitting.value) return;
+  submitting.value = true;
+  let draftSaved = false;
+  try {
+    const latest = await persistDraft();
+    draftSaved = true;
+    if (!latest.id) throw new Error("鏈幏鍙栧埌鏈�鏂扮敵璇蜂俊鎭�");
+
+    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) {
+        uni.showToast({ title: "宸蹭繚瀛樿崏绋�", icon: "success" });
+        return;
+      }
+      processKey = process.key;
+    }
+    await submitLeave(state.accessToken, latest.id, processKey);
+    uni.showToast({ title: "鎻愪氦鎴愬姛", icon: "success" });
+    setTimeout(() => uni.navigateBack(), 500);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : "鎻愪氦澶辫触";
+    uni.showToast({ title: draftSaved ? `鑽夌宸蹭繚瀛橈紝${message}` : message, icon: "none" });
+  } finally {
+    submitting.value = false;
   }
 }
 
@@ -95,12 +156,18 @@
       </view>
       <view class="field"><text>璇峰亣鏃堕暱 <text class="required">*</text></text><input v-model.number="form.duration" :disabled="readonly" type="digit" placeholder="鍗曚綅锛氬ぉ" /></view>
       <view class="field column"><text>璇峰亣鍘熷洜 <text class="required">*</text></text><textarea v-model="form.reason" :disabled="readonly" maxlength="500" placeholder="璇疯緭鍏ヨ鍋囧師鍥�" /></view>
-      <HrmAttachmentField v-model="form.blobIds" v-model:files="attachments" :token="state.accessToken" :readonly="readonly" />
+      <HrmAttachmentField class="leave-attachment" v-model="form.blobIds" v-model:files="attachments" :token="state.accessToken" :readonly="readonly" />
       <view class="field column"><text>澶囨敞</text><textarea v-model="form.remark" :disabled="readonly" placeholder="璇疯緭鍏ュ娉�" /></view>
     </view>
-    <button v-if="canSave" class="save" :loading="saving" @click="save">淇濆瓨鑽夌</button>
+    <view v-if="canSave" class="form-actions">
+      <button class="save secondary" :loading="saving" :disabled="submitting" @click="save">淇濆瓨鑽夌</button>
+      <button v-if="canSubmit" class="save" :loading="submitting" :disabled="saving" @click="saveAndSubmit">鐩存帴鎻愪氦</button>
+    </view>
     <button v-else-if="readonly&&form.status===0&&hasPermission('hrm:leave:update')" class="save" @click="mode='edit'">缂栬緫</button>
   </view>
 </template>
 
-<style lang="scss" scoped>@import "../form.scss";</style>
+<style lang="scss" scoped>
+@import "../form.scss";
+.leave-attachment{box-sizing:border-box;padding-right:24rpx;padding-left:24rpx}
+</style>

--
Gitblit v1.9.3