From 24f375ff458b2df439172eb6b90ea4ee98204a6a Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Thu, 28 Jan 2021 14:45:32 +0800
Subject: [PATCH] 1、修复若干问题

---
 zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html     |    1 +
 zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html |    2 ++
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
index 4ab9223..c3b2a39 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/jyls.html
@@ -294,8 +294,10 @@
                     queryKey:_this.form.queryKey,
                     startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                     endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
+                    shopId:_this.form.shopId,
                     order:_this.form.order,
                     sort:_this.form.sort,
+
                 }
             },
             search:function(){
diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html
index a8b77b5..130f97d 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/jyls.html
@@ -269,6 +269,7 @@
                     queryKey:_this.form.queryKey,
                     startTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[0]).format("YYYY-MM-DD HH:mm"):'',
                     endTime:_this.form.datetimeArr?moment(_this.form.datetimeArr[1]).format("YYYY-MM-DD HH:mm"):'',
+                    shopId:_this.form.shopId,
                     order:_this.form.order,
                     sort:_this.form.sort,
                 }

--
Gitblit v1.9.1