~jiangyouyao/beauty-erp.git

			@@ -113,6 +113,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 +149,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 +183,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 +195,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() {