~jiangyouyao/beauty-erp.git

			@@ -52,7 +52,7 @@
			</select>
			</div>
			<div class="form-group mr-20">
			<label>订单日期</label>
			<label>付款日期</label>
			<input autocomplete="off" name="beginTimeVo" type="text" class="form-control datetimepicker" id="beginTime">-
			<input autocomplete="off" name="endTimeVo" type="text" class="form-control datetimepicker" id="endTime">
			</div>
			@@ -100,6 +100,8 @@
			<th data-field="vipPhone">客户手机号</th>
			<th data-field="orderTime" data-formatter="MGrid.getTime"
			data-sortable="true">下单时间</th>
			<th data-field="payTime" data-formatter="MGrid.getTime"
			data-sortable="true">支付时间</th>
			<th data-field="statu">订单状态</th>
			<th data-field="total">订单总价</th>
			<th data-field="zkTotal">折后价</th>
			@@ -148,7 +150,7 @@
			layer.confirm('确定取消此订单？', {
			btn: ['确认', '取消'] //可以无限个按钮
			}, function(index, layero){
			$.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
			$.post(basePath+'/admin/order/erpCancelOrder?id='+id+'&del=0', {}, function(data){
			if (data.status == '200') {
			parent.layer.msg(data.info,{icon: 1});
			} else {