Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

app/Services/WaybillService.php

@@ -126,10 +126,10 @@ class WaybillService
             $waybills->whereBetween("mileage",[(int)$param["mileage"][0] ?? 0,(int)$param["mileage"][1]] ?? 0);
             unset($param["mileage"]);
         }
-        if ($param["carrier_weight_other"] ?? false){
-            $param["carrier_weight_other"] = explode("-",$param["carrier_weight_other"]);
-            $waybills->whereBetween("carrier_weight_other",[(int)$param["carrier_weight_other"][0] ?? 0,(int)$param["carrier_weight_other"][1]] ?? 0);
-            unset($param["carrier_weight_other"]);
+        if ($param["warehouse_weight_other"] ?? false){
+            $param["warehouse_weight_other"] = explode("-",$param["warehouse_weight_other"]);
+            $waybills->whereBetween("warehouse_weight_other",[(int)$param["warehouse_weight_other"][0] ?? 0,(int)$param["warehouse_weight_other"][1]] ?? 0);
+            unset($param["warehouse_weight_other"]);
         }
         $columnQueryRules=[
             'waybill_number' => ['batch' => ''],

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

@@ -419,8 +419,8 @@
                         {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:'mileage',type:'input',tip: '里程：范围-范围',placeholder: '里程'},
+                        {name:'warehouse_weight_other',type:'input',tip: '仓库计重：范围-范围',placeholder: '仓库计重'},
                         {name:'carType_id',type:'select',placeholder: '车型',data:this.carTypes},
                     ]
                 ];