From 5ff2ee3b46a584368a6d2cebbe180abb1947f927 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 八月 2020 00:21:42 +0800
Subject: [PATCH] 2020-08-06
---
src/utils/utils.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 3d0e29e..ef7a9e2 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -967,7 +967,7 @@
Select @ErrorCode='', @retmsg='', @UserName='${userName}', @FullName='${fullName}'
`
}
-
+
return {
sql: _sql,
lines: result.map((list, index) => {
@@ -987,13 +987,18 @@
* @param {Number} number 鏃堕棿鍊�
*/
static formatExcelDate(number) {
- const time = new Date((number - 1) * 24 * 3600000 + 1)
- time.setYear(time.getFullYear() - 70)
- const year = time.getFullYear()
- const month = time.getMonth() + 1
- const date = time.getDate() - 1
+ if (number < 60) { // 1900-2-29锛宔xcel涓瓨鍦紝瀹為檯涓嶅瓨鍦�
+ number++
+ }
- return `${year}-${(month < 10 ? '0' + month : month)}-${(date < 10 ? '0' + date : date)}`
+ return moment('19000101', 'YYYYMMDD').add(number - 2, 'days').format('YYYY-MM-DD')
+ // const time = new Date((number - 25569) * 24 * 3600000)
+ // time.setYear(time.getFullYear() - 70)
+ // const year = time.getFullYear()
+ // const month = time.getMonth() + 1
+ // const date = time.getDate() - 1
+
+ // return `${year}-${(month < 10 ? '0' + month : month)}-${(date < 10 ? '0' + date : date)}`
}
/**
--
Gitblit v1.8.0