单位修改

app/WMSWaybill.php

@@ -10,6 +10,6 @@ class WMSWaybill extends Model
     use ModelTimeFormat;
     //
     protected $fillable=['OrderNo','CustomerID','CarrierID','ConsigneeName',
-        'C_Tel1','C_Address1','C_Province','C_City','C_District'];
+        'C_Tel1','C_Address1','C_Province','C_City','C_District','ReservedField01'];
 
 }

app/Waybill.php

@@ -13,7 +13,7 @@ class Waybill extends Model
         'status','type','waybill_number','owner_id','wms_bill_number','origination','destination','recipient','recipient_mobile','charge','ordering_remark',
         'carrier_id','carrier_bill','origination_city_id','destination_city_id','warehouse_weight','warehouse_weight_unit_id','carrier_weight','carrier_weight_unit_id','carType_id',
         'car_owner_info','fee','pick_up_fee','other_fee','collect_fee','dispatch_remark','waybill_price_model_id','warehouse_weight_other','warehouse_weight_unit_id_other'
-        ,'carrier_weight_other','carrier_weight_unit_id_other',
+        ,'carrier_weight_other','carrier_weight_unit_id_other','source_bill',
     ];
     protected $appends=[
         'origination_city_name',

resources/views/waybill/edit.blade.php

@@ -135,7 +135,7 @@
                                 <select class="form-control @error('destination_city_id') is-invalid @enderror" name="destination_city_id" :class="errors['destination_city_id'] ? 'is-invalid' :''" 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" v-model="destination_city">
+                                <input class="form-control-sm tooltipTarget" placeholder="输入关键字定位" @input="destination_city_id" v-model="destination_city" title="若无法显示县级市，可点击后方按钮手动添加" style="vertical-align: middle">
                                 <button type="button" class="btn btn-outline-info btn-sm" @click="addCounty" style="transform: scale(0.9)">添加市/县</button>
                             </div>
                         </div>
@@ -158,7 +158,7 @@
                             </div>
 
                             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                            <label for="warehouse_weight_other" class="col-form-label text-right ">&nbsp;&nbsp;&nbsp;仓库重</label>
+                            <label for="warehouse_weight_other" class="col-form-label text-right ">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;仓库重</label>
                             <div class="col-2">
                                 <input type="text" class="form-control @error('warehouse_weight_other') is-invalid @enderror"
                                        name="warehouse_weight_other" autocomplete="off" value="@if(old('warehouse_weight_other')){{ old('warehouse_weight_other') }}@else{{$waybill->warehouse_weight_other}}@endif"  >
@@ -346,7 +346,7 @@
                 }
                 if (!this.waybillPriceModel.carrier_weight_unit_id){
                     this.units.every(function (unit) {
-                        if (unit.name=="m3"){
+                        if (unit.name=="m³"){
                             _this.waybillPriceModel.carrier_weight_unit_id=unit.id;
                             return false;
                         }
@@ -364,7 +364,7 @@
                 }
                 if (!this.waybillPriceModel.warehouse_weight_unit_id){
                     this.units.every(function (unit) {
-                        if (unit.name=="m3"){
+                        if (unit.name=="m³"){
                             _this.waybillPriceModel.warehouse_weight_unit_id=unit.id;
                             return false;
                         }
@@ -448,7 +448,6 @@
                         if (destination_id)this.waybillPriceModel.destination_city_id=destination_id;
                     }
                 }
-
             },
             methods:{
                 {{--计费模型阶段保留--}}