From 46f59e30133c25f1f01074b1c92445f9e85b8c98 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 十二月 2019 15:58:37 +0800
Subject: [PATCH] 2019-12-31
---
src/utils/utils.js | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index b0fd07f..2503f10 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -290,6 +290,10 @@
newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
+ } else if (item.type === 'text') {
+ item.key.split(',').forEach(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
+ newsearches[field] = item.value
+ })
} else {
newsearches[item.key] = item.value
}
@@ -309,13 +313,18 @@
let searchText = ''
searches.forEach(item => {
if (!item.value) return
- // eslint-disable-next-line
- searchText += (searchText !== '' ? ' ' + 'AND' + ' ' : '')
- if (item.type === 'text' || item.type === 'select') {
- // eslint-disable-next-line
+ searchText += (searchText !== '' ? ' AND ' : '')
+ if (item.type === 'text') {
let str = item.match === '=' ? '' : '%'
- // eslint-disable-next-line
- searchText += item.key + ' ' + item.match + ' ' + '\'' + str + item.value + str + '\''
+ let fields = item.key.split(',').map(field => { // 缁煎悎鎼滅储锛屾墍瀛楁鎷兼帴
+ return field + ' ' + item.match + ' \'' + str + item.value + str + '\''
+ })
+
+ searchText += '(' + fields.join(' OR ') + ')'
+ } else if (item.type === 'select') {
+ let str = item.match === '=' ? '' : '%'
+
+ searchText += item.key + ' ' + item.match + ' \'' + str + item.value + str + '\''
} else if (item.type === 'date') {
let _val = item.value
let timetail = ' 00:00:00.000'
@@ -328,29 +337,24 @@
timetail = ''
}
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + _match + ' ' + '\'' + _val + timetail + '\')'
+ searchText += '(' + item.key + ' ' + _match + ' \'' + _val + timetail + '\')'
} else if (item.type === 'datemonth') { // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫锛岀粨鏉熸椂闂翠负鏈堟湯鍔犱竴澶╃殑0鐐癸紝鏂瑰紡涓�<
let _startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
let _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- // eslint-disable-next-line
searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'dateweek') { // 鍛�-杩囨护鏉′欢
let _startval = item.value[0] + ' 00:00:00.000'
let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- // eslint-disable-next-line
searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'daterange') {
let _startval = item.value[0] + ' 00:00:00.000'
let _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
- // eslint-disable-next-line
searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else {
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + '\')'
+ searchText += '(' + item.key + ' ' + item.match + ' \'' + item.value + '\')'
}
})
return searchText
@@ -366,24 +370,18 @@
let searchText = ''
searches.forEach(item => {
if (!item.value) return
- // eslint-disable-next-line
- searchText += (searchText !== '' ? ' ' + 'AND' + ' ' : '')
+ searchText += (searchText !== '' ? ' AND ' : '')
if (item.type === 'text') {
let options = item.key.split(',').map(op => {
// equal鏃朵笉娣诲姞%
- // eslint-disable-next-line
let str = item.op === 'equal' ? '' : '%'
- // eslint-disable-next-line
- return op + ' ' + item.op + ' ' + '"' + str + item.value + str + '"'
+ return op + ' ' + item.op + ' \'' + str + item.value + str + '\''
})
- // eslint-disable-next-line
- searchText += '(' + options.join(' ' + 'OR' + ' ') + ')'
+ searchText += '(' + options.join(' OR ') + ')'
} else if (item.type === 'date') {
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.op + ' ' + '"' + item.value + '")'
+ searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
} else {
- // eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.op + ' ' + '"' + item.value + '")'
+ searchText += '(' + item.key + ' ' + item.op + ' \'' + item.value + '\')'
}
})
return searchText
--
Gitblit v1.8.0