Merge branch 'way_bill' into zengjun

app/Services/WaybillService.php

@@ -38,6 +38,7 @@ Class WaybillService
             'origination' => ['like' => ''],
             'destination' => ['like' => ''],
             'source_bill' => ['like' => ''],
+            'car_owner_info' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ':00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ':59'],
             'uriType' => ['alias' => 'type'],

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

@@ -267,7 +267,7 @@
                             <span v-if='orderIssue.order.logistic'>@{{ orderIssue.order.logistic.name }}</span>
                         </td>
                         <td class=" hide-content p-0 td-yellow child-layer-2 align-center" valign="middle">
-                            <div v-if="orderIssue.order">
+                            <template v-if="orderIssue.order">
                                 <span  :class="orderIssue.order.packages.length > 1 ?'collapse ':''" :id="'logisticNumbers'+orderIssue.id" >
                                     <span class="m-0 p-0 d-inline-block" v-for="package in orderIssue.order.packages" >@{{ package.logistic_number }}&nbsp;&nbsp;</span>
                                 </span>
@@ -276,7 +276,7 @@
                                         @click="toggleLogisticNumbers(orderIssue.id,orderIssue.order.packages.length)">
                                     分箱@{{ orderIssue.order.packages.length }}件,点击展开
                                 </button>
-                            </div>
+                            </template>
                         </td>
                         {{--商品明细 开始--}}
                         <td class="td-yellow p-0 m-0 child-layer-2 w-50" v-if="!isShowOrderInfo && index===0" :rowspan="orderIssues.length">

resources/views/waybill/index.blade.php

@@ -54,7 +54,7 @@
                 <tr>
                     <th class="table-header-layer-1" colspan="4"></th>
                     <th class="table-header-layer-1" colspan="11"><span class="fa fa-file-text-o"></span> 运单信息</th>
-                    <th class="table-header-layer-1" colspan="12"><span class="fa fa-truck"></span> 运输信息</th>
+                    <th class="table-header-layer-1" colspan="13"><span class="fa fa-truck"></span> 运输信息</th>
                     <th class="table-header-layer-1" colspan="5"><span class="fa fa-rmb"></span> 费用信息
                     @can('运输管理-删除')
                         <th class="table-header-layer-1" colspan="1"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
@@ -136,9 +136,22 @@
                     <td class="td-cool text-muted">@{{waybill.origination}}</td>
                     <td class="td-cool text-muted">@{{waybill.destination}}</td>
                     <td class="td-cool">@{{waybill.carrier}}</td>
-                    <td class="td-cool"><span v-if="waybill.type==='专线'">@{{waybill.carrier_bill}}</span>
-                        <span v-if="waybill.type==='直发车'">
-                            <span v-if="waybill.carType">@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span></span></td>
+                    <td class="td-cool">
+                        <span v-if="waybill.carrier_bill">
+                            @{{waybill.carrier_bill}}<span v-if="waybill.carType">/@{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i></span>
+                        </span>
+{{--                        <span v-if="waybill.type==='专线'">@{{waybill.carrier_bill}}</span>--}}
+{{--                        <span v-if="waybill.type==='直发车'">--}}
+{{--                            <span v-if="waybill.carType">--}}
+{{--                                @{{ waybill.carType.name }}<i v-if="waybill.carType.length">(@{{waybill.carType.length}}米)</i>--}}
+{{--                            </span>--}}
+{{--                        </span>--}}
+                    </td>
+                    <td class="td-cool">
+                        <span v-if="waybill.type === '直发车'">
+                            @{{ waybill.car_owner_info }}
+                        </span>
+                    </td>
                     <td class="td-cool"><span v-if="waybill.warehouse_weight">@{{waybill.warehouse_weight|filterZero}}  @{{waybill.warehouse_weight_unit}}</span></td>
                     <td class="td-cool"><span v-if="waybill.carrier_weight">@{{waybill.carrier_weight|filterZero}}  @{{waybill.carrier_weight_unit}}</span></td>
                     <td class="td-cool text-center" style="position: relative" @mouseenter="btnRefreshWeightZoomOut(waybill)" @mouseleave="btnRefreshWeightZoomIn(waybill)">
@@ -380,6 +393,7 @@
                         {name:'status',type:'select',placeholder: '运单状态',data:this.status},
                         {name:'source_bill',type:'input',tip: '上游单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '上游单号'},
                         {name:'recipient',type:'input',tip: '收货人姓名：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人姓名'},
+                        {name:'car_owner_info',type:'input',tip: '车辆信息：可在左侧增加百分号(%)进行模糊搜索',placeholder: '车辆信息'},
                     ],
                     [
                         {name:'wms_bill_number',type:'input',tip:'WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
@@ -422,6 +436,7 @@
                     {name:'destination',value: '目的地', class:"td-cool"},
                     {name:'carrier',value: '承运商', class:"td-cool"},
                     {name:'carrier_bill',value: '单号/车型', neglect: true, class:"td-cool"},
+                    {name:'car_owner_info',value: '车辆信息', neglect: true, class:"td-cool"}, // 车辆信息
                     {name:'warehouse_weight',value: '仓库计抛', neglect: true, class:"td-cool"},
                     {name:'carrier_weight',value: '承运商计抛', neglect: true, class:"td-cool"},
                     {name:'warehouse_weight_other',value: '仓库计重', neglect: true, class:"td-cool"},