From badeb38c57b3f5f3c7d6ea016af5eea401ae1e2c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 十一月 2023 22:29:07 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/datasource/verifycard/customscript/index.jsx | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/menu/datasource/verifycard/customscript/index.jsx b/src/menu/datasource/verifycard/customscript/index.jsx
index e1f4766..a9c6aef 100644
--- a/src/menu/datasource/verifycard/customscript/index.jsx
+++ b/src/menu/datasource/verifycard/customscript/index.jsx
@@ -45,9 +45,16 @@
getSearchField = (searches) => {
let _usefulFields = []
searches.forEach(item => {
- if (['dateweek', 'datemonth'].includes(item.type)) {
+ if (item.type === 'dateweek') {
_usefulFields.push(item.key)
_usefulFields.push(item.key + '1')
+ } else if (item.type === 'datemonth') {
+ if (item.match === '=') {
+ _usefulFields.push(item.key)
+ } else {
+ _usefulFields.push(item.key)
+ _usefulFields.push(item.key + '1')
+ }
} else if (item.type === 'daterange') {
let _skey = item.key
let _ekey = item.key + '1'
--
Gitblit v1.8.0