|
|
@@ -25,7 +25,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="container-fluid" style="min-width: 2000px;">
|
|
|
+ <div class="container-fluid" style="min-width: 1500px;">
|
|
|
<div class="d-none" id="list">
|
|
|
|
|
|
<form method="GET" action="@if($uriType=='ZF'){{url('waybill/index/ZF')}}@elseif($uriType=='ZX'){{url('waybill/index/ZX')}}@else{{url('waybill/index')}}@endif" id="optionSubmit">
|
|
|
@@ -62,13 +62,13 @@
|
|
|
<option value="{{$carrier->id}}">{{$carrier->name}}</option>
|
|
|
@endforeach
|
|
|
</select></td>
|
|
|
- <td >
|
|
|
+ <td >
|
|
|
<input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
|
|
|
class="form-control-sm tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle"></td>
|
|
|
<td >
|
|
|
<input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索" name="carrier_bill" placeholder="承运商单号"
|
|
|
class="form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle"></td>
|
|
|
- <td width="60%"></td>
|
|
|
+ <td width="50%"></td>
|
|
|
</tr>
|
|
|
<tr>
|
|
|
<td >
|
|
|
@@ -87,7 +87,7 @@
|
|
|
<td>
|
|
|
<select name="status" v-model="filterData.status" @change="setState" class="form-control-sm" style="vertical-align: middle">
|
|
|
<option value="" selected>运单状态</option>
|
|
|
- <option value="待审核">待审核</option>
|
|
|
+ <option value="未审核">未审核</option>
|
|
|
<option value="已审核">待调度</option>
|
|
|
<option value="待终审">待终审</option>
|
|
|
<option value="已完结">已完结</option>
|
|
|
@@ -119,6 +119,12 @@
|
|
|
@endif
|
|
|
</div>
|
|
|
<table class="table table-striped table-sm table-bordered table-hover text-nowrap waybill-table" style="background: #fff;">
|
|
|
+ <tr>
|
|
|
+ <th class="table-header-layer-1" colspan="3"></th>
|
|
|
+ <th class="table-header-layer-1" colspan="7"><span class="fa fa-file-text-o"></span> 运单信息</th>
|
|
|
+ <th class="table-header-layer-1" colspan="6"><span class="fa fa-truck"></span> 运输信息</th>
|
|
|
+ <th class="table-header-layer-1" colspan="4"><span class="fa fa-rmb"></span> 费用信息</th>
|
|
|
+ </tr>
|
|
|
<tr>
|
|
|
<th>
|
|
|
<label for="all">
|
|
|
@@ -129,23 +135,23 @@
|
|
|
<th>操作</th>
|
|
|
@endcan
|
|
|
<th>状态</th>
|
|
|
- <th class="waybill_1">ID</th>
|
|
|
- <th class="waybill_1">创建时间</th>
|
|
|
- <th class="waybill_1">运单类型</th>
|
|
|
- <th class="waybill_1">货主</th>
|
|
|
- <th class="waybill_1">运单号</th>
|
|
|
- <th class="waybill_1">始发地</th>
|
|
|
- <th class="waybill_1">目的地</th>
|
|
|
- <th class="waybill_2">承运商</th>
|
|
|
- <th class="waybill_2">单号/车型</th>
|
|
|
- <th class="waybill_2">仓库计抛</th>
|
|
|
- <th class="waybill_2">承运商计抛</th>
|
|
|
- <th class="waybill_2">仓库计重</th>
|
|
|
- <th class="waybill_2">承运商计重</th>
|
|
|
- <th class="waybill_3">运费</th>
|
|
|
- <th class="waybill_3">提货费</th>
|
|
|
- <th class="waybill_3">其他费用</th>
|
|
|
- <th class="waybill_3">调度备注</th>
|
|
|
+ <th>ID</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>调度备注</th>
|
|
|
{{-- <th>WMS单号</th>--}}
|
|
|
{{-- <th>收件人</th>--}}
|
|
|
{{-- <th>收件人电话</th>--}}
|
|
|
@@ -167,7 +173,7 @@
|
|
|
<td>
|
|
|
<span v-if=waybill.status==="未审核"||waybill.status==="待重审">
|
|
|
@can('运输管理-运单审核')
|
|
|
- <button class="btn btn-outline-success btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
|
|
|
+ <button class="btn btn-outline-primary btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
|
|
|
@endcan
|
|
|
@can('运输管理-运单编辑')
|
|
|
<button class="btn btn-outline-secondary btn-sm" @click="waybillUpdate(waybill.id)">修改</button>
|
|
|
@@ -188,14 +194,14 @@
|
|
|
@endcan
|
|
|
</span>
|
|
|
</td>
|
|
|
- <td :style="{color:waybill.status=='已审核'?'blue':''}">@{{waybill.status}}</td>
|
|
|
- <td>@{{waybill.id}}</td>
|
|
|
- <td>@{{waybill.created_at}}</td>
|
|
|
+ <td :class="[waybill.status=='已审核'?'text-success':'']">@{{waybill.status}}</td>
|
|
|
+ <td class="text-muted">@{{waybill.id}}</td>
|
|
|
+ <td class="text-muted">@{{waybill.created_at}}</td>
|
|
|
<td>@{{waybill.type}}</td>
|
|
|
<td>@{{waybill.owner}}</td>
|
|
|
- <td>@{{waybill.waybill_number}}</td>
|
|
|
- <td>@{{waybill.origination}}</td>
|
|
|
- <td>@{{waybill.destination}}</td>
|
|
|
+ <td>@{{waybill.wms_bill_number}}</td>
|
|
|
+ <td class="text-muted">@{{waybill.origination}}</td>
|
|
|
+ <td class="text-muted">@{{waybill.destination}}</td>
|
|
|
<td>@{{waybill.carrier}}</td>
|
|
|
<td><span v-if="waybill.type=='专线'">@{{waybill.carrier_bill}}</span>
|
|
|
<span v-if="waybill.type=='直发车'">
|
|
|
@@ -312,7 +318,7 @@
|
|
|
carrier_weight_unit_other:'{{$waybill->carrier_weight_unit_other_name}}',
|
|
|
@if($waybill->carType)carType:{!! $waybill->carType !!},car_owner_info:'{{$waybill->car_owner_info}}',@endif @can('运输管理-可见费用项') fee:'{{$waybill->fee}}',
|
|
|
pick_up_fee:'{{$waybill->pick_up_fee}}',other_fee:'{{$waybill->other_fee}}',
|
|
|
- collect_fee:'{{$waybill->collect_fee}}', @endcan dispatch_remark:'{{$waybill->dispatch_remark}}',isBtn:false,wmsCommodities:{!! $waybill->wmsCommodities !!},
|
|
|
+ collect_fee:'{{$waybill->collect_fee}}', @endcan dispatch_remark:'{{$waybill->dispatch_remark}}',isBtn:false,
|
|
|
waybillAuditLogs:{!! $waybill->waybillAuditLogs !!}
|
|
|
},
|
|
|
@endforeach
|
LD