Bläddra i källkod

管理台-订单管理-线下订单,导出销售报表报错问题修复

zyh 3 år sedan
förälder
incheckning
5fe85d7755

+ 1 - 1
kmall-admin/src/main/java/com/kmall/admin/controller/ExportExcelController.java

@@ -56,7 +56,7 @@ public class ExportExcelController {
         String storeName = "";
         String storeId = "";
 
-        if(params.get("storeName") != null){
+        if(!Objects.isNull(params.get("storeName"))){
             storeName = (String) params.get("storeName");
 
             // 查询门店名称的门店id

+ 11 - 3
kmall-admin/src/main/webapp/js/shop/offilineOrderList.js

@@ -620,13 +620,21 @@ let vm = new Vue({
             }
         },
         exportSaleReportExcel:function(){
+            var params = {};
+            params.billDate = vm.q.billDate;
+            params.storeName = vm.q.storeName;
+            if (params.billDate == null || params.billDate==''){
+                alert('请选择账单时间');
+                return
+            }
+            if (params.storeName == null || params.storeName==''){
+                alert('请输入门店名称');
+                return
+            }
             const msg = this.$Message.loading({
                 content: 'Loading...',
                 duration: 0
             });
-            var params = {};
-            params.billDate = vm.q.billDate;
-            params.storeName = vm.q.storeName;
             exportFile('#rrapp', '../exportExcel/exportSalesExcel', params);
             setTimeout(msg, 1000);