From 0b5311c23e88abe2d3199efe32fcc63d6e9d9b15 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 29 六月 2026 13:56:50 +0800
Subject: [PATCH] fix(account):新增一次收款单后，再次新增剩余金额查询不到对应单据问题修复；
---
src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue b/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue
index 49eafa9..cbbb8af 100644
--- a/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue
+++ b/src/views/personnelManagement/attendanceCheckin/checkinRules/components/form.vue
@@ -28,6 +28,18 @@
:disabled="operationType === 'view'" />
</el-form-item> -->
<!-- 鎵撳崱鑼冨洿 -->
+ <el-form-item label="鐝"
+ prop="shift">
+ <el-select v-model="form.shift"
+ placeholder="璇烽�夋嫨鐝"
+ :disabled="operationType === 'view'"
+ style="width: 100%">
+ <el-option v-for="item in shifts_list"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value" />
+ </el-select>
+ </el-form-item>
<el-form-item label="鎵撳崱鑼冨洿(m)"
prop="radius">
<el-input-number v-model="form.radius"
@@ -98,12 +110,8 @@
</el-form>
<template #footer>
<span class="dialog-footer">
+ <el-button type="primary" @click="submitForm" v-if="operationType !== 'view'">纭畾</el-button>
<el-button @click="dialogVisible = false">鍙栨秷</el-button>
- <el-button type="primary"
- @click="submitForm"
- v-if="operationType !== 'view'">
- 纭畾
- </el-button>
</span>
</template>
</el-dialog>
@@ -115,6 +123,7 @@
import { Position } from "@element-plus/icons-vue";
import { deptTreeSelect } from "@/api/system/user.js";
import { addAttendanceRule } from "@/api/personnelManagement/attendanceRules.js";
+ import { useDict } from "@/utils/dict";
const props = defineProps({
modelValue: {
@@ -145,6 +154,9 @@
return "鏌ョ湅鐝";
});
+ // 鑾峰彇鐝瀛楀吀鍊�
+ const { shifts_list } = useDict("shifts_list");
+
// 琛ㄥ崟鏁版嵁
const formRef = ref();
const form = reactive({
@@ -156,6 +168,7 @@
radius: 100,
startAt: "09:00",
endAt: "18:00",
+ shift: "",
});
// 琛ㄥ崟楠岃瘉瑙勫垯
@@ -166,12 +179,18 @@
],
longitude: [{ required: true, message: "璇烽�夋嫨鎵撳崱浣嶇疆", trigger: "blur" }],
latitude: [{ required: true, message: "璇烽�夋嫨鎵撳崱浣嶇疆", trigger: "blur" }],
+ shift: [{ required: true, message: "璇烽�夋嫨鐝", trigger: "change" }],
radius: [{ required: true, message: "璇疯緭鍏ユ墦鍗¤寖鍥�", trigger: "blur" }],
startAt: [{ required: true, message: "璇烽�夋嫨涓婄彮鏃堕棿", trigger: "change" }],
endAt: [
{ required: true, message: "璇烽�夋嫨涓嬬彮鏃堕棿", trigger: "change" },
{
validator: (rule, value, callback) => {
+ // 濡傛灉鏄鐝紝涓嶉檺鍒舵椂闂撮『搴�
+ if (form.shift && ['澶滅彮', '澶�'].includes(form.shift)) {
+ callback();
+ return;
+ }
if (form.startAt && value) {
const startParts = form.startAt.split(":");
const endParts = value.split(":");
@@ -405,6 +424,7 @@
radius: 100,
startAt: "09:00",
endAt: "18:00",
+ shift: "",
});
// 濡傛灉鏄紪杈戞垨鏌ョ湅锛屽～鍏呮暟鎹�
--
Gitblit v1.9.3