From bdda3d8531513e32e0a079def5a3e342907a2ef7 Mon Sep 17 00:00:00 2001 From: 935090232@qq.com <ak473600000> Date: Fri, 18 Jun 2021 22:09:52 +0800 Subject: [PATCH] 修复每日业绩bug和优化赠送业绩计算方式 --- zq-erp/src/main/resources/templates/views/admin/hive-erp/statistics/daily-list-new.html | 32 +++++++++++++++++++++++--------- 1 files changed, 23 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 0137137..5cd963f 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,8 +111,11 @@ <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> + <el-table-column prop="cardCash" label="划扣"></el-table-column> <!-- <el-table-column prop="goodsCash" label="订单业绩"></el-table-column>--> <el-table-column prop="meiliao" label="员工"></el-table-column> <el-table-column v-for="(item, index) in customColumns" width="120" :key="index" :label="item.value"> @@ -147,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", @@ -182,10 +184,18 @@ }, 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 = {}; + 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; @@ -193,11 +203,15 @@ 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