From d38dc481492878c04ddf2d6bc2e9bf7d44c57fd7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 23 十二月 2019 18:29:38 +0800
Subject: [PATCH] 2019-12-23
---
src/utils/utils.js | 80 +++++++++++++++++++++++++++-------------
1 files changed, 54 insertions(+), 26 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8b0a88f..e5648a1 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -213,8 +213,16 @@
item.value = item.value ? [moment().subtract(item.value * 7, 'days').startOf('week').format('YYYY-MM-DD'),
moment().subtract(item.value * 7, 'days').endOf('week').format('YYYY-MM-DD')] : ''
} else if (item.type === 'daterange') {
- item.value = item.value ? [moment().subtract(item.value, 'days').format('YYYY-MM-DD'),
- moment().subtract(item.value === 1 ? 1 : 0, 'days').format('YYYY-MM-DD')] : ''
+ let _val = item.value
+ if (_val) {
+ try {
+ _val = JSON.parse(_val)
+ } catch {
+ _val = ''
+ }
+ }
+ item.value = _val ? [moment().subtract(_val[0], 'days').format('YYYY-MM-DD'),
+ moment().subtract(_val[1], 'days').format('YYYY-MM-DD')] : ''
}
newsearches.push(item)
})
@@ -234,17 +242,21 @@
searches.forEach(item => {
if (item.type === 'date') {
let timetail = ''
+ let _val = item.value
if (item.match === '<' || item.match === '<=') {
- timetail = ' 23:59:59.999'
+ timetail = ' 00:00:00.000'
+ if (_val) {
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
} else if (item.match === '>' || item.match === '>=') {
timetail = ' 00:00:00.000'
}
if (newsearches[item.key]) {
- newsearches[item.key + '1'] = item.value ? item.value + timetail : null
+ newsearches[item.key + '1'] = _val ? _val + timetail : null
} else {
- newsearches[item.key] = item.value ? item.value + timetail : null
+ newsearches[item.key] = _val ? _val + timetail : null
}
} else if (item.type === 'datemonth') {
// 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
@@ -253,19 +265,27 @@
if (item.value) {
_startval = moment(item.value, 'YYYY-MM').startOf('month').format('YYYY-MM-DD') + ' 00:00:00.000'
- _endval = moment(item.value, 'YYYY-MM').endOf('month').format('YYYY-MM-DD') + ' 23:59:59.999'
+ _endval = moment(item.value, 'YYYY-MM').endOf('month').add(1, 'days').format('YYYY-MM-DD') + ' 00:00:00.000'
}
newsearches[item.key] = _startval
newsearches[item.key + '1'] = _endval
} else if (item.type === 'dateweek') {
+ let _endval = ''
+ if (item.value) {
+ _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
- newsearches[item.key + '1'] = item.value ? item.value[1] + ' 23:59:59.999' : null
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
} else if (item.type === 'daterange') {
+ let _endval = ''
+ if (item.value) {
+ _endval = moment(item.value[1], 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
+ }
newsearches[item.key] = item.value ? item.value[0] + ' 00:00:00.000' : null
- newsearches[item.key + '1'] = item.value ? item.value[1] + ' 23:59:59.999' : null
+ newsearches[item.key + '1'] = item.value ? _endval + ' 00:00:00.000' : null
} else {
newsearches[item.key] = item.value
}
@@ -293,30 +313,37 @@
// eslint-disable-next-line
searchText += item.key + ' ' + item.match + ' ' + '\'' + str + item.value + str + '\''
} else if (item.type === 'date') {
+ let _val = item.value
let timetail = ' 00:00:00.000'
- if (item.match === '<' || item.match === '<=') {
- timetail = ' 23:59:59.999'
+ let _match = item.match
+
+ if (item.match === '<' || item.match === '<=') { // 鏃堕棿涓�<=鏃讹紝鍖归厤鍚庝竴澶╃殑0鐐癸紝鍖归厤鏂瑰紡涓�<
+ _match = '<'
+ _val = moment(_val, 'YYYY-MM-DD').add(1, 'days').format('YYYY-MM-DD')
} else if (item.match === '=') {
timetail = ''
}
+
// eslint-disable-next-line
- searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + timetail + '\')'
- } else if (item.type === 'datemonth') {
- // 鏈�-杩囨护鏉′欢锛屼粠鏈堝紑濮嬭嚦缁撴潫
+ 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').format('YYYY-MM-DD') + ' 23:59:59.999'
+ 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 + ' ' + item.match + ' ' + '\'' + _startval + '\' AND \'' + _endval + '\')'
- } else if (item.type === 'dateweek') {
- let stimetail = ' 00:00:00.000'
- let etimetail = ' 23:59:59.999'
+ 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 + ' ' + item.match + ' ' + '\'' + item.value[0] + stimetail + '\' AND \'' + item.value[1] + etimetail + '\')'
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else if (item.type === 'daterange') {
- let stimetail = ' 00:00:00.000'
- let etimetail = ' 23:59:59.999'
+ 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 + ' ' + item.match + ' ' + '\'' + item.value[0] + stimetail + '\' AND \'' + item.value[1] + etimetail + '\')'
+ searchText += '(' + item.key + ' >= \'' + _startval + '\' AND ' + item.key + ' < \'' + _endval + '\')'
} else {
// eslint-disable-next-line
searchText += '(' + item.key + ' ' + item.match + ' ' + '\'' + item.value + '\')'
@@ -479,6 +506,7 @@
@PageSize nvarchar(50)='',
@OrderCol nvarchar(50)='',
@OrderType nvarchar(50)='',
+ @exceltype nvarchar(50)='',
@sEPTMenuNo nvarchar(50)='${menu.MenuNo}',
@lang nvarchar(50)='',
@debug nvarchar(50)='',
@@ -499,7 +527,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -538,7 +566,7 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
@@ -642,7 +670,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -681,7 +709,7 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
--
Gitblit v1.8.0