Merge branch 'developer'

姜友瑶

2022-05-23 eaefb5f0d4fb5918786936dd60f4be7dd93011ba

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

@@ -95,6 +95,7 @@
                <th  data-field="bedName">床位</th>
                <th data-field="plsName" >配料师</th>
                <th data-field="createStaffName">创建人</th>
                <th data-field="cashierName">划扣人</th>
                <th  data-field="shopName">所属门店</th>
            </tr>
            </thead>
@@ -138,7 +139,7 @@
        layer.confirm('确定取消此订单？', {
            btn: ['确认', '取消'] //可以无限个按钮
        }, function(index, layero){
            $.post(basePath+'/admin/projService/cancelOrder?id='+id, {}, function(data){
            $.post(basePath+'/admin/projService/erpCancelOrder?id='+id, {}, function(data){
                parent.layer.msg(data.info,{icon: 1});
                layer.closeAll();
                myGrid.serchData();