From d436976228aa320c0bee01f5fc263743d1022361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9E=E8=AF=9D?= <752718920@qq.com>
Date: Wed, 4 May 2022 11:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/utils/util.js | 65 +++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/jshERP-web/src/utils/util.js b/jshERP-web/src/utils/util.js
index e96984ec..ff1254ad 100644
--- a/jshERP-web/src/utils/util.js
+++ b/jshERP-web/src/utils/util.js
@@ -480,51 +480,57 @@ export function getMpListShort(thisRows, checker, replacer) {
   return mPropertyListShort
 }
 
+/**
+ * js获取当前年份， 格式“yyyy”
+ */
+export function getNowFormatYear() {
+  let date = new Date();
+  return date.getFullYear();
+}
+
 /**
  * js获取当前月份， 格式“yyyy-MM”
  */
 export function getNowFormatMonth() {
-  var date = new Date();
-  var seperator1 = "-";
-  var month = date.getMonth() + 1;
+  let date = new Date();
+  let seperator1 = "-";
+  let month = date.getMonth() + 1;
   if (month >= 1 && month <= 9) {
     month = "0" + month;
   }
-  var currentdate = date.getFullYear() + seperator1 + month;
-  return currentdate;
+  return date.getFullYear() + seperator1 + month;
 }
 
 /**
  * js获取当前日期， 格式“yyyy-MM-dd”
  */
 export function getFormatDate() {
-  var date = new Date();
-  var seperator1 = "-";
-  var year = date.getFullYear();
-  var month = date.getMonth() + 1;
-  var strDate = date.getDate();
+  let date = new Date();
+  let seperator1 = "-";
+  let year = date.getFullYear();
+  let month = date.getMonth() + 1;
+  let strDate = date.getDate();
   if (month >= 1 && month <= 9) {
     month = "0" + month;
   }
   if (strDate >= 0 && strDate <= 9) {
     strDate = "0" + strDate;
   }
-  var currentdate = year + seperator1 + month + seperator1 + strDate;
-  return currentdate;
+  return year + seperator1 + month + seperator1 + strDate;
 }
 
 /**
  * js获取当前时间， 格式“yyyy-MM-dd HH:MM:SS”
  */
 export function getNowFormatDateTime() {
-  var date = new Date();
-  var seperator1 = "-";
-  var seperator2 = ":";
-  var month = date.getMonth() + 1;
-  var strDate = date.getDate();
-  var strHours = date.getHours();
-  var strMinutes = date.getMinutes();
-  var strSeconds = date.getSeconds();
+  let date = new Date();
+  let seperator1 = "-";
+  let seperator2 = ":";
+  let month = date.getMonth() + 1;
+  let strDate = date.getDate();
+  let strHours = date.getHours();
+  let strMinutes = date.getMinutes();
+  let strSeconds = date.getSeconds();
   if (month >= 1 && month <= 9) {
     month = "0" + month;
   }
@@ -540,22 +546,21 @@ export function getNowFormatDateTime() {
   if (strSeconds >= 0 && strSeconds <= 9) {
     strSeconds = "0" + strSeconds;
   }
-  var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
+  return date.getFullYear() + seperator1 + month + seperator1 + strDate
     + " " + strHours + seperator2 + strMinutes
     + seperator2 + strSeconds;
-  return currentdate;
 }
 
 /**
  * js获取当前时间， 格式“MMddHHMMSS”
  */
 export function getNowFormatStr() {
-  var date = new Date();
-  var month = date.getMonth() + 1;
-  var strDate = date.getDate();
-  var strHours = date.getHours();
-  var strMinutes = date.getMinutes();
-  var strSeconds = date.getSeconds();
+  let date = new Date();
+  let month = date.getMonth() + 1;
+  let strDate = date.getDate();
+  let strHours = date.getHours();
+  let strMinutes = date.getMinutes();
+  let strSeconds = date.getSeconds();
   if (month >= 1 && month <= 9) {
     month = "0" + month;
   }
@@ -571,7 +576,7 @@ export function getNowFormatStr() {
   if (strSeconds >= 0 && strSeconds <= 9) {
     strSeconds = "0" + strSeconds;
   }
-  var currentdate = month + strDate + strHours + strMinutes + strSeconds;
+  let currentdate = month + strDate + strHours + strMinutes + strSeconds;
   return currentdate;
 }
 
@@ -595,7 +600,7 @@ export function removeByVal(arrylist, val) {
  * @returns {Array}
  */
 export function changeListFmtMinus(arr) {
-  var newArr = new Array();
+  let newArr = new Array();
   for(var i=0; i<arr.length; i++) {
     if(arr[i] < 0){
       newArr.push((arr[i]-0).toString());