From 0a58164ce2ea3f1a2b46781757d78b94b212883b Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 20 五月 2026 15:13:49 +0800
Subject: [PATCH] 工作交接/调岗申请/转正申请/请假申请/加班申请新增调用模板
---
src/views/officeProcessAutomation/AttendManage/leave-apply/index.vue | 741 +++++++++++++++++++++++++-------------------------------
1 files changed, 334 insertions(+), 407 deletions(-)
diff --git a/src/views/officeProcessAutomation/AttendManage/leave-apply/index.vue b/src/views/officeProcessAutomation/AttendManage/leave-apply/index.vue
index 30a821b..7bd7b58 100644
--- a/src/views/officeProcessAutomation/AttendManage/leave-apply/index.vue
+++ b/src/views/officeProcessAutomation/AttendManage/leave-apply/index.vue
@@ -20,7 +20,7 @@
<el-button @click="resetSearch">閲嶇疆</el-button>
</div>
<div>
- <el-button type="primary" @click="openFormDialog('add')">鏂板璇峰亣鐢宠</el-button>
+ <el-button type="primary" @click="openAddWithTemplate">鏂板璇峰亣鐢宠</el-button>
</div>
</div>
<div class="table_list">
@@ -38,6 +38,7 @@
<!-- 鏂板 / 缂栬緫 -->
<el-dialog
+ v-if="formDialog.visible"
v-model="formDialog.visible"
:title="formDialog.title"
width="960px"
@@ -47,39 +48,21 @@
@closed="onFormClosed"
>
<el-form ref="formRef" :model="form" :rules="formRules" label-width="140px" class="leave-apply-form">
+ <el-form-item v-if="form.templateSnapshot" label="瀹℃壒妯℃澘">
+ <span class="template-name">{{ form.templateSnapshot.label || form.templateName }}</span>
+ <el-button
+ v-if="formDialog.mode === 'add'"
+ type="primary"
+ link
+ class="ml12"
+ @click="reopenTemplateBind"
+ >
+ 鏇存崲妯℃澘
+ </el-button>
+ </el-form-item>
+
+ <FormPayloadFields :fields="templateDisplayFields" :form-payload="form.formPayload" />
<el-row :gutter="24">
- <el-col :span="24">
- <el-form-item label="鐢宠浜�" prop="applicantId">
- <el-select
- v-model="form.applicantId"
- filterable
- remote
- clearable
- reserve-keyword
- placeholder="璇烽�夋嫨鎴栨悳绱㈢敵璇蜂汉"
- style="width: 100%"
- :remote-method="remoteSearchApplicantForm"
- :loading="applicantFormSearchLoading"
- @change="onApplicantChange"
- >
- <el-option
- v-for="u in applicantFormOptions"
- :key="u.userId"
- :label="userSelectLabel(u)"
- :value="u.userId"
- />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="24">
- <el-col :span="12">
- <el-form-item label="璇峰亣绫诲瀷" prop="leaveType">
- <el-select v-model="form.leaveType" placeholder="璇烽�夋嫨璇峰亣绫诲瀷" clearable filterable style="width: 100%">
- <el-option v-for="opt in LEAVE_TYPE_OPTIONS" :key="opt.value" :label="opt.label" :value="opt.value" />
- </el-select>
- </el-form-item>
- </el-col>
<el-col :span="12">
<el-form-item label="鍋囨湡浣欓" prop="leaveBalanceDays">
<el-input-number
@@ -94,94 +77,26 @@
/>
</el-form-item>
</el-col>
- </el-row>
- <el-row :gutter="24">
- <el-col :span="12">
- <el-form-item label="璇峰亣寮�濮嬫椂闂�" prop="leaveStartTime">
- <el-date-picker
- v-model="form.leaveStartTime"
- type="datetime"
- placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- style="width: 100%"
- @change="onLeaveRangeChange"
- />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="璇峰亣缁撴潫鏃堕棿" prop="leaveEndTime">
- <el-date-picker
- v-model="form.leaveEndTime"
- type="datetime"
- placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- style="width: 100%"
- @change="onLeaveRangeChange"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="24">
<el-col :span="12">
<el-form-item label="璇峰亣鏃堕暱">
- <el-input :model-value="leaveDurationDisplay" readonly placeholder="鏍规嵁璧锋鏃堕棿鑷姩璁＄畻">
+ <el-input :model-value="leaveDurationDisplay" readonly placeholder="鏍规嵁妯℃澘涓鍋囨椂闂磋嚜鍔ㄨ绠�">
<template #append>澶�</template>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="12">
- <el-form-item label="瀹℃壒鏂瑰紡" prop="approvalMode">
- <el-radio-group v-model="form.approvalMode">
- <el-radio value="parallel">涓庣</el-radio>
- <el-radio value="or_sign">鎴栫</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
</el-row>
- <el-row :gutter="24">
- <el-col :span="24">
- <el-form-item label="瀹℃壒浜�" prop="approverIds">
- <el-tree-select
- v-model="form.approverIds"
- :data="approverTreeData"
- multiple
- collapse-tags
- collapse-tags-tooltip
- :max-collapse-tags="2"
- :render-after-expand="false"
- placeholder="璇烽�夋嫨瀹℃壒浜猴紙鍙閫夛級"
- style="width: 100%"
- :props="{ value: 'id', label: 'label', children: 'children', disabled: 'disabled' }"
- check-strictly
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="24">
- <el-col :span="24">
- <el-form-item label="璇峰亣浜嬬敱" prop="leaveReason">
- <el-input
- v-model="form.leaveReason"
- type="textarea"
- :rows="4"
- placeholder="璇峰～鍐欒鍋囦簨鐢�"
- maxlength="2000"
- show-word-limit
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row :gutter="24">
- <el-col :span="24">
- <el-form-item label="闄勪欢">
- <div class="upload-block">
- <FileUpload v-model:file-list="form.attachmentList" :limit="10" button-text="鐐瑰嚮閫夋嫨鏂囦欢" />
- </div>
- </el-form-item>
- </el-col>
- </el-row>
+ <ApprovalTemplateFormSection
+ :active-template="form.templateSnapshot"
+ :fields="form.formFieldDefs"
+ :form-payload="form.formPayload"
+ v-model:flow-nodes="form.flowNodes"
+ v-model:attachments="form.storageBlobDTOs"
+ :template-attachments="form.templateAttachments"
+ :user-options="flowUserOptions"
+ flow-attachments-only
+ hide-template-name
+ :allow-change-template="false"
+ />
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -190,6 +105,14 @@
</div>
</template>
</el-dialog>
+
+ <ApprovalTemplateBindDialog
+ v-model:visible="templateBindVisible"
+ :module-key="APPROVAL_MODULE_KEYS.LEAVE"
+ skip-form-confirm
+ @confirm="onTemplateBound"
+ @closed="onTemplateBindClosed"
+ />
<!-- 璇︽儏 -->
<el-dialog v-model="detailDialog.visible" title="璇峰亣鐢宠璇︽儏" width="720px" append-to-body>
@@ -207,8 +130,8 @@
<el-descriptions-item label="瀹℃壒浜�">{{ detailRow.approverNames || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="鍒涘缓鏃堕棿">{{ detailRow.createTime || "鈥�" }}</el-descriptions-item>
<el-descriptions-item label="闄勪欢">
- <template v-if="detailRow.attachmentList?.length">
- <el-tag v-for="(f, i) in detailRow.attachmentList" :key="i" class="mr6 mb6" type="info">
+ <template v-if="rowAttachmentList(detailRow).length">
+ <el-tag v-for="(f, i) in rowAttachmentList(detailRow)" :key="i" class="mr6 mb6" type="info">
{{ f.name }}
</el-tag>
</template>
@@ -224,7 +147,7 @@
<!-- 闄勪欢鍒楄〃 -->
<el-dialog v-model="filesDialog.visible" title="闄勪欢" width="520px" append-to-body>
- <el-table v-if="filesDialog.row?.attachmentList?.length" :data="filesDialog.row.attachmentList" border>
+ <el-table v-if="rowAttachmentList(filesDialog.row).length" :data="rowAttachmentList(filesDialog.row)" border>
<el-table-column type="index" label="搴忓彿" width="60" align="center" />
<el-table-column prop="name" label="鏂囦欢鍚�" min-width="200" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" width="100" align="center">
@@ -246,9 +169,20 @@
<script setup>
import { Search } from "@element-plus/icons-vue";
import dayjs from "dayjs";
-import FileUpload from "@/components/AttachmentUpload/file/index.vue";
-import { deptTreeSelect, userListNoPageByTenantId } from "@/api/system/user.js";
+import { userListNoPageByTenantId } from "@/api/system/user.js";
import { computed, getCurrentInstance, nextTick, onMounted, reactive, ref, watch } from "vue";
+import ApprovalTemplateBindDialog from "../../ApproveManage/approve-shared/components/ApprovalTemplateBindDialog.vue";
+import ApprovalTemplateFormSection from "../../ApproveManage/approve-shared/components/ApprovalTemplateFormSection.vue";
+import FormPayloadFields from "../../ApproveManage/approve-list/components/FormPayloadFields.vue";
+import { APPROVAL_MODULE_KEYS } from "../../ApproveManage/approve-shared/approvalModuleRegistry.js";
+import {
+ applyBindingToForm,
+ attachmentDisplayName,
+ buildFormPayloadRules,
+ validateTemplateBinding,
+} from "../../ApproveManage/approve-shared/approvalTemplateBindingUtils.js";
+import { useFlowUserOptions } from "../../ApproveManage/approve-shared/useFlowUserOptions.js";
+import { SELECT_OPTION_SOURCE } from "../../ApproveManage/approve-template/selectOptionSource.js";
/** 璇峰亣绫诲瀷锛坴alue 涓庡悗绔榻愬崰浣嶏級 */
const LEAVE_TYPE_OPTIONS = [
@@ -277,11 +211,17 @@
leaveBalanceDays: undefined,
leaveStartTime: "",
leaveEndTime: "",
+ leaveDurationDays: null,
leaveReason: "",
- approvalMode: "parallel",
- approverIds: [],
- approverNames: "",
- attachmentList: [],
+ hasTemplateBinding: false,
+ templateId: "",
+ templateName: "",
+ templateSnapshot: null,
+ formFieldDefs: [],
+ formPayload: {},
+ flowNodes: [],
+ templateAttachments: [],
+ storageBlobDTOs: [],
});
const { proxy } = getCurrentInstance();
@@ -293,193 +233,10 @@
return [];
}
-function filterDisabledDept(deptList) {
- if (!Array.isArray(deptList)) return [];
- return deptList.filter((dept) => {
- if (dept.disabled) return false;
- if (dept.children?.length) {
- dept.children = filterDisabledDept(dept.children);
- }
- return true;
- });
-}
-
-function getUserDeptId(u) {
- return u.deptId ?? u.sysDeptId ?? u.dept?.deptId ?? u.dept?.id ?? u.dept_id;
-}
-
-function getDeptNodeKey(node) {
- const k = node?.id ?? node?.value ?? node?.deptId;
- if (k == null || k === "") return null;
- return k;
-}
-
function isActiveUser(u) {
if (u.delFlag === "2" || u.delFlag === 2) return false;
if (u.status == null) return true;
return String(u.status) === "0";
-}
-
-function userToTreeLeaf(u) {
- return {
- id: String(u.userId ?? u.id),
- label: u.nickName || u.userName || `鐢ㄦ埛${u.userId ?? u.id}`,
- };
-}
-
-function buildUsersByDeptId(users) {
- const map = new Map();
- const unassigned = [];
- for (const u of users) {
- if (!isActiveUser(u)) continue;
- const did = getUserDeptId(u);
- if (did == null || did === "" || did === 0 || did === "0") {
- unassigned.push(u);
- continue;
- }
- const k = String(did);
- if (!map.has(k)) map.set(k, []);
- map.get(k).push(u);
- }
- return { map, unassigned };
-}
-
-function collectUserLabels(nodes, map) {
- (nodes || []).forEach((n) => {
- if (n.children?.length) {
- collectUserLabels(n.children, map);
- } else if (n.id != null && !String(n.id).startsWith("dept_")) {
- map[String(n.id)] = n.label;
- }
- });
-}
-
-function mergeDeptTreeWithUsers(nodes, usersByDept) {
- if (!Array.isArray(nodes)) return [];
- const out = [];
- for (const node of nodes) {
- const deptIdRaw = getDeptNodeKey(node);
- if (deptIdRaw == null) continue;
- const sub = mergeDeptTreeWithUsers(node.children || [], usersByDept);
- const usersHere = usersByDept.get(String(deptIdRaw)) || [];
- const userChildren = usersHere.map(userToTreeLeaf);
- const children = [...sub, ...userChildren];
- if (!children.length) continue;
- out.push({
- id: `dept_${deptIdRaw}`,
- label: node.label ?? node.deptName ?? "閮ㄩ棬",
- disabled: true,
- children,
- });
- }
- return out;
-}
-
-function buildFlatApproverTree(users) {
- const list = users.filter(isActiveUser).map(userToTreeLeaf);
- if (!list.length) return [];
- return [
- {
- id: "dept_all_users",
- label: "绯荤粺鐢ㄦ埛",
- disabled: true,
- children: list,
- },
- ];
-}
-
-const approverTreeData = ref([]);
-const approverLabelMap = ref({});
-
-async function loadApproverTree() {
- try {
- const [deptRes, userRes] = await Promise.all([deptTreeSelect(), userListNoPageByTenantId()]);
- let rawTree = unwrapArray(deptRes);
- rawTree = rawTree.length ? JSON.parse(JSON.stringify(rawTree)) : [];
- let deptTree = filterDisabledDept(JSON.parse(JSON.stringify(rawTree)));
- if (!deptTree.length && rawTree.length) {
- deptTree = JSON.parse(JSON.stringify(rawTree));
- }
- const users = unwrapArray(userRes);
- const { map: usersByDept, unassigned } = buildUsersByDeptId(users);
- let merged = mergeDeptTreeWithUsers(deptTree, usersByDept);
- if (unassigned.length) {
- merged.push({
- id: "dept_unassigned",
- label: "鏈垎閰嶉儴闂�",
- disabled: true,
- children: unassigned.map(userToTreeLeaf),
- });
- }
- if (!merged.length && users.length) {
- merged = buildFlatApproverTree(users);
- }
- approverTreeData.value = merged;
- const map = {};
- collectUserLabels(merged, map);
- approverLabelMap.value = map;
- } catch {
- approverTreeData.value = [];
- approverLabelMap.value = {};
- proxy?.$modal?.msgWarning?.("瀹℃壒浜烘暟鎹姞杞藉け璐ワ紝璇锋鏌ョ綉缁滄垨绋嶅悗閲嶈瘯");
- }
-}
-
-function resolveApproverNames(ids) {
- if (!ids?.length) return "";
- const map = approverLabelMap.value;
- return ids.map((id) => map[String(id)] || id).join("銆�");
-}
-
-function approvalModeLabel(mode) {
- if (mode === "or_sign") return "鎴栫";
- return "涓庣";
-}
-
-function approvalResultLabel(v) {
- if (v === "approved") return "宸查�氳繃";
- if (v === "rejected") return "宸查┏鍥�";
- if (v === "cancelled") return "宸叉挙閿�";
- return "寰呭鎵�";
-}
-
-/** 鎸夎捣姝㈡椂闂磋绠楄鍋囧ぉ鏁帮紙鍚椂鍒嗙锛岀粨鏋滀繚鐣欎袱浣嶅皬鏁帮級 */
-function computeLeaveDays(startStr, endStr) {
- if (!startStr || !endStr) return null;
- const t0 = dayjs(startStr);
- const t1 = dayjs(endStr);
- if (!t0.isValid() || !t1.isValid() || !t1.isAfter(t0)) return null;
- const days = t1.diff(t0, "millisecond") / (24 * 60 * 60 * 1000);
- return Math.round(days * 100) / 100;
-}
-
-function formatDuration(v) {
- if (v == null || v === "") return "鈥�";
- return `${v} 澶ー;
-}
-
-function formatBalance(v) {
- if (v == null || v === "") return "鈥�";
- return `${v} 澶ー;
-}
-
-/** 绯荤粺鐢ㄦ埛缂撳瓨 */
-const allUsersCache = ref([]);
-
-async function loadUserPool() {
- try {
- const res = await userListNoPageByTenantId();
- allUsersCache.value = unwrapArray(res);
- } catch {
- allUsersCache.value = [];
- }
-}
-
-function userSelectLabel(u) {
- const nick = u.nickName || "";
- const name = u.userName || "";
- if (nick && name && nick !== name) return `${nick}锛�${name}锛塦;
- return nick || name || `鐢ㄦ埛${u.userId ?? u.id ?? ""}`;
}
function userById(id) {
@@ -503,43 +260,113 @@
return undefined;
}
-function filterUsersByQuery(query) {
- const list = allUsersCache.value.filter((u) => isActiveUser(u));
- const q = (query || "").trim().toLowerCase();
- if (!q) return [...list];
- return list.filter((u) => {
- const nick = (u.nickName || "").toLowerCase();
- const uname = (u.userName || "").toLowerCase();
- const phone = (u.phonenumber || u.phone || "").toString();
- return nick.includes(q) || uname.includes(q) || phone.includes(q);
- });
+function isLeaveBalanceField(field) {
+ const label = String(field?.label || "");
+ return label.includes("鍋囨湡浣欓") || field?.key === "leaveBalanceDays";
}
-const applicantFormSearchLoading = ref(false);
-const applicantFormOptions = ref([]);
-
-async function remoteSearchApplicantForm(query) {
- applicantFormSearchLoading.value = true;
- try {
- if (!allUsersCache.value.length) {
- await loadUserPool();
- }
- applicantFormOptions.value = filterUsersByQuery(query);
- } finally {
- applicantFormSearchLoading.value = false;
- }
+function isLeaveDurationField(field) {
+ const label = String(field?.label || "");
+ return label.includes("璇峰亣鏃堕暱") || field?.key === "leaveDurationDays";
}
-function onApplicantChange(uid) {
+function findLeaveTimeTemplateField(fields = []) {
+ return (
+ fields.find((f) => f?.type === "datetimerange" && String(f?.label || "").includes("璇峰亣鏃堕棿")) ||
+ fields.find((f) => f?.type === "datetimerange" && f?.key === "dateRange") ||
+ fields.find((f) => f?.type === "datetimerange") ||
+ null
+ );
+}
+
+function findApplicantTemplateField(fields = []) {
+ return (
+ fields.find((f) => String(f?.label || "").includes("鐢宠浜�")) ||
+ fields.find((f) => f?.type === "select" && f?.optionSource === SELECT_OPTION_SOURCE.USER) ||
+ null
+ );
+}
+
+/** 浠庢ā鏉垮～鎶ラ」瑙ｆ瀽璇峰亣璧锋鏃堕棿 */
+function resolveLeaveTimeRange(payload, leaveTimeField) {
+ if (!leaveTimeField?.key) return { start: "", end: "" };
+ const val = payload?.[leaveTimeField.key];
+ if (!Array.isArray(val) || val.length < 2) return { start: "", end: "" };
+ return { start: val[0] || "", end: val[1] || "" };
+}
+
+/** 鎸夎捣姝㈡椂闂磋绠楄鍋囧ぉ鏁帮紙鍚椂鍒嗙锛岀粨鏋滀繚鐣欎袱浣嶅皬鏁帮級 */
+function computeLeaveDays(startStr, endStr) {
+ if (!startStr || !endStr) return null;
+ const t0 = dayjs(startStr);
+ const t1 = dayjs(endStr);
+ if (!t0.isValid() || !t1.isValid() || !t1.isAfter(t0)) return null;
+ const days = t1.diff(t0, "millisecond") / (24 * 60 * 60 * 1000);
+ return Math.round(days * 100) / 100;
+}
+
+function formatDuration(v) {
+ if (v == null || v === "") return "鈥�";
+ return `${v} 澶ー;
+}
+
+function formatBalance(v) {
+ if (v == null || v === "") return "鈥�";
+ return `${v} 澶ー;
+}
+
+function mapStorageBlobsToAttachmentList(blobs) {
+ return (blobs || []).map((f) => ({
+ name: attachmentDisplayName(f),
+ url: f.url || f.downloadURL || f.previewURL || f.previewUrl,
+ }));
+}
+
+function rowAttachmentList(row) {
+ if (!row) return [];
+ if (row.attachmentList?.length) return row.attachmentList;
+ return mapStorageBlobsToAttachmentList(row.storageBlobDTOs);
+}
+
+function approvalModeLabel(mode) {
+ if (mode === "countersign") return "浼氱";
+ if (mode === "or_sign") return "鎴栫";
+ return "涓庣";
+}
+
+function approvalResultLabel(v) {
+ if (v === "approved") return "宸查�氳繃";
+ if (v === "rejected") return "宸查┏鍥�";
+ if (v === "cancelled") return "宸叉挙閿�";
+ return "寰呭鎵�";
+}
+
+function syncApplicantFromUser(uid) {
const u = userById(uid);
if (u) {
+ form.applicantId = uid != null && uid !== "" ? uid : "";
form.applicantName = u.nickName || u.userName || "";
form.applicantNo = applicantNoFromUser(u);
form.leaveBalanceDays = mockLeaveBalance(u);
} else {
+ form.applicantId = "";
form.applicantName = "";
form.applicantNo = "";
- form.leaveBalanceDays = undefined;
+ if (uid == null || uid === "") {
+ form.leaveBalanceDays = undefined;
+ }
+ }
+}
+
+/** 绯荤粺鐢ㄦ埛缂撳瓨 */
+const allUsersCache = ref([]);
+
+async function loadUserPool() {
+ try {
+ const res = await userListNoPageByTenantId();
+ allUsersCache.value = unwrapArray(res);
+ } catch {
+ allUsersCache.value = [];
}
}
@@ -654,21 +481,25 @@
});
const formRef = ref();
const form = reactive(createEmptyForm());
+const templateBindVisible = ref(false);
+const pendingTemplateBinding = ref(null);
+const { flowUserOptions, loadFlowUsers } = useFlowUserOptions();
+
+const leaveTimeTemplateField = computed(() => findLeaveTimeTemplateField(form.formFieldDefs));
+const applicantTemplateField = computed(() => findApplicantTemplateField(form.formFieldDefs));
+
+const templateDisplayFields = computed(() =>
+ (form.formFieldDefs || []).filter((f) => !isLeaveBalanceField(f) && !isLeaveDurationField(f))
+);
const leaveDurationDisplay = computed(() => {
- const d = computeLeaveDays(form.leaveStartTime, form.leaveEndTime);
+ const { start, end } = resolveLeaveTimeRange(form.formPayload, leaveTimeTemplateField.value);
+ const d = computeLeaveDays(start, end);
return d == null ? "" : String(d);
});
-function onLeaveRangeChange() {
- nextTick(() => {
- formRef.value?.validateField?.("leaveEndTime");
- });
-}
-
-const formRules = {
- applicantId: [{ required: true, message: "璇烽�夋嫨鐢宠浜�", trigger: "change" }],
- leaveType: [{ required: true, message: "璇烽�夋嫨璇峰亣绫诲瀷", trigger: "change" }],
+const formRules = computed(() => ({
+ ...buildFormPayloadRules(templateDisplayFields.value),
leaveBalanceDays: [
{
required: true,
@@ -676,36 +507,35 @@
trigger: "blur",
},
],
- leaveStartTime: [{ required: true, message: "璇烽�夋嫨璇峰亣寮�濮嬫椂闂�", trigger: "change" }],
- leaveEndTime: [
- { required: true, message: "璇烽�夋嫨璇峰亣缁撴潫鏃堕棿", trigger: "change" },
- {
- validator: (_rule, val, callback) => {
- if (!form.leaveStartTime || !val) {
- callback();
- return;
- }
- const d = computeLeaveDays(form.leaveStartTime, val);
- if (d == null) {
- callback(new Error("缁撴潫鏃堕棿椤绘櫄浜庡紑濮嬫椂闂�"));
- } else {
- callback();
- }
- },
- trigger: "change",
- },
- ],
- leaveReason: [{ required: true, message: "璇峰～鍐欒鍋囦簨鐢�", trigger: "blur" }],
- approvalMode: [{ required: true, message: "璇烽�夋嫨瀹℃壒鏂瑰紡", trigger: "change" }],
- approverIds: [
- {
- type: "array",
- required: true,
- message: "璇烽�夋嫨瀹℃壒浜�",
- trigger: "change",
- },
- ],
-};
+}));
+
+watch(
+ () => {
+ const key = applicantTemplateField.value?.key;
+ return key ? form.formPayload[key] : undefined;
+ },
+ async (uid) => {
+ if (!applicantTemplateField.value) return;
+ if (!allUsersCache.value.length) {
+ await loadUserPool();
+ }
+ syncApplicantFromUser(uid);
+ }
+);
+
+watch(
+ () => {
+ const key = leaveTimeTemplateField.value?.key;
+ return key ? form.formPayload[key] : undefined;
+ },
+ () => {
+ const { start, end } = resolveLeaveTimeRange(form.formPayload, leaveTimeTemplateField.value);
+ form.leaveStartTime = start;
+ form.leaveEndTime = end;
+ form.leaveDurationDays = computeLeaveDays(start, end);
+ },
+ { deep: true }
+);
const detailDialog = reactive({ visible: false });
const detailRow = ref({});
@@ -750,13 +580,55 @@
proxy?.$modal?.msgWarning?.("鏆傛棤涓嬭浇鍦板潃");
}
-async function openFormDialog(mode, row) {
- formDialog.mode = mode;
- formDialog.title = mode === "add" ? "鏂板璇峰亣鐢宠" : "缂栬緫璇峰亣鐢宠";
- await loadApproverTree();
- if (!allUsersCache.value.length) {
- await loadUserPool();
+function openAddWithTemplate() {
+ formDialog.visible = false;
+ pendingTemplateBinding.value = null;
+ templateBindVisible.value = true;
+}
+
+function onTemplateBound(binding) {
+ pendingTemplateBinding.value = binding;
+}
+
+async function onTemplateBindClosed() {
+ const binding = pendingTemplateBinding.value;
+ if (!binding) return;
+ pendingTemplateBinding.value = null;
+ await openFormWithBinding(binding);
+}
+
+async function openFormWithBinding(binding) {
+ Object.assign(form, createEmptyForm());
+ applyBindingToForm(form, binding);
+ form.hasTemplateBinding = true;
+ formDialog.mode = "add";
+ formDialog.title = "鏂板璇峰亣鐢宠";
+ await Promise.all([loadUserPool(), loadFlowUsers()]);
+ const applicantKey = applicantTemplateField.value?.key;
+ if (applicantKey && form.formPayload[applicantKey]) {
+ syncApplicantFromUser(form.formPayload[applicantKey]);
}
+ const { start, end } = resolveLeaveTimeRange(form.formPayload, leaveTimeTemplateField.value);
+ form.leaveStartTime = start;
+ form.leaveEndTime = end;
+ form.leaveDurationDays = computeLeaveDays(start, end);
+ formDialog.visible = true;
+ nextTick(() => formRef.value?.clearValidate?.());
+}
+
+function reopenTemplateBind() {
+ formDialog.visible = false;
+ pendingTemplateBinding.value = null;
+ templateBindVisible.value = true;
+}
+
+async function openFormDialog(mode, row) {
+ if (mode === "edit" && row && !row.hasTemplateBinding) {
+ proxy?.$modal?.msgWarning?.("璇ヨ褰曚负鏃х増鏁版嵁锛岃閲嶆柊閫氳繃妯℃澘鍙戣捣鐢宠");
+ return;
+ }
+ formDialog.mode = mode;
+ formDialog.title = "缂栬緫璇峰亣鐢宠";
Object.assign(form, createEmptyForm());
if (mode === "edit" && row) {
Object.assign(form, {
@@ -768,26 +640,24 @@
leaveBalanceDays: row.leaveBalanceDays,
leaveStartTime: row.leaveStartTime,
leaveEndTime: row.leaveEndTime,
+ leaveDurationDays: row.leaveDurationDays,
leaveReason: row.leaveReason,
- approvalMode: row.approvalMode === "countersign" ? "or_sign" : row.approvalMode || "parallel",
- approverIds: (row.approverIds || []).map((id) => String(id)),
- approverNames: row.approverNames,
- attachmentList: JSON.parse(JSON.stringify(row.attachmentList || [])),
+ hasTemplateBinding: true,
+ templateId: row.templateId,
+ templateName: row.templateName,
+ templateSnapshot: row.templateSnapshot,
+ formFieldDefs: row.formFieldDefs || [],
+ formPayload: JSON.parse(JSON.stringify(row.formPayload || {})),
+ flowNodes: JSON.parse(JSON.stringify(row.flowNodes || [])),
+ templateAttachments: JSON.parse(JSON.stringify(row.templateAttachments || [])),
+ storageBlobDTOs: JSON.parse(JSON.stringify(row.storageBlobDTOs || [])),
});
- const u = userById(row.applicantId);
- if (u) {
- applicantFormOptions.value = [u];
- } else if (row.applicantId) {
- applicantFormOptions.value = [
- {
- userId: row.applicantId,
- nickName: row.applicantName,
- userName: row.applicantNo,
- },
- ];
+ await loadUserPool();
+ const applicantKey = applicantTemplateField.value?.key;
+ if (applicantKey) {
+ syncApplicantFromUser(form.formPayload[applicantKey]);
}
- } else {
- remoteSearchApplicantForm("");
+ loadFlowUsers();
}
formDialog.visible = true;
nextTick(() => formRef.value?.clearValidate?.());
@@ -797,18 +667,65 @@
formRef.value?.resetFields?.();
}
+/** 浠庢ā鏉垮～鎶ラ」鍚屾鍒楄〃灞曠ず瀛楁 */
+function syncLeaveFieldsFromPayload() {
+ const defs = form.formFieldDefs || [];
+ const payload = form.formPayload || {};
+ const leaveTimeField = findLeaveTimeTemplateField(defs);
+
+ for (const f of defs) {
+ const label = String(f.label || "");
+ const val = payload[f.key];
+
+ if (label.includes("鐢宠浜�") && !label.includes("鏃ユ湡") && !label.includes("鏃堕棿")) {
+ if (val != null && val !== "") {
+ form.applicantId = val;
+ const u = userById(val);
+ if (u) {
+ form.applicantName = u.nickName || u.userName || "";
+ form.applicantNo = applicantNoFromUser(u);
+ }
+ }
+ }
+ if ((label.includes("璇峰亣绫诲瀷") || f.key === "leaveType") && f.type === "select") {
+ form.leaveType = val != null && val !== "" ? val : "";
+ }
+ if (label.includes("浜嬬敱") || f.key === "summary" || label.includes("璇峰亣浜嬬敱")) {
+ form.leaveReason = val != null ? String(val) : "";
+ }
+ }
+
+ const { start, end } = resolveLeaveTimeRange(payload, leaveTimeField);
+ form.leaveStartTime = start;
+ form.leaveEndTime = end;
+ form.leaveDurationDays = computeLeaveDays(start, end);
+}
+
async function submitForm() {
try {
await formRef.value?.validate?.();
} catch {
return;
}
- const days = computeLeaveDays(form.leaveStartTime, form.leaveEndTime);
- if (days == null) {
- proxy?.$modal?.msgWarning?.("璇锋鏌ヨ鍋囪捣姝㈡椂闂达紝缁撴潫鏃堕棿椤绘櫄浜庡紑濮嬫椂闂�");
+ const flowCheck = validateTemplateBinding({ flowNodes: form.flowNodes });
+ if (!flowCheck.ok) {
+ proxy?.$modal?.msgWarning?.(flowCheck.message || "璇峰畬鍠勫鎵规祦绋�");
return;
}
- form.approverNames = resolveApproverNames(form.approverIds);
+ form.flowNodes = flowCheck.nodes;
+
+ const applicantKey = applicantTemplateField.value?.key;
+ if (applicantKey) {
+ syncApplicantFromUser(form.formPayload[applicantKey]);
+ }
+ syncLeaveFieldsFromPayload();
+
+ if (form.leaveDurationDays == null) {
+ proxy?.$modal?.msgWarning?.("璇锋鏌ユā鏉夸腑鐨勮鍋囨椂闂达紝缁撴潫鏃堕棿椤绘櫄浜庡紑濮嬫椂闂�");
+ return;
+ }
+
+ const attachmentList = mapStorageBlobsToAttachmentList(form.storageBlobDTOs);
const payload = {
applicantId: form.applicantId,
applicantNo: form.applicantNo,
@@ -817,12 +734,18 @@
leaveBalanceDays: form.leaveBalanceDays,
leaveStartTime: form.leaveStartTime,
leaveEndTime: form.leaveEndTime,
- leaveDurationDays: days,
+ leaveDurationDays: form.leaveDurationDays,
leaveReason: form.leaveReason,
- approvalMode: form.approvalMode,
- approverIds: [...form.approverIds],
- approverNames: form.approverNames,
- attachmentList: JSON.parse(JSON.stringify(form.attachmentList || [])),
+ hasTemplateBinding: true,
+ templateId: form.templateId,
+ templateName: form.templateName,
+ templateSnapshot: form.templateSnapshot,
+ formFieldDefs: form.formFieldDefs,
+ formPayload: JSON.parse(JSON.stringify(form.formPayload || {})),
+ flowNodes: JSON.parse(JSON.stringify(form.flowNodes || [])),
+ templateAttachments: JSON.parse(JSON.stringify(form.templateAttachments || [])),
+ storageBlobDTOs: JSON.parse(JSON.stringify(form.storageBlobDTOs || [])),
+ attachmentList,
};
if (formDialog.mode === "add") {
const id = `local_${Date.now()}`;
@@ -852,7 +775,7 @@
}
onMounted(() => {
- loadApproverTree();
+ loadFlowUsers();
});
</script>
@@ -871,9 +794,6 @@
font-size: 14px;
color: var(--el-text-color-regular);
}
-.upload-block {
- width: 100%;
-}
.mr6 {
margin-right: 6px;
}
@@ -886,6 +806,13 @@
.leave-apply-form :deep(.el-form-item) {
margin-bottom: 18px;
}
+.template-name {
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+}
+.ml12 {
+ margin-left: 12px;
+}
.leave-apply-form-dialog :deep(.el-dialog__body) {
padding-top: 12px;
}
--
Gitblit v1.9.3