运输管理部分需求，header.js增加表格大小变化

resources/js/queryForm/header.js

@@ -270,6 +270,7 @@ window.Header = function getHeader(object) {
                         trs[j].children[moveTd.index].firstElementChild.style.width = newWidth;
                         trs[j].children[moveTd.index].style.minWidth = newWidth;
                     }
+                    _targetDom.style.width = _targetDom.offsetWidth+diff+"px";
                     moveTd.oldX = event.clientX;
                 }
             }
@@ -612,5 +613,6 @@ window.Header = function getHeader(object) {
         createSetting();
         _exeHid([]);
         bindGlobalEvent();
+        _targetDom.style.width = _targetDom.offsetWidth+"px";
     };
 };

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

@@ -106,69 +106,50 @@
                     </div>
                     {{--编辑区--}}
                     <div class="form-group row">
-                        <label  class="col-2 col-form-label text-right text-secondary">运输收费(元)</label>
+                        <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 @error('charge') is-invalid @enderror"
+                            <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">
+                        <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
-                    </div>
-
-                    <div class="form-group row">
-                        <label for="other_charge" class="col-2 col-form-label text-right text-muted">其他收费(元)</label>
-                        <div class="col-8">
-                            <input type="text" 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"  >
-                            @error('other_charge')
-                            <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $message }}</strong>
-                                    </span>
-                            @enderror
-                        </div>
-                    </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 @error('other_charge') is-invalid @enderror"
-                                   name="other_charge_remark" autocomplete="off" value="@if(old('other_charge_remark')){{ old('other_charge_remark') }}@else{{$waybill->other_charge_remark}}@endif"  >
-                            @error('other_charge_remark')
-                            <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $message }}</strong>
-                                    </span>·
-                            @enderror
-                        </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-8" style="position: relative">
+                        <div class="col-3" style="position: relative">
                             <select class="form-control @error('logistic_id') is-invalid @enderror" id="logistic_id" style="width: 30%; " 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>
                             </select>
-                            <div v-if="errors['logistic_id'] && errors['logistic_id'].length>0" class="invalid-feedback" role="alert" style="position: relative">
-                            <strong class="">@{{ errors['logistic_id'][0] }}</strong>
-                            </div>
-                            <span class="col-sm-5" style="position: absolute;height: 15px;padding: 0">
-                                <p class="form-control-static text-danger small font-weight-bold" style="">{{ $errors->first('logistic_id') }}</p>
-                            </span>
                         </div>
-
-                    </div>
-                    <div class="form-group row">
-                        <label class="col-2 col-form-label text-right">承运商单号</label>
-                        <div class="col-8">
+                        <label for="carrier_bill" class="col-2 col-form-label text-right">承运商单号</label>
+                        <div class="col-3">
                             <input type="text" class="form-control @error('carrier_bill') is-invalid @enderror"
                                    name="carrier_bill" autocomplete="off" v-model="waybill.carrier_bill"  id="carrier_bill">
-                            @error('carrier_bill')
-                            <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                            @enderror
+                        </div>
+                        <div v-if="errors['logistic_id'] && errors['logistic_id'].length>0" class="invalid-feedback" role="alert" style="position: relative">
+                            <strong class="">@{{ errors['logistic_id'][0] }}</strong>
                         </div>
                     </div>
                     <div v-if="waybill.type=='专线'">
@@ -305,28 +286,21 @@
                     </div>
                     <div class="form-group row">
                         <label for="mileage" class="col-2 col-form-label text-right text-dark">里程数</label>
-                        <div class="col-8">
-                            <input type="number" class="form-control @error('mileage') is-invalid @enderror"
+                        <div class="col-3">
+                            <input type="number" step="0.01" class="form-control @error('mileage') is-invalid @enderror"
                                    name="mileage" autocomplete="off" v-model="waybill.mileage" id="mileage" >
-                            @error('mileage')
-                            <span class="invalid-feedback" role="alert">
-                                <strong>{{ $message }}</strong>
-                            </span>
-                            @enderror
                         </div>
                     </div>
                     <div v-if="waybill.type=='直发车'">
                         <div class="form-group row">
                             <label for="carType_id" class="col-2 col-form-label text-right">车型</label>
-                            <div class="col-8">
+                            <div class="col-3">
                                 <select class="form-control" name="carType_id" style="width: 30%;" v-model="waybill.carType_id" id="carType_id">
                                     <option v-for="carType in carTypes" :value="carType.id">@{{ carType.name }}</option>
                                 </select>
                             </div>
-                        </div>
-                        <div class="form-group row">
                             <label for="car_owner_info" class="col-2 col-form-label text-right">车辆信息</label>
-                            <div class="col-8">
+                            <div class="col-3">
                                 <input type="text" class="form-control"
                                        name="car_owner_info" autocomplete="off" v-model="waybill.car_owner_info" id="car_owner_info" >
                             </div>

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

@@ -389,30 +389,31 @@
                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'created_at_start',type:'time',tip:['选择显示创建日期的起始时间','选择显示创建日期的起始时间']},
-                        {name:'updated_at_start',type:'time',tip:['选择显示完结日期的起始时间','选择显示完结日期的起始时间']},
-                        {name:'deliver_at_start',type:'time',tip:['选择显示发货日期的起始时间','选择显示发货日期的起始时间']},
                         {name:'origination',type:'input',tip:'始发地：可在左侧增加百分号(%)进行模糊搜索',placeholder: '始发地'},
+                        {name:'updated_at_start',type:'time',tip:['选择显示完结日期的起始时间','选择显示完结日期的起始时间']},
                         {name:'carrier_bill',type:'input',tip:'可支持多承运商单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '承运商单号'},
+                        {name:'deliver_at_start',type:'time',tip:['选择显示发货日期的起始时间','选择显示发货日期的起始时间']},
                         {name:'status',type:'select',placeholder: '运单状态',data:this.status},
-                        {name:'source_bill',type:'input',tip: '可支持多上游单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '上游单号'},
-                        {name:'recipient',type:'input',tip: '可支持多收货人姓名：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人姓名'},
-                        {name:'car_owner_info',type:'input',tip: '车辆信息：可在左侧增加百分号(%)进行模糊搜索',placeholder: '车辆信息'},
-                        {name:'mileage',type:'input',tip: '里程：可在左侧增加百分号(%)进行模糊搜索',placeholder: '里程'},
                     ],
                     [
                         {name:'wms_bill_number',type:'input',tip:'可支持多WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
                         {name:'created_at_end',type:'time',tip:['选择显示创建日期的结束时间','选择显示创建日期的结束时间']},
-                        {name:'updated_at_end',type:'time',tip:['选择显示完结日期的结束时间','选择显示完结日期的结束时间']},
-                        {name:'deliver_at_end',type:'time',tip:['选择显示发货日期的结束时间','选择显示发货日期的结束时间']},
                         {name:'destination',type:'input',tip:'目的地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '目的地'},
+                        {name:'updated_at_end',type:'time',tip:['选择显示完结日期的结束时间','选择显示完结日期的结束时间']},
                         {name:'waybill_number',type:'input',tip:'运单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '运单号'},
-                        // {name:'logistic_id',type:'select',placeholder: '承运商',data:this.logistics},
+                        {name:'deliver_at_end',type:'time',tip:['选择显示发货日期的结束时间','选择显示发货日期的结束时间']},
                         {name:'logistic_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的承运商'],
                             placeholder:['承运商','定位或多选承运商'],data:this.logistics},
+                    ],
+                    [
+                        {name:'source_bill',type:'input',tip: '可支持多上游单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '上游单号'},
+                        {name:'recipient',type:'input',tip: '可支持多收货人姓名：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人姓名'},
                         {name:'recipient_mobile',type:'input',tip: '可支持多收货人电话：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人电话'},
+                        {name:'car_owner_info',type:'input',tip: '车辆信息：可在左侧增加百分号(%)进行模糊搜索',placeholder: '车辆信息'},
+                        {name:'mileage',type:'input',tip: '里程：可在左侧增加百分号(%)进行模糊搜索',placeholder: '里程'},
                         {name:'carrier_weight_other',type:'input',tip: '仓库计重：可在左侧增加百分号(%)进行模糊搜索',placeholder: '仓库计重'},
                         {name:'carType_id',type:'select',placeholder: '车型',data:this.carTypes},
-                    ],
+                    ]
                 ];
                 let param=[];
                 this.$set(param,"uriType",'{{$uriType}}');
@@ -906,6 +907,7 @@
                     let target = $(e.target);
                     let top = target.parent().find('.top');
                     let tip = target.parent().find('.toptd');
+                    for (let i=0;i<tip.length;i++)if(!tip[i] || tip[i].style.display==='none')tip.splice(i,1);
                     top.hide();
                     tip.tooltip('show');
                 },