Merge branch 'score_shop' into api_score_meger

jyy

2021-06-19 e522e4d40451b4e46ec79b3d8a3891899196f14f

 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>
@@ -151,7 +152,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",
@@ -187,10 +187,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;

@@ -198,11 +206,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() {