From c4e5a143a1a22124daf6fbd95269ca14a6c7d149 Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Thu, 17 Jun 2021 22:35:30 +0800
Subject: [PATCH] 业绩规则4

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

diff --git a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
index f19c967..32384da 100644
--- a/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
+++ b/zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html
@@ -111,6 +111,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>
@@ -149,7 +150,6 @@
 <script type="text/javascript" th:src="@{/js/plugin/vue.js}"></script>
 <script type="text/javascript" th:src="@{/plugin/element-ui/index.js}"></script>
 <script type="text/javascript" th:src="@{/plugin/moment.min.js}"></script>
-<script type="text/javascript" th:src="@{/js/systools/MJsBase.js}"></script>
 <script type="text/javascript" th:inline="javascript">
 	var vue = new Vue({
 		el : "#app",
@@ -184,10 +184,11 @@
 		},
 		methods : {
 			queryTableData () {
+
 				let _this = this;
-				var form = _this.form;
-				var page = _this.page;
-				var params = _this.form;
+				let form = _this.form;
+				let page = _this.page;
+				let params = _this.form;
 				params.limit = page.size;
 				params.offset = (page.currentPage - 1) * page.size;
 
@@ -195,11 +196,14 @@
 					params.beginTime = form.timeRange?moment(form.timeRange[0]).format("YYYY-MM-DD HH:mm"):'';
 					params.endTime = form.timeRange?moment(form.timeRange[1]).format("YYYY-MM-DD HH:mm"):'';
 				}
-				$.AjaxProxy({
-					p:params
-				}).invoke(basePath + "/admin/achieve/findDailyInfoNew", function (loj) {
-					_this.tableData = loj.getValue("rows");
-					_this.page.total = loj.getResult().total;
+				AjaxProxy.requst({
+					app: _this,
+					data: params,
+					url: basePath + "/admin/achieve/findDailyInfoNew",
+					callback: function (loj) {
+						_this.tableData = loj.rows;
+						_this.page.total = loj.total;
+					}
 				});
 			},
 			queryCustomColumns() {

--
Gitblit v1.9.1