客户订单号多订单号

app/Http/Controllers/OrderController.php

@@ -53,7 +53,20 @@ class OrderController extends Controller
         if ($orderno)$sql.=" and orderno like '".$orderno."%'";
         if ($codename_c)$sql.=" and sostatus = '".$codename_c."'";
         if ($carriername)$sql.=" and carriername like '".$carriername."%'";
-        if ($soreference1)$sql.=" and soreference1 like '".$soreference1."%'";
+        if ($soreference1){
+            $arr=array_filter(preg_split('/[,， ]+/is', $soreference1));
+            if (count($arr)>0){
+                $sql.=" and soreference1 in (";
+                foreach ($arr as $index=>$str){
+                    if ($index==0){
+                        $sql.="'".$str."'";
+                        continue;
+                    }
+                    $sql.=",'".$str."'";
+                }
+                $sql.=")";
+            }
+        } //$sql.=" and soreference1 like '".$soreference1."%'";
         if ($issuepartyname)$sql.=" and issuepartyname like '".$issuepartyname."%'";
         if ($notes){
             if ($addtime&&$addtime!=0)$sql.=" and addtime >= '".date('Y-m-d H:i:s',strtotime("-".$addtime." day"))."'";

resources/views/order/index/delivering.blade.php

@@ -61,10 +61,10 @@
                                 <input style="max-width: 200px" name="orderno" v-model="filterData.orderno" class="form-control form-control-sm tooltipTarget" placeholder="编号" :class="filterData.orderno?'bg-warning':''">
                             </td>
                             <td >
-                                <input style="max-width: 200px" name="soreference5" title="可输出多快递单号" v-model="filterData.soreference5" class="form-control form-control-sm tooltipTarget" placeholder="快递单号" :class="filterData.soreference5?'bg-warning':''">
+                                <input style="max-width: 200px" name="soreference5" title="可输入多快递单号" v-model="filterData.soreference5" class="form-control form-control-sm tooltipTarget" placeholder="快递单号" :class="filterData.soreference5?'bg-warning':''">
                             </td>
                             <td>
-                                <input style="max-width: 200px" name="soreference1" v-model="filterData.soreference1" class="form-control form-control-sm tooltipTarget" placeholder="客户订单号" :class="filterData.soreference1?'bg-warning':''">
+                                <input style="max-width: 200px" name="soreference1" title="可输入多客户订单号" v-model="filterData.soreference1" class="form-control form-control-sm tooltipTarget" placeholder="客户订单号" :class="filterData.soreference1?'bg-warning':''">
                             </td>
                             <td>
                                 <div class="form-inline">
@@ -112,140 +112,92 @@
                         </div><!-- /.modal-content -->
                     </div><!-- /.modal -->
                 </div>
-                <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3">
-                    <tr class="text-nowrap">
-                        <th>
-                            <label for="all">
-                                <input id="all" type="checkbox" @click="checkAll($event)">全选
-                            </label>
-                        </th>
-                        <th>序号</th>
-                        <th>操作</th>
-                        <th>编号</th>
-                        <th>订单状态</th>
-                        <th>接口下发时间</th>
-                        <th>店铺名称</th>
-                        <th>客户</th>
-                        <th>客户订单号</th>
-                        <th>承运人</th>
-                        <th>快递单号</th>
-                        <th>收货人名称</th>
-                        <th>收货人电话</th>
-                        <th>省</th>
-                        <th>市</th>
-                        <th>区</th>
-                        <th style="min-width:320px;">收货人地址</th>
-                        <th>波次编号</th>
-                        <th>仓库</th>
-                        <th>快递获取标记</th>
-                        <th>快递获取时间</th>
-                        <th style="min-width: 200px">产品代码</th>
-                        <th style="min-width: 200px">产品条码</th>
-                        <th style="min-width: 200px">产品名称</th>
-                        <th>订单数量</th>
-                        <th>复核时间</th>
-                        <th style="min-width:260px;">备注</th>
-                        <th>接口取消标记</th>
-                        <th>拣货单打印标记</th>
-                        <th>接口回传标记</th>
-                        <th>订单冻结标记</th>
+            <table class="table table-sm table-striped table-bordered table-hover card-body mt-2 ml-3">
+                <tr class="text-nowrap">
+                    <th>
+                        <label for="all">
+                            <input id="all" type="checkbox" @click="checkAll($event)">全选
+                        </label>
+                    </th>
+                    <th>序号</th>
+                    <th>操作</th>
+                    <th>编号</th>
+                    <th>订单状态</th>
+                    <th>接口下发时间</th>
+                    <th>店铺名称</th>
+                    <th>客户</th>
+                    <th>客户订单号</th>
+                    <th>承运人</th>
+                    <th>快递单号</th>
+                    <th>收货人名称</th>
+                    <th>收货人电话</th>
+                    <th>省</th>
+                    <th>市</th>
+                    <th>区</th>
+                    <th style="min-width:320px;">收货人地址</th>
+                    <th>波次编号</th>
+                    <th>仓库</th>
+                    <th>快递获取标记</th>
+                    <th>快递获取时间</th>
+                    <th style="min-width: 200px">产品代码</th>
+                    <th style="min-width: 200px">产品条码</th>
+                    <th style="min-width: 200px">产品名称</th>
+                    <th>订单数量</th>
+                    <th>复核时间</th>
+                    <th style="min-width:260px;">备注</th>
+                    <th>接口取消标记</th>
+                    <th>拣货单打印标记</th>
+                    <th>接口回传标记</th>
+                    <th>订单冻结标记</th>
 
-                    </tr>
-                    <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'font-weight': order.orderno==selectedStyle?'bold':''}">
-                        <td>
-                            <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
-                        </td>
-                        <td>@can('订单管理-编辑')<button v-if="order.releasestatus==='N'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap">冻结</button>@endcan</td>
-                        <td>@{{ i+1 }}</td>
-                        <td class="text-dark font-weight-bold text-nowrap">@{{ order.orderno }}</td>
-                        <td class="text-muted text-nowrap">@{{ order.codename_c }}</td>
-                        <td class="text-nowrap">@{{ order.addtime }}</td>
-                        <td class="text-nowrap">@{{ order.issuepartyname }}</td>
-                        <td class="text-nowrap">@{{ order.customer_descr_c }}</td>
-                        <td class="text-nowrap">@{{ order.soreference1 }}</td>
-                        <td class="text-muted text-nowrap">@{{ order.carriername }}</td>
-                        <td class="text-nowrap">@{{ order.soreference5 }}</td>
-                        <td class="text-muted text-nowrap">@{{ order.c_contact }}</td>
-                        <td class="text-muted text-nowrap">@{{ order.c_tel1 }}</td>
-                        <td class="text-nowrap"> @{{ order.c_province }}</td>
-                        <td class="text-nowrap"> @{{ order.c_city }}</td>
-                        <td class="text-nowrap"> @{{ order.c_district }}</td>
-                        <td class="text-muted">@{{ order.c_address1 }}</td>
-                        <td class="text-nowrap">@{{ order.waveno }}</td>
-                        <td class="text-nowrap"> @{{ order.warehouseid }}</td>
-                        <td class="text-nowrap">@{{ order.edisendflag2 }}</td>
-                        <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
-                        <td colspan="5" class="text-center">
-                            <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table text-nowrap table-sm">
-                                <tr v-for="oracleDOCOrderDetail in commodities[order.orderno]">
-                                    <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.sku }}</div></td>
-                                    <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div></td>
-                                    <td><div :title="oracleDOCOrderDetail.descr_c" class="tooltipTarget" style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.descr_c }}</div></td>
-                                    <td>@{{ oracleDOCOrderDetail.qtyordered }}</td>
-                                    <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.checktime }}</div></td>
-                                </tr>
-                                <tr v-if="isBtn[order.orderno]">
-                                    <td colspan="5">
-                                        <b style="cursor:pointer;color: #4aa0e6;" @click="isBtn[order.orderno]=false;">点击收起明细</b>
-                                    </td>
-                                </tr>
-                            </table>
-                            <b @click="unfold(order.orderno)" style="cursor:pointer;text-decoration: underline;color: #4aa0e6;" v-if="commodities[order.orderno]&&commodities[order.orderno].length>1 && !isBtn[order.orderno]">共有 @{{ commodities[order.orderno].length }}  件商品，点击展开</b>
-                        </td>
-                        <td>@{{ order.notes }}</td>
-                        <td>@{{ order.erpcancelflag }}</td>
-                        <td>@{{ order.picking_print_flag }}</td>
-                        <td>@{{ order.edisendflag }}</td>
-                        <td>@{{ order.releasestatus }}</td>
-            </tr>
-            <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'font-weight': order.orderno==selectedStyle?'bold':''}">
-                <td>
-                    <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
-                </td>
-                <td>@{{ i+1 }}</td>
-                <td>@can('订单管理-编辑')<button v-if="order.releasestatus==='N'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap">冻结</button>@endcan</td>
-                <td class="text-dark font-weight-bold text-nowrap">@{{ order.orderno }}</td>
-                <td class="text-muted text-nowrap">@{{ order.codename_c }}</td>
-                <td class="text-nowrap">@{{ order.addtime }}</td>
-                <td class="text-nowrap">@{{ order.issuepartyname }}</td>
-                <td class="text-nowrap">@{{ order.customer_descr_c }}</td>
-                <td class="text-nowrap">@{{ order.soreference1 }}</td>
-                <td class="text-muted text-nowrap">@{{ order.carriername }}</td>
-                <td class="text-nowrap">@{{ order.soreference5 }}</td>
-                <td class="text-muted text-nowrap">@{{ order.c_contact }}</td>
-                <td class="text-muted text-nowrap">@{{ order.c_tel1 }}</td>
-                <td class="text-nowrap"> @{{ order.c_province }}</td>
-                <td class="text-nowrap"> @{{ order.c_city }}</td>
-                <td class="text-nowrap"> @{{ order.c_district }}</td>
-                <td>@{{ order.c_address1 }}</td>
-                <td class="text-nowrap">@{{ order.waveno }}</td>
-                <td class="text-nowrap"> @{{ order.warehouseid }}</td>
-                <td class="text-nowrap">@{{ order.edisendflag2 }}</td>
-                <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
-                <td colspan="5" class="text-center">
-                    <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table text-nowrap table-sm">
-                        <tr v-for="oracleDOCOrderDetail in commodities[order.orderno]">
-                            <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.sku }}</div></td>
-                            <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div></td>
-                            <td><div :title="oracleDOCOrderDetail.descr_c" class="tooltipTarget" style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.descr_c }}</div></td>
-                            <td>@{{ oracleDOCOrderDetail.qtyordered }}</td>
-                            <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.checktime }}</div></td>
-                        </tr>
-                        <tr v-if="isBtn[order.orderno]">
-                            <td colspan="5">
-                                <b style="cursor:pointer;color: #4aa0e6;" @click="isBtn[order.orderno]=false;">点击收起明细</b>
-                            </td>
-                        </tr>
-                    </table>
-                    <b @click="unfold(order.orderno)" style="cursor:pointer;text-decoration: underline;color: #4aa0e6;" v-if="commodities[order.orderno]&&commodities[order.orderno].length>1 && !isBtn[order.orderno]">共有 @{{ commodities[order.orderno].length }}  件商品，点击展开</b>
-                </td>
-                <td>@{{ order.notes }}</td>
-                <td>@{{ order.erpcancelflag }}</td>
-                <td>@{{ order.picking_print_flag }}</td>
-                <td>@{{ order.edisendflag }}</td>
-                <td>@{{ order.releasestatus }}</td>
-
-                    </tr>
+                </tr>
+                <tr v-for="(order,i) in orders" @click="selectedColor(order.orderno)" :style="{'font-weight': order.orderno==selectedStyle?'bold':''}">
+                    <td>
+                        <input class="checkItem" type="checkbox" :value="order.orderno" v-model="checkData">
+                    </td>
+                    <td>@{{ i+1 }}</td>
+                    <td>@can('订单管理-编辑')<button v-if="order.releasestatus==='N'" @click="freeze(order.orderno,order.waveno)" class="btn btn-sm btn-outline-danger text-nowrap">冻结</button>@endcan</td>
+                    <td class="text-dark font-weight-bold text-nowrap">@{{ order.orderno }}</td>
+                    <td class="text-muted text-nowrap">@{{ order.codename_c }}</td>
+                    <td class="text-nowrap">@{{ order.addtime }}</td>
+                    <td class="text-nowrap">@{{ order.issuepartyname }}</td>
+                    <td class="text-nowrap">@{{ order.customer_descr_c }}</td>
+                    <td class="text-nowrap">@{{ order.soreference1 }}</td>
+                    <td class="text-muted text-nowrap">@{{ order.carriername }}</td>
+                    <td class="text-nowrap">@{{ order.soreference5 }}</td>
+                    <td class="text-muted text-nowrap">@{{ order.c_contact }}</td>
+                    <td class="text-muted text-nowrap">@{{ order.c_tel1 }}</td>
+                    <td class="text-nowrap"> @{{ order.c_province }}</td>
+                    <td class="text-nowrap"> @{{ order.c_city }}</td>
+                    <td class="text-nowrap"> @{{ order.c_district }}</td>
+                    <td>@{{ order.c_address1 }}</td>
+                    <td class="text-nowrap">@{{ order.waveno }}</td>
+                    <td class="text-nowrap"> @{{ order.warehouseid }}</td>
+                    <td class="text-nowrap">@{{ order.edisendflag2 }}</td>
+                    <td class="text-nowrap">@{{ order.edisendtime2 }}</td>
+                    <td colspan="5" class="text-center">
+                        <table v-if="commodities[order.orderno]&&commodities[order.orderno].length==1 || isBtn[order.orderno]" class="table text-nowrap table-sm">
+                            <tr v-for="oracleDOCOrderDetail in commodities[order.orderno]">
+                                <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.sku }}</div></td>
+                                <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.alternate_sku1 }}</div></td>
+                                <td><div :title="oracleDOCOrderDetail.descr_c" class="tooltipTarget" style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.descr_c }}</div></td>
+                                <td>@{{ oracleDOCOrderDetail.qtyordered }}</td>
+                                <td><div style="width: 180px;overflow: hidden">@{{ oracleDOCOrderDetail.checktime }}</div></td>
+                            </tr>
+                            <tr v-if="isBtn[order.orderno]">
+                                <td colspan="5">
+                                    <b style="cursor:pointer;color: #4aa0e6;" @click="isBtn[order.orderno]=false;">点击收起明细</b>
+                                </td>
+                            </tr>
+                        </table>
+                        <b @click="unfold(order.orderno)" style="cursor:pointer;text-decoration: underline;color: #4aa0e6;" v-if="commodities[order.orderno]&&commodities[order.orderno].length>1 && !isBtn[order.orderno]">共有 @{{ commodities[order.orderno].length }}  件商品，点击展开</b>
+                    </td>
+                    <td>@{{ order.notes }}</td>
+                    <td>@{{ order.erpcancelflag }}</td>
+                    <td>@{{ order.picking_print_flag }}</td>
+                    <td>@{{ order.edisendflag }}</td>
+                    <td>@{{ order.releasestatus }}</td>
+                </tr>
                 </table>
                 <button type="button" @click="pageUp()" :readonly="page>1?false:true" class="btn btn-sm " :class="page>1?'btn-outline-info':''">上一页</button>
                 <button type="button" @click="pageDown()" :readonly="page<maxPage?false:true" class="btn btn-sm m-3" :class="page<maxPage?'btn-outline-info':''">下一页</button>