运输页面提交

resources/views/transport/waybill/edit.blade.php

@@ -39,49 +39,13 @@
                                     <input name="type" id="type" :value="waybill.type" hidden>
                                 </div>
                             </div>
-                            <div class="form-group row">
-                                <label for="charge" class="col-2 col-form-label text-right text-secondary">运输收费(元)</label>
-                                <div class="col-3">
-                                    <input type="number" step="0.01" min="0" class="form-control @error('charge') is-invalid @enderror"
-                                           id="charge" name="charge" v-model="waybill.charge" >
-                                </div>
-                                <label for="mileage" class="col-2 col-form-label text-right text-muted">里程数</label>
-                                <div class="input-group col-4">
-                                    <input type="number" step="0.01" class="form-control @error('mileage') is-invalid @enderror"
-                                           name="mileage" autocomplete="off" v-model="waybill.mileage" id="mileage" >
-                                    <div class="input-group-append">
-                                        <span class="input-group-text">KM</span>
-                                    </div>
-                                </div>
-                                @error('charge')
-                                <span class="invalid-feedback" role="alert">
-                                    <strong>{{ $message }}</strong>
-                                </span>
-                                @enderror
-                            </div>
-                            <div class="form-group row">
-                                <label for="other_charge" class="col-2 col-form-label text-right text-muted">其他收费(元)</label>
-                                <div class="col-3">
-                                    <input id="other_charge" type="number" step="0.01" class="form-control @error('other_charge') is-invalid @enderror"
-                                           name="other_charge" autocomplete="off" value="@if(old('other_charge')){{ old('other_charge') }}@else{{$waybill->other_charge}}@endif"  >
-                                </div>
-                                <label for="other_charge_remark" class="col-2 col-form-label text-right text-muted">其他收费备注</label>
-                                <div class="col-4">
-                                    <input type="text" class="form-control" id="other_charge_remark"
-                                           name="other_charge_remark" autocomplete="off" value="@if(old('other_charge_remark')){{ old('other_charge_remark') }}@else{{$waybill->other_charge_remark}}@endif"  >
-                                </div>
-                                @error('other_charge')
-                                <span class="invalid-feedback" role="alert">
-                                    <strong>{{ $message }}</strong>
-                                </span>
-                                @enderror
-                            </div>
+
                             <div class="form-group row" style="margin-bottom: 20px">
                                 <label for="logistic_id" class="col-2 col-form-label text-right text-primary">承运商 *</label>
                                 <div class="col-3" style="position: relative">
                                     <select class="form-control @error('logistic_id') is-invalid @enderror" id="logistic_id" name="logistic_id"
                                             :class="errors['logistic_id'] ? 'is-invalid' :''"  v-model="waybill.logistic_id">
-                                        <option v-for="logistic in logistics" :value="logistic.id">@{{logistic.name}}</option>
+                                        <option v-for="logistic in logistics" :value="logistic.id" v-if="logistic.tag.indexOf(waybill.type)!==-1">@{{logistic.name}}</option>
                                     </select>
                                 </div>
                                 <label for="carrier_bill" class="col-2 col-form-label text-right">承运商单号</label>
@@ -93,6 +57,7 @@
                                     <strong class="">@{{ errors['logistic_id'][0] }}</strong>
                                 </div>
                             </div>
+
                             <div v-if="waybill.logistic_id == 15 || waybill.type=='德邦物流'" style="background: black">
                                 <div class="form-group row">
                                     <label for="cargo_name" class="col-2 col-form-label text-right text-primary">货物名称 *</label>
@@ -185,7 +150,6 @@
                                     </div>
                                 </div>
                             </div>
-
                             <div v-if="waybill.type=='专线'">
                                 <div class="form-group row">
                                     <label for="origination_city_id" class="col-2 col-form-label text-right text-primary">始发市 *</label>
@@ -293,13 +257,10 @@
                             </div>
                             <div class="form-group row">
                                 <label for="amount" class="col-2 col-form-label text-right text-primary">计数</label>
-                                <div class="col-5">
+                                <div class="col-4 form-inline">
                                     <input type="number" class="form-control @error('amount') is-invalid @enderror"
                                            name="amount" autocomplete="off" v-model="waybill.amount" id="amount">
                                     @error('amount')<span class="invalid-feedback" role="alert"><strong>{{ $message }}</strong></span>@enderror
-                                </div>
-                                <label for="amount_unit_id" class=" col-form-label text-right ">单位：</label>
-                                <div class="col-1.5 form-inline">
                                     <label for="amount_unit_id" class="ml-1  @error('amount_unit_id') text-danger @enderror"  >件</label>
                                     <input id="amount_unit_id" type="radio" value="4" class="form-control form-control-sm ml-1"
                                            name="amount_unit_id" v-model="waybill.amount_unit_id">
@@ -307,6 +268,14 @@
                                     <input id="amount_unit_id1" type="radio" value="5" class="form-control form-control-sm ml-1"
                                            :class="errors['amount_unit_id'] ? 'is-invalid' :''" name="amount_unit_id" v-model="waybill.amount_unit_id">
                                 </div>
+                                <label for="mileage" class="col-2 col-form-label text-right text-muted" v-if="waybill.type=='直发车'">里程数</label>
+                                <div class="input-group col-3" v-if="waybill.type=='直发车'">
+                                    <input type="number" step="0.01" class="form-control @error('mileage') is-invalid @enderror"
+                                           name="mileage" autocomplete="off" v-model="waybill.mileage" id="mileage" >
+                                    <div class="input-group-append">
+                                        <span class="input-group-text">KM</span>
+                                    </div>
+                                </div>
                                 @error('amount_unit_id')
                                 <div class="col-2 form-inline">
                                     <label class="form-control-static text-danger small font-weight-bold">{{$message}}</label>
@@ -440,6 +409,35 @@
                                     <input type="text" class="form-control" disabled="disabled" :value="waybill.recipient_mobile" >
                                 </div>
                             </div>
+                            <div class="form-group row">
+                                <label for="charge" class="col-2 col-form-label text-right text-secondary">运输收费(元)</label>
+                                <div class="col-3">
+                                    <input type="number" step="0.01" min="0" class="form-control @error('charge') is-invalid @enderror"
+                                           id="charge" name="charge" v-model="waybill.charge" >
+                                </div>
+                                <label for="other_charge" class="col-2 col-form-label text-right text-muted">其他收费(元)</label>
+                                <div class="col-3">
+                                    <input id="other_charge" type="number" step="0.01" class="form-control @error('other_charge') is-invalid @enderror"
+                                           name="other_charge" autocomplete="off" value="@if(old('other_charge')){{ old('other_charge') }}@else{{$waybill->other_charge}}@endif"  >
+                                </div>
+                                @error('charge')
+                                <span class="invalid-feedback" role="alert">
+                                    <strong>{{ $message }}</strong>
+                                </span>
+                                @enderror
+                                @error('other_charge')
+                                <span class="invalid-feedback" role="alert">
+                                    <strong>{{ $message }}</strong>
+                                </span>
+                                @enderror
+                            </div>
+                            <div class="form-group row">
+                                <label for="other_charge_remark" class="col-2 col-form-label text-right text-muted">其他收费备注</label>
+                                <div class="col-8">
+                                    <input type="text" class="form-control" id="other_charge_remark"
+                                           name="other_charge_remark" autocomplete="off" value="@if(old('other_charge_remark')){{ old('other_charge_remark') }}@else{{$waybill->other_charge_remark}}@endif"  >
+                                </div>
+                            </div>
                             <div class="form-group row" id="ordering_remark">
                                 <label class="col-2 col-form-label text-right text-secondary">下单备注</label>
                                 <div class="col-8">
@@ -464,7 +462,7 @@
             data:{
                 cities:[@foreach($cities as $city){id:'{{$city->id}}',name:'{{$city->name}}'},@endforeach],
                 units:[@foreach($units as $unit){id:'{{$unit->id}}',name:'{{$unit->name}}',},@endforeach],
-                logistics:[@foreach($logistics as $logistic){id:'{{$logistic->id}}',name:'{{$logistic->name}}',},@endforeach],
+                logistics:[@foreach($logistics as $logistic){id:'{{$logistic->id}}',name:'{{$logistic->name}}',tag:"{{$logistic->tag}}"},@endforeach],
                 carTypes:[@foreach($carTypes as $carType){!! $carType !!},@endforeach],
                 deliveryTypes:[@foreach($deliveryTypes as $deliveryType){!! $deliveryType !!},@endforeach],
                 errors:[],
@@ -480,7 +478,7 @@
 
                     charge:'{{ old("charge") ?? $waybill->charge}}',
                     logistic_id:'{{old("logistic_id") ?? $waybill->logistic_id}}',
-                    carrier_bill:'{{old("carrier_bill") ?? $waybill->carrier_bill}}',
+                    carrier_bill:'{{ old("carrier_bill") ?? $waybill->carrier_bill}}',
                     type:'{{ old("type") ?? $waybill->type}}',
                     warehouse_weight_other:'{{ old("warehouse_weight_other") ?? $waybill->warehouse_weight_other}}',
                     warehouse_weight_unit_id_other:'{{ old("warehouse_weight_unit_id_other") ?? $waybill->warehouse_weight_unit_id_other }}',
@@ -626,10 +624,10 @@
 
                     let _this=this;
                     axios.post(url,{logistic_id:logistic_id,carrier_weight:[carrier_weight,carrier_weight_other],
-                        carrier_weight_unit_id:[carrier_weight_unit_id,carrier_weight_unit_id_other],destination_city_id:destination_city_id,
-                        cargo_name:cargo_name, total_number:total_number,total_weight:total_weight, deliveryType_id:deliveryType_id
-                        ,order_type:order_type, transport_type: transport_type, pay_type:pay_type, back_sign_bill:back_sign_bill,package_service:package_service
-                    }).then(
+                            carrier_weight_unit_id:[carrier_weight_unit_id,carrier_weight_unit_id_other],destination_city_id:destination_city_id,
+                            cargo_name:cargo_name, total_number:total_number,total_weight:total_weight, deliveryType_id:deliveryType_id
+                            ,order_type:order_type, transport_type: transport_type, pay_type:pay_type, back_sign_bill:back_sign_bill,package_service:package_service
+                    }) .then(
                             function (response) {
 
                                 if (response.data.error){