~jiangyouyao/beauty-erp.git

			@@ -53,9 +53,9 @@
			data-width="30px">序号</th>
			<th data-field="dataTime">日期</th>
			<th data-field="shopName">门店名称</th>
			<th data-field="totalPay">应收金额</th>
			<th data-field="shouldPay" data-formatter="shouldPayFormat">应收金额</th>
			<th data-field="totalPay">实收金额</th>
			<th data-field="hisConsume">折扣金额</th>
			<th data-field="shouldPay" data-formatter="zkAmountFormat">折扣金额</th>
			<th data-field="perCustomCnt">客单数</th>
			<th data-field="customGoodsCnt">客品数</th>
			<th data-field="cost">成本</th>
			@@ -79,8 +79,8 @@
			<script type="text/javascript">
			var myGrid;
			var initParam = {
			format : "yyyy-mm-dd hh:ii", //默认显示年与日，如果想显示十分秒:"yyyy-mm-dd hh:ii:ss"
			minView: "hour", //"month",只显示年月日的选择,不会再跳转去选择时分秒；如果想要选择时分秒的:"hour"
			format : "yyyy-mm-dd", //默认显示年与日，如果想显示十分秒:"yyyy-mm-dd hh:ii:ss"
			minView: "month", //"month",只显示年月日的选择,不会再跳转去选择时分秒；如果想要选择时分秒的:"hour"
			}
			MTools.ininDatetimepicker(initParam);
			//限制结束时间不小于开始时间
			@@ -93,8 +93,6 @@
			url : basePath+"/admin/sysBusinessData/findDailySaleData",
			showExport : true,
			showFooter : false,
			height:'auto',
			width:'auto',
			exportDataType : "basic", //basic', 'all', 'selected'.
			exportTypes : [ 'excel', 'xlsx' ], //导出类型
			exportOptions : {
			@@ -111,6 +109,15 @@

			});

			function shouldPayFormat(value, row, index) {
			return row.shouldPay + row.refund;
			}

			function zkAmountFormat(value, row, index) {
			var result = row.shouldPay + row.refund - row.arrears - row.totalPay;
			return result.toFixed(2);
			}

			function footCountTitle(data) {
			return "<b>合计</b>";
			};