From f8f9a3bda066d2d757b658dd346c781267687c84 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 13 二月 2026 16:51:20 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management into dev_New
---
src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue b/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue
index 39eacda..11e21bc 100644
--- a/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue
+++ b/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue
@@ -18,7 +18,7 @@
placeholder="璇烽�夋嫨閮ㄩ棬"
check-strictly
style="width: 100%"
- :disabled="operationType === 'view'" />
+ :disabled="['edit', 'view'].includes(operationType)" />
</el-form-item>
<!-- 鍦扮偣淇℃伅 -->
<!-- <el-form-item label="鍦扮偣鍚嶇О"
@@ -43,13 +43,13 @@
<div class="map-container">
<div class="map-header"
style="margin-bottom: 10px">
- <el-button @click="getCurrentLocation">
+ <!-- <el-button @click="getCurrentLocation">
<el-icon>
<Position />
</el-icon>
褰撳墠浣嶇疆
- </el-button>
- <span style="margin-left: 10px; color: #909399;font-size: 12px;">鐐瑰嚮鍦板浘閫夋嫨浣嶇疆</span>
+ </el-button> -->
+ <!-- <span style="margin-left: 10px; color: #909399;font-size: 12px;">鐐瑰嚮鍦板浘閫夋嫨浣嶇疆</span> -->
</div>
<div id="map-container"
class="map"
@@ -89,6 +89,9 @@
<el-time-picker v-model="form.endAt"
format="HH:mm"
value-format="HH:mm"
+ :picker-options="{
+ minTime: form.startAt
+ }"
placeholder="璇烽�夋嫨涓嬬彮鏃堕棿"
:disabled="operationType === 'view'" />
</el-form-item>
@@ -127,6 +130,7 @@
default: () => ({}),
},
});
+ // const pickerOptions = ref({ minTime: form.value.startAt });
const emit = defineEmits(["update:modelValue", "close"]);
@@ -164,7 +168,28 @@
latitude: [{ required: true, message: "璇烽�夋嫨鎵撳崱浣嶇疆", trigger: "blur" }],
radius: [{ required: true, message: "璇疯緭鍏ユ墦鍗¤寖鍥�", trigger: "blur" }],
startAt: [{ required: true, message: "璇烽�夋嫨涓婄彮鏃堕棿", trigger: "change" }],
- endAt: [{ required: true, message: "璇烽�夋嫨涓嬬彮鏃堕棿", trigger: "change" }],
+ endAt: [
+ { required: true, message: "璇烽�夋嫨涓嬬彮鏃堕棿", trigger: "change" },
+ {
+ validator: (rule, value, callback) => {
+ if (form.startAt && value) {
+ const startParts = form.startAt.split(":");
+ const endParts = value.split(":");
+ const startTime =
+ parseInt(startParts[0]) * 60 + parseInt(startParts[1]);
+ const endTime = parseInt(endParts[0]) * 60 + parseInt(endParts[1]);
+ if (endTime <= startTime) {
+ callback(new Error("涓嬬彮鏃堕棿涓嶈兘鏃╀簬涓婄彮鏃堕棿"));
+ } else {
+ callback();
+ }
+ } else {
+ callback();
+ }
+ },
+ trigger: "change",
+ },
+ ],
};
// 閮ㄩ棬閫夐」
@@ -355,6 +380,16 @@
}
);
+ // 鐩戝惉涓婄彮鏃堕棿鍙樺寲锛岃Е鍙戜笅鐝椂闂存牎楠�
+ watch(
+ () => form.startAt,
+ () => {
+ if (formRef.value && form.endAt) {
+ formRef.value.validateField("endAt");
+ }
+ }
+ );
+
// 鐩戝惉寮圭獥鏄剧ず
watch(
() => dialogVisible.value,
--
Gitblit v1.9.3