Pārlūkot izejas kodu

WAYBILL编辑BUG

LD 6 gadi atpakaļ
vecāks
revīzija
eca9183585

+ 1 - 1
resources/views/waybill/create.blade.php

@@ -24,6 +24,7 @@
                 <form method="POST" action="{{ url('waybill') }}">
                     @csrf
                     <input name="type" hidden value="{{$type}}">
+                    <div class="h5 text-center mb-3">@if($type=='专线')专线@else 直发车@endif </div>
                     <div class="form-group row">
                         <label for="owner_id" class="col-2 col-form-label text-right text-primary">货主{{old('owner_id')}} *</label>
                         <div class="col-8 form-inline">
@@ -145,7 +146,6 @@
             </div>
         </div>
     </div>
-    </div>
 @endsection
 
 @section('lastScript')

+ 7 - 7
resources/views/waybill/edit.blade.php

@@ -86,7 +86,7 @@
                     <div class="form-group row">
                         <label for="carrier_id" class="col-2 col-form-label text-right text-primary">承运商 *</label>
                         <div class="col-8">
-                            <select name="carrier_id" class="form-control @error('carrier_id') is-invalid @enderror" id="carrier_id" v-model="waybillPriceModel.carrier_id" style="width: 30%; " @change="isCarrier($event)">
+                            <select name="carrier_id" class="form-control @error('carrier_id') is-invalid @enderror" id="carrier_id" v-model="waybillPriceModel.carrier_id" style="width: 30%; ">
                                 @foreach($carriers as $carrier)
                                     <option value="{{$carrier->id}}">{{$carrier->name}}</option>
                                 @endforeach
@@ -121,7 +121,7 @@
                     <div class="form-group row">
                         <label for="destination_city_id" class="col-2 col-form-label text-right text-primary">目的市 *</label>
                         <div class="col-8 form-inline">
-                            <select class="form-control" name="destination_city_id" id="destination_city_id" v-model="waybillPriceModel.destination_city_id" style="width: 30%; " @change="isDestination_city($event)">
+                            <select class="form-control" name="destination_city_id" id="destination_city_id" v-model="waybillPriceModel.destination_city_id" style="width: 30%; " >
                                 <option v-for="city in cities" :value="city.id">@{{city.name}}</option>
                             </select>
                             <input class="form-control-sm" placeholder="输入关键字定位" @input="destination_city_id">
@@ -181,7 +181,7 @@
                     <div class="form-group row">
                         <label for="carrier_weight" class="col-2 col-form-label text-right ">承运商计数(抛)</label>
                         <div class="col-2">
-                            <input type="text" id="carrier_weight" @blur="isCarrier_weight"  class="form-control @error('carrier_weight') is-invalid @enderror"
+                            <input type="text" id="carrier_weight"   class="form-control @error('carrier_weight') is-invalid @enderror"
                                    name="carrier_weight" autocomplete="off" value="@if(old('carrier_weight')){{ old('carrier_weight') }}@else{{$waybill->carrier_weight}}@endif"  >
                             @error('carrier_weight')
                             <span class="invalid-feedback" role="alert">
@@ -191,7 +191,7 @@
                         </div>
                         <label for="carrier_weight_unit_id" class=" col-form-label text-right ">单位:</label>
                         <div class="col-1.5">
-                            <select id="carrier_weight_unit_id" class="form-control @error('carrier_weight_unit_id') is-invalid @enderror" @change="isCarrier_weight_unit" name="carrier_weight_unit_id" v-model="waybillPriceModel.carrier_weight_unit_id">
+                            <select id="carrier_weight_unit_id" class="form-control @error('carrier_weight_unit_id') is-invalid @enderror"  name="carrier_weight_unit_id" v-model="waybillPriceModel.carrier_weight_unit_id">
                                 @foreach($units as $unit)
                                     <option value="{{$unit->id}}">{{$unit->name}}</option>
                                 @endforeach
@@ -201,7 +201,7 @@
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <label for="carrier_weight_other" class="col-form-label text-right ">承运商计数二</label>
                         <div class="col-2">
-                            <input type="text" id="carrier_weight_other" @blur="isCarrier_weight_other"  class="form-control @error('carrier_weight_other') is-invalid @enderror"
+                            <input type="text" id="carrier_weight_other"  class="form-control @error('carrier_weight_other') is-invalid @enderror"
                                    name="carrier_weight_other" autocomplete="off" value="@if(old('carrier_weight_other')){{ old('carrier_weight_other') }}@else{{$waybill->carrier_weight_other}}@endif"  >
                             @error('carrier_weight_other')
                             <span class="invalid-feedback" role="alert">
@@ -211,7 +211,7 @@
                         </div>
                         <label for="carrier_weight_unit_id_other" class=" col-form-label text-right ">单位:</label>
                         <div class="col-1.5">
-                            <select id="carrier_weight_unit_id_other" @change="isCarrier_weight_unit_id_other" class="form-control @error('carrier_weight_unit_id_other') is-invalid @enderror" name="carrier_weight_unit_id_other" v-model="waybillPriceModel.carrier_weight_unit_id_other" >
+                            <select id="carrier_weight_unit_id_other" class="form-control @error('carrier_weight_unit_id_other') is-invalid @enderror" name="carrier_weight_unit_id_other" v-model="waybillPriceModel.carrier_weight_unit_id_other" >
                                 @foreach($units as $unit)
                                     <option value="{{$unit->id}}">{{$unit->name}}</option>
                                 @endforeach
@@ -321,7 +321,7 @@
             el:'#list',
             data:{
                 waybillPriceModel: {
-                    carrier_id:'{{$waybill->carrier_id}}',origination_city_id:'{{old('origination_city_id')?old('origination_city_id'):$waybill->origination_city_id}}',
+                    carrier_id:'{{old('carrier_id')?old('carrier_id'):$waybill->carrier_id}}',origination_city_id:'{{old('origination_city_id')?old('origination_city_id'):$waybill->origination_city_id}}',
                     destination_city_id:'{{old('destination_city_id')?old('destination_city_id'):$waybill->destination_city_id}}',
                     carrier_weight:'{{old('carrier_weight')?old('carrier_weight'):$waybill->carrier_weight}}',carrier_weight_unit_id:'{{old('carrier_weight_unit_id')?old('carrier_weight_unit_id'):$waybill->carrier_weight_unit_id}}',
                     warehouse_weight_unit_id:'{{old('warehouse_weight_unit_id')?old('warehouse_weight_unit_id'):$waybill->warehouse_weight_unit_id}}',

+ 1 - 1
resources/views/waybill/menu.blade.php

@@ -12,7 +12,7 @@
             </li> @endcan
             {{$slot}}
             <li class="nav-item">
-                <a class="nav-link text-dark" href="{{url('waybill/correlation')}}" :class="{active:isActive('correlation',2)}">相关设置</a>
+                <a class="nav-link text-dark" href="{{url('waybill/relating')}}" :class="{active:isActive('relating',2)}">相关设置</a>
             </li>
             @can('财务报表')
             <li class="nav-item">

+ 1 - 0
routes/web.php

@@ -39,6 +39,7 @@ Route::resource('maintenance/province','ProvincesController');
 Route::resource('maintenance/city','CitiesController');
 Route::resource('maintenance/commodity', 'CommodityController');
 
+Route::get('waybill/relating',function (){return view('waybill.menuWaybill');});
 Route::resource('maintenance/waybillPriceModel','WaybillPriceModelsController');
 Route::get('maintenance/waybillPriceModel/excel/goImport',function (){return view('maintenance.waybillPriceModel.import');});
 Route::get('maintenance/waybillPriceModel/cities/{province_id}','WaybillPriceModelsController@getCities');