From 9578ae952527cdafc64d642f5183aa60ef92b7f2 Mon Sep 17 00:00:00 2001
From: sen <sen@qq.com>
Date: 星期三, 10 九月 2025 11:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue b/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
index 3801c99..499e233 100644
--- a/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/smartLockerApplication/index.vue
@@ -171,8 +171,21 @@
}
],
},
-
-
+ deadlineTime: {
+ label: '棰嗗彇鎴鏃堕棿',
+ minWidth: 180,
+ type: 'datetime', // 鏀逛负 datetime 绫诲瀷
+ format: 'YYYY-MM-DD HH:mm:ss',
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ addDisplay: true, // 鏂板鏃朵笉鏄剧ず
+ minWidth: 200,
+ rules: [
+ {
+ required: true,
+ message: "棰嗗彇鎴鏃堕棿涓嶈兘涓虹┖", trigger: "change"
+ }
+ ],
+ },
cancelTime: {
label: '浣滃簾鏃堕棿',
minWidth: 180,
@@ -257,6 +270,9 @@
handleBeforeOpenFunc: (done: Function, type: string) => {
if (done == 'add') {
option.value.column.lockerNo.value = '鎺ラ┏绔欐櫤鑳介挜鍖欐煖'
+ option.value.column.deadlineTime.value =formatDateTime(new Date(Date.now() + 24 * 60 * 60 * 1000));
+
+
}
},
handleSelectionChangeFunc: (selection: any) => {
@@ -264,10 +280,18 @@
}
})
+ const formatDateTime = (date) => {
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ const day = String(date.getDate()).padStart(2, '0');
+ const hours = String(date.getHours()).padStart(2, '0');
+ const minutes = String(date.getMinutes()).padStart(2, '0');
+ const seconds = String(date.getSeconds()).padStart(2, '0');
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+};
// 鍦� script setup 閮ㄥ垎瀹氫箟闃叉姈鑺傛祦鍑芥暟
let debounceTimer: NodeJS.Timeout | null = null;
let throttleTimer: NodeJS.Timeout | null = null;
-
// 闃叉姈鍑芥暟
const debounce = (func: Function, delay: number) => {
return function (...args: any[]) {
--
Gitblit v1.8.0