Merge branch 'score_shop'

wzy

2022-10-12 4615437af0749766f519c10734e19360b0877ece

 zq-erp/src/main/resources/templates/views/admin/hive-erp/order/sysOrder-list.html

@@ -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>
@@ -84,6 +84,7 @@
        <div id="option-bar">
            <button   class="btn btn-info btn-sm mr-5" onClick="openLook()"  ><i class="fa fa-eye fa-trash-o"></i> 查看详情</button>
            <button matrix:btn="mddd-exportExcel"  onclick="exportExcel()" type="button" class="btn btn-info btn-sm"><i class="fa fa-download" ></i> 导出</button>
            <button  matrix:btn="mddd-del"  class="btn btn-danger btn-sm mr-5" onClick="cancelOrder()"  ><i class="fa fa-trash-o fa-fw"></i> 取消</button>

        </div>
        <!-- 数据表格部分 -->
@@ -99,10 +100,13 @@
                <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>
                <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>
@@ -142,7 +146,25 @@
        });

    });

    function cancelOrder() {
        var id=myGrid.getSelectItemId();
        layer.confirm('确定取消此订单？', {
                btn: ['确认', '取消'] //可以无限个按钮
            }, function(index, layero){
                $.post(basePath+'/admin/order/erpCancelOrder?id='+id+'&del=0', {}, function(data){
                    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){
                //按钮【按钮二】的回调
            });
    }

    /**
     * 跳转消费流水详情页面