Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/underlineOrder.html

@@ -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>
@@ -220,20 +230,26 @@
    function cancelOrder() {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
            btn: ['确认', '取消并删除', '取消'] //可以无限个按钮
            btn: ['确认', '取消'] //可以无限个按钮
        }, function(index, layero){
            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=0', {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                if (data.status == '200') {
                    parent.layer.msg(data.info,{icon: 1});
                } else {
                    parent.layer.msg(data.info,{icon: 2});
                }
                layer.closeAll();
                myGrid.serchData();
            });
        }, function(index){
            $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                layer.closeAll();
                myGrid.serchData();
            });
        }, function(index){
        },
        //     function(index){
        //     $.post(basePath+'/admin/order/cancelOrder?id='+id+'&del=1', {}, function(data){
        //         parent.layer.msg(data.info,{icon: 1});
        //         layer.closeAll();
        //         myGrid.serchData();
        //     });
        // },
            function(index){
            //按钮【按钮二】的回调
        });
    }