From be8f81fe2eb52e841efead8586e514842471e0ba Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 九月 2023 16:50:35 +0800
Subject: [PATCH] 2023-09-14
---
src/utils/utils.js | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 3f2c69a..7839cb6 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -546,8 +546,16 @@
}
}
- newsearches[item.key] = _startval
- newsearches[item.key + '1'] = _endval
+ let _skey = item.key
+ let _ekey = item.key + '1'
+
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
+ }
+
+ newsearches[_skey] = _startval
+ newsearches[_ekey] = _endval
} else if (item.type === 'text' || item.type === 'select') {
item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
newsearches[field] = item.value
@@ -638,7 +646,15 @@
_endval = val[1] + '.000'
}
- searchText.push('(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')')
+ let _skey = item.key
+ let _ekey = item.key
+
+ if (/,/.test(item.key)) {
+ _skey = item.key.split(',')[0]
+ _ekey = item.key.split(',')[1]
+ }
+
+ searchText.push('(' + _skey + ' >= \'' + _startval + '\' AND ' + _ekey + ' < \'' + _endval + '\')')
} else if (item.type === 'range') {
let val = item.value.split(',')
--
Gitblit v1.8.0