From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

---
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html
index 34ecd48..286d33b 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/achieveNewStatiostics.html
@@ -354,7 +354,14 @@
 
             //导出
           exportExcel(){
-            window.location.href=basePath+"/admin/achieve/exportAchieveNewStatisticsExcel?"+MTools.jsonToUrlParam(this.getRequestParam());
+              var reqParam = this.getRequestParam();
+              reqParam.beginTimeStr = reqParam.beginTime;
+              reqParam.endTimeStr = reqParam.endTime;
+              reqParam.beginTime = null;
+              reqParam.endTime = null;
+              var param = MTools.jsonToUrlParam(reqParam);
+              console.log(param);
+            window.location.href=basePath+"/admin/achieve/exportAchieveNewStatisticsExcel?"+param;
         }
 
         }

--
Gitblit v1.9.1