From e522e4d40451b4e46ec79b3d8a3891899196f14f Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 19 Jun 2021 14:45:17 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
index 8da1de1..066b4cb 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html
@@ -113,6 +113,7 @@
 			<el-table-column prop="orderType" label="订单类型"></el-table-column>
 			<el-table-column prop="vipName" label="会员姓名"></el-table-column>
 			<el-table-column prop="proName" label="产品" width="200"></el-table-column>
+			<el-table-column prop="achieveRuleName" label="业绩规则" width="200"></el-table-column>
 			<el-table-column prop="cateName" label="产品分类"></el-table-column>
 			<el-table-column prop="zkTotal" label="订单金额"></el-table-column>
 			<el-table-column prop="goodsCash" label="现金"></el-table-column>
@@ -190,7 +191,14 @@
 				let _this = this;
 				let form = _this.form;
 				let page = _this.page;
-				let params = _this.form;
+				let params = {};
+				params.year=form.year;
+				params.month=form.month;
+				params.year=form.year;
+				params.day=form.day;
+				params.vipQueryKey=form.vipQueryKey;
+				params.beaultId=form.beaultId;
+				params.shopId=form.shopId;
 				params.limit = page.size;
 				params.offset = (page.currentPage - 1) * page.size;
 

--
Gitblit v1.9.1