beauty-erp.git - Gitblit

			@@ -40,6 +40,14 @@
			<input autocomplete="off" name="endTimeVo" type="text" class="form-control datetimepicker" id="endTime">
			</div>

			<div class="form-group mr-20">
			<label >所属门店</label>
			<select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
			th:data-url="@{/admin/shopInfo/findAll}">
			<option value=''>--请选择部所属门店--</option>
			</select>
			</div>

			<input autocomplete="off" type="hidden" name="statu" value="待付款" id="statu"/>
			<div class="form-group mr-20">
			<button type="button" class="btn btn-my btn-sm" id="btn0" value="" >全部</button>
			@@ -83,12 +91,14 @@
			<th data-field="payTime" data-formatter="MGrid.getTime"
			data-sortable="true">支付时间</th>
			<th data-field="staffName">下单顾问</th>
			<th data-field="cashierName">收银员</th>
			<th data-field="cashPay">现金支付金额</th>
			<th data-field="cardPay">卡支付金额</th>
			<th data-field="arrears">欠款金额</th>

			<th data-field="statu">订单状态</th>
			<th data-field="remark">备注</th>
			<th data-field="shopName">门店</th>

			</tr>
			</thead>
			@@ -219,6 +229,13 @@

			function cancelOrder() {
			var id=myGrid.getSelectItemId();
			var items=myGrid.getSelectItem();
			if(items.statu != "待付款"){
			layer.msg("只允许取消【待付款】状态的订单", {
			icon: 7
			});
			return false;
			}
			layer.confirm('确定取消此订单？', {
			btn: ['确认', '取消'] //可以无限个按钮
			}, function(index, layero){