king 4 лет назад
Родитель
Сommit
95a4dc5d72

+ 1 - 1
app/Http/Controllers/WaybillController.php

@@ -118,7 +118,7 @@ class WaybillController extends Controller
     public function update(Request $request, $id,WaybillPriceModelService $waybillPriceModelService,
                            LogisticService $logisticService,WaybillPayoffService $waybillPayoffService)
     {
-        if(!Gate::allows('运输管理-运单-调度')){ return view("exception.authority");  }
+        if(!Gate::allows('运输管理-运单-调度') && $request->type != '德邦物流'){ return view("exception.authority");  }
         if (!$request->warehouse_weight && $request->warehouse_weight_unit_id)$request->offsetUnset('warehouse_weight_unit_id');
         if (!$request->warehouse_weight_other && $request->warehouse_weight_unit_id_other)$request->offsetUnset('warehouse_weight_unit_id_other');
         if (!$request->carrier_weight && $request->carrier_weight_unit_id)$request->offsetUnset('carrier_weight_unit_id');

+ 29 - 23
resources/views/transport/waybill/index.blade.php

@@ -19,7 +19,7 @@
                             <a target="transport/waybill/index" class="nav-link @if($uriType=='直发车') active @endif" href="{{url('transport/waybill/index?uriType=直发车&status=未审核')}}">直发车</a>
                         </li>
                         <li class="nav-item">
-                            <a target="transport/waybill/index" class="nav-link @if($uriType=='德邦物流') active @endif" href="{{url('transport/waybill/index?uriType=德邦物流&status=未审核')}}">德邦物流</a>
+                            <a target="transport/waybill/index" class="nav-link @if($uriType=='德邦物流') active @endif" href="{{url('transport/waybill/index?uriType=德邦物流')}}">德邦物流</a>
                         </li>
                     </ul>
                 </div>
@@ -71,28 +71,34 @@
                     <td><input class="checkItem" type="checkbox" :value="waybill.id"></td>
                     <td>
                         <span>
-                            <span v-if=waybill.status=="未审核"||waybill.status=="待重审">
-                            @can('运输管理-运单-运单审核')
-                                    <button class="btn btn-outline-primary btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
-                                @endcan
-                                @can('运输管理-编辑')
-                                    <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill/waybillEdit')}}/'+waybill.id)">修改</a>
-                                @endcan
-                            </span>
-                            <span v-if=waybill.status=="已审核">
-                                @can('运输管理-运单-调度')
-                                    <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill)">取消审核</button>
-                                    <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill')}}/'+waybill.id+'/edit')">调度</a>
-                                @endcan
-                            </span>
-                            <span v-if=waybill.status==="待终审">
-                                @can('运输管理-运单-调度审核')
-                                    <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
-                                @endcan
-                                @can('运输管理-运单-调度')
-                                    <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill')}}/'+waybill.id+'/edit')">改调度</a>
-                                @endcan
-                            </span>
+                            @if($uriType=='德邦物流')
+                                <span>
+                                    <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill')}}/'+waybill.id+'/edit')">编辑</a>
+                                </span>
+                            @else
+                                <span v-if=waybill.status=="未审核"||waybill.status=="待重审">
+                                @can('运输管理-运单-运单审核')
+                                        <button class="btn btn-outline-primary btn-sm" @click="waybillAudit(waybill.id,waybill.waybill_number)">审核</button>
+                                    @endcan
+                                    @can('运输管理-编辑')
+                                        <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill/waybillEdit')}}/'+waybill.id)">修改</a>
+                                    @endcan
+                                </span>
+                                <span v-if=waybill.status=="已审核">
+                                    @can('运输管理-运单-调度')
+                                        <button class="btn btn-outline-secondary btn-sm" @click="waybillRetreatAudit(waybill)">取消审核</button>
+                                        <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill')}}/'+waybill.id+'/edit')">调度</a>
+                                    @endcan
+                                </span>
+                                <span v-if=waybill.status==="待终审">
+                                    @can('运输管理-运单-调度审核')
+                                        <button class="btn btn-outline-success btn-sm" @click="waybillEndAudit(waybill.id,waybill.waybill_number)">完结</button>
+                                    @endcan
+                                    @can('运输管理-运单-调度')
+                                        <a target="_blank" class="btn btn-outline-secondary btn-sm" :href= "('{{url('transport/waybill')}}/'+waybill.id+'/edit')">改调度</a>
+                                    @endcan
+                                </span>
+                            @endif
                         </span>
                     </td>
                     @can('运输管理-运单-置顶')