From 045fbc240ced1e1bc005b734098e59779b67bb1c Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期一, 29 九月 2025 10:42:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master
---
ui/admin-ui3/src/views/cwgl/returnLog/index.vue | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
index a29dc93..938a30e 100644
--- a/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
+++ b/ui/admin-ui3/src/views/cwgl/returnLog/index.vue
@@ -92,10 +92,21 @@
reqTime: {
label: '瀛樺叆鏃堕棿',
minWidth: 150,
- search: true,
type: 'datetime', // 鏀逛负 datetime 绫诲瀷
format: 'YYYY-MM-DD HH:mm:ss',
valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ },
+ reqTimeArray: {
+ label: '瀛樺叆鏃堕棿',
+ search: true,
+ searchRange: true,
+ type: 'daterange',
+ startPlaceholder: '寮�濮嬫棩鏈�',
+ endPlaceholder: '缁撴潫鏃ユ湡',
+ valueFormat: 'YYYY-MM-DD',
+ hide: true,
+ addDisplay: false,
+ editDisplay: false,
},
// reqTime: {
// label: '璇锋眰鏃堕棿',
@@ -135,9 +146,11 @@
selectionList.value = selection;
},
getBeginListFunc: (params = {}) => {
- params.type = 1;
- return params
-
+ let newParams = { ...params };
+ newParams.type = 1;
+ newParams = proxy.addDateRangeNew(newParams, newParams?.reqTimeArray, 'reqTime') || [];
+ delete newParams.reqTimeArray;
+ return newParams
}
})
--
Gitblit v1.8.0