From ec87cf1ee2b9382bf9d089711f0ff82ae8e7077c Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Wed, 09 Jun 2021 20:44:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger
---
zq-erp/src/main/resources/templates/views/admin/hive/statistics/daily-list-new.html | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 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 0137137..8da1de1 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
@@ -100,7 +100,9 @@
</el-row>
<el-row class="table-style">
- <el-table :data="tableData" style="width: 100%">
+ <el-table :data="tableData"
+ :height="height"
+ style="width: 100%">
<el-table-column type="index" width="30"></el-table-column>
<el-table-column prop="datatime" width="150" label="时间"></el-table-column>
<el-table-column prop="orderNo" width="180" label="订单编号">
@@ -113,6 +115,8 @@
<el-table-column prop="proName" 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 +151,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",
@@ -156,6 +159,7 @@
customColumns : [],
shopList : [],
achieveUsers : [],
+ height:'calc(100vh - 240px)',
years : [2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021],
months : ["01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12"],
days : [],
@@ -182,10 +186,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;
@@ -193,11 +198,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