Merge remote-tracking branch 'origin/score_shop' into score_shop

935090232@qq.com

2021-10-06 1d394446abb8465e63fd1fd9a768796e149edbd6

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

@@ -38,10 +38,7 @@
                <input autocomplete="off"   name="closureTime" type="text"
                       class="form-control datetimepicker" id="endTime">
            </div>
            <div class="form-group mr-20">
                <label >超时时长 > </label>
                <input autocomplete="off"   name="isOverTime" type="text" class="form-control" placeholder="单位分钟"  id="isOverTime">
            </div>

            <div class="form-group mr-20">
                <label >所属门店</label>
                <select class="form-control autoFull" data-filed="shopName" name="shopId" id="shopId"
@@ -141,7 +138,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();