Merge branch 'developer'

Helius

2022-02-22 50199492d4033f995223c94fdb65297bb13c4505

 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;
        }

        }