From 65e310e342effbb7d98bd5f97b3404a44e3c5233 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 21 十二月 2019 00:29:36 +0800
Subject: [PATCH] 2019-12-21
---
src/utils/utils.js | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 8b0a88f..46e4704 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)
})
@@ -479,6 +487,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 +508,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -538,7 +547,7 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
@@ -642,7 +651,7 @@
BEGIN TRAN
/*鍏蜂綋涓氬姟鎿嶄綔*/
- /*
+ /*
select top 10 * from sProcExcep order by id desc
declare @UserName nvarchar(50),@FullName nvarchar(50)
@@ -681,7 +690,7 @@
RAISERROR(@ErrorMessage, /*-- Message text.*/
@ErrorSeverity, /*-- Severity.*/
@ErrorState /*-- State.*/
- );
+ );
END CATCH
GOTO_RETURN:
--
Gitblit v1.8.0