筛选框支持批量筛选，问题件添加空条件筛选

app/Filters/OrderIssueFilters.php

@@ -373,9 +373,15 @@ class OrderIssueFilters
         if(is_string($user_work_groups)){
             $user_work_groups = explode(',', $user_work_groups);
         }
-        $this->queryBuilder->whereIn('order_issues.id',function($query)use($user_work_groups){
-            $query->from('order_issue_user_workgroup')->selectRaw('order_issue_id')->whereIn('user_workgroup_id',$user_work_groups);
-        });
+        if(in_array('空',$user_work_groups)){
+            $this->queryBuilder->whereNotIn('order_issues.id',function($query)use($user_work_groups){
+                $query->from('order_issue_user_workgroup')->selectRaw('order_issue_id');
+            });
+        }else{
+            $this->queryBuilder->whereIn('order_issues.id',function($query)use($user_work_groups){
+                $query->from('order_issue_user_workgroup')->selectRaw('order_issue_id')->whereIn('user_workgroup_id',$user_work_groups);
+            });
+        }
     }
 
     public function sendOrderLogisticNumber($sendOrderLogisticNumber)

app/Http/Controllers/OrderIssueController.php

@@ -42,6 +42,8 @@ class OrderIssueController extends Controller
         }
         $owners = app(OwnerService::class)->getAuthorizedOwners();
         $orderIssues = OrderIssue::query()->filter($filter)->defaultWith()->paginate($request['paginate'] ?? 50);
+//        $orderIssues = OrderIssue::query()->filter($filter)->defaultWith()->toSql();
+//        dd($orderIssues);
         $orderIssueType = OrderIssueType::all();
         $qualityLabel = QualityLabel::all();
         $logistics = Logistic::all();

app/Services/AllInventoryService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Owner;
+use App\Traits\ModelSearchWay;
 use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
@@ -10,6 +11,8 @@ use App\Traits\ServiceAppAop;
 class AllInventoryService
 {
     use ServiceAppAop;
+    use ModelSearchWay;
+
     protected $modelClass=AllInventory::class;
     public function getSql(array $params, $page=null, $paginate=null){
         $ownerCodes=Owner::filterAuthorities()->select('code')->get();
@@ -57,15 +60,15 @@ class AllInventoryService
 //        if ($TOLocation)$sql .= " and 库位 like '".$TOLocation."' ";
 //        if ($SKU)$sql.=" and 产品编码 like '".$SKU."' ";
 //        if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."' ";
-        if ($TOLocation)$sql=$this->searchWay($sql,$TOLocation,"库位");
-        if ($SKU)$sql=$this->searchWay($sql,$SKU,"产品编码");
-        if ($LotAtt05)$sql=$this->searchWay($sql,$LotAtt05,"属性仓");
+        if ($TOLocation)$sql=$this->sqlSearchWay($sql,$TOLocation,"库位");
+        if ($SKU)$sql=$this->sqlSearchWay($sql,$SKU,"产品编码");
+        if ($LotAtt05)$sql=$this->sqlSearchWay($sql,$LotAtt05,"属性仓");
         if ($date_start)$sql.=" and 创建时间 > to_date('".$date_start." 00:00:00','yyyy-mm-dd hh24:mi:ss') ";
         if ($date_end)$sql.=" and 创建时间 < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
         if ($LotAtt02_start)$sql.=" and 失效日期 >='".$LotAtt02_start." 00:00:00' ";
         if ($LotAtt02_end)$sql.=" and 失效日期 <='".$LotAtt02_end." 23:59:59' ";
 //        if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."' ";
-        if ($ALTERNATE_SKU1)$sql=$this->searchWay($sql,$ALTERNATE_SKU1,"产品条码");
+        if ($ALTERNATE_SKU1)$sql=$this->sqlSearchWay($sql,$ALTERNATE_SKU1,"产品条码");
         if ($page&&$paginate)$sql.="  and ROWNUM<='".$page*$paginate."'";
         $sql.=' )  ';
         if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
@@ -75,22 +78,4 @@ class AllInventoryService
     public function paginate(array $params){
         return DB::connection('oracle')->select(DB::raw($this->getSql($params,$params['page'] ?? 1, $params['paginate'] ?? 50)));
     }
-    private function searchWay($sql,$condition,$column)
-    {
-        if ($condition){
-            if (strpos($condition, ',') || strpos($condition, '，') || strpos($condition, ' ')) {
-                $arr = array_filter(preg_split('/[,， ]+/is', $condition));
-                $sql .= ' and '.$column.' in (';
-                foreach ($arr as $index => $arr){
-                    if ($index != 0)$sql .= ',';
-                    $sql .= "'".$arr."'";
-                }
-                $sql .= ') ';
-                unset($condition);
-            } else {
-                $sql .= " and $column like '".$condition."' ";
-            }
-        }
-        return $sql;
-    }
 }

app/Services/InventoryService.php

@@ -7,6 +7,7 @@ use App\inventoryDailyLog;
 use App\InventoryDailyLoggingOwner;
 use App\Owner;
 use App\Services\common\QueryService;
+use App\Traits\ModelSearchWay;
 use Illuminate\Support\Facades\DB;
 use App\Traits\ServiceAppAop;
 
@@ -14,6 +15,7 @@ use App\Traits\ServiceAppAop;
 class InventoryService
 {
     use ServiceAppAop;
+    use ModelSearchWay;
     protected $modelClass=Inventory::class;
     public function getSql(array $params,$page=null,$paginate=null){
         $ownerCodes=Owner::filterAuthorities()->select('code')->get();
@@ -40,8 +42,8 @@ class InventoryService
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
 //        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
 //        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
-        if ($TOLocation)$sql=$this->searchWay($sql,$TOLocation,"TOLocation");
-        if ($SKU)$sql=$this->searchWay($sql,$SKU,"FMSKU");
+        if ($TOLocation)$sql=$this->sqlSearchWay($sql,$TOLocation,"TOLocation");
+        if ($SKU)$sql=$this->sqlSearchWay($sql,$SKU,"FMSKU");
         if ($customerid){
             $sql .= ' and TOCustomerID in (';
             $arr = explode(',',$customerid);
@@ -66,8 +68,8 @@ class InventoryService
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
 //        if ($TOLocation)$sql .= " and FMLOCATION like '".$TOLocation."' ";
 //        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
-        if ($TOLocation)$sql=$this->searchWay($sql,$TOLocation,"FMLOCATION");
-        if ($SKU)$sql=$this->searchWay($sql,$SKU,"FMSKU");
+        if ($TOLocation)$sql=$this->sqlSearchWay($sql,$TOLocation,"FMLOCATION");
+        if ($SKU)$sql=$this->sqlSearchWay($sql,$SKU,"FMSKU");
         if ($customerid){
             $sql .= ' and FMCUSTOMERID in (';
             $arr = explode(',',$customerid);
@@ -92,8 +94,8 @@ class InventoryService
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
 //        if ($TOLocation)$sql .= " and FMLocation like '".$TOLocation."' ";
 //        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
-        if ($TOLocation)$sql=$this->searchWay($sql,$TOLocation,"FMLocation");
-        if ($SKU)$sql=$this->searchWay($sql,$SKU,"FMSKU");
+        if ($TOLocation)$sql=$this->sqlSearchWay($sql,$TOLocation,"FMLocation");
+        if ($SKU)$sql=$this->sqlSearchWay($sql,$SKU,"FMSKU");
 
         if ($customerid){
             $sql .= ' and FMCUSTOMERID in (';
@@ -119,8 +121,8 @@ class InventoryService
         if ($date_end) $sql.=" and addtime < to_date('".$date_end." 23:59:59','yyyy-mm-dd hh24:mi:ss') ";
 //        if ($TOLocation)$sql .= " and TOLocation like '".$TOLocation."' ";
 //        if ($SKU)$sql.=" and FMSKU like '".$SKU."' ";
-        if ($TOLocation)$sql=$this->searchWay($sql,$TOLocation,"TOLocation");
-        if ($SKU)$sql=$this->searchWay($sql,$SKU,"FMSKU");
+        if ($TOLocation)$sql=$this->sqlSearchWay($sql,$TOLocation,"TOLocation");
+        if ($SKU)$sql=$this->sqlSearchWay($sql,$SKU,"FMSKU");
 
         if ($customerid){
             $sql .= ' and TOCustomerID in (';
@@ -150,34 +152,17 @@ class InventoryService
         $sql.=' , storeStatus.QTY, storeStatus.QtyAllocated,stockLog.客户  ';
         $sql.=' )result where 1=1 ';
 //        if ($LotAtt05)$sql .=" and 属性仓 like '".$LotAtt05."' ";
-        if ($LotAtt05)$sql=$this->searchWay($sql,$LotAtt05,"属性仓");
+        if ($LotAtt05)$sql=$this->sqlSearchWay($sql,$LotAtt05,"属性仓");
         if ($LotAtt02_start)$sql.=" and 失效日期 >='".$LotAtt02_start." 00:00:00' ";
         if ($LotAtt02_end)$sql.=" and 失效日期 <='".$LotAtt02_end." 23:59:59' ";
 //        if ($ALTERNATE_SKU1)$sql.=" and 产品条码 like '".$ALTERNATE_SKU1."' ";
-        if ($ALTERNATE_SKU1)$sql=$this->searchWay($sql,$ALTERNATE_SKU1,"产品条码");
+        if ($ALTERNATE_SKU1)$sql=$this->sqlSearchWay($sql,$ALTERNATE_SKU1,"产品条码");
         if ($page&&$paginate)$sql.="  and ROWNUM<='".$page*$paginate."'";
         $sql.=' )  ';
         if ($page&&$paginate)$sql.="  where rn>'".($page-1)*$paginate."'";
         return $sql;
     }
-    private function searchWay($sql,$condition,$column)
-    {
-        if ($condition){
-            if (strpos($condition, ',') || strpos($condition, '，') || strpos($condition, ' ')) {
-                $arr = array_filter(preg_split('/[,， ]+/is', $condition));
-                $sql .= ' and '.$column.' in (';
-                foreach ($arr as $index => $arr){
-                    if ($index != 0)$sql .= ',';
-                    $sql .= "'".$arr."'";
-                }
-                $sql .= ') ';
-                unset($condition);
-            } else {
-                $sql .= " and $column like '".$condition."' ";
-            }
-        }
-        return $sql;
-    }
+
 
     public function paginate(array $params)
     {

app/Services/LaborReportService.php

@@ -41,11 +41,12 @@ class LaborReportService
             });
         }else unset($params['is_export']);
         $columnQueryRules=[
-            'enter_number' => ['timeLimit' => 15],
+            'enter_number' => ['batch'=>'','timeLimit' => 15],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'identity_number' => ['timeLimit' => 15],
-            'name' => ['like' => ''],
+            'identity_number' => ['batch'=>'','timeLimit' => 15],
+            'name' => ['batch' => ''],
+            'mobile_phone' => ['batch' => ''],
             'user_workgroup_id' => ['multi' => ','],
             'labor_company_id' => ['multi' => ','],
             'id' => ['multi' => ',']

app/Services/OrderService.php

@@ -22,6 +22,7 @@ use App\RejectedBill;
 use App\Services\common\BatchUpdateService;
 use App\Services\common\DataHandlerService;
 use App\Shop;
+use App\Traits\ModelSearchWay;
 use App\ValueStore;
 use App\Warehouse;
 use Carbon\Carbon;
@@ -36,6 +37,7 @@ use App\Traits\ServiceAppAop;
 class OrderService
 {
     use ServiceAppAop;
+    use ModelSearchWay;
     protected $modelClass=Order::class;
     /**
      * @var OracleDOCOrderHeaderService $oracleDOCOrderHeaderService
@@ -89,9 +91,8 @@ class OrderService
         if ($ordernos){
             $sql .= " AND orderno IN ".$ordernos;
         }
-        if ($c_contact){
-            $sql .= " AND c_contact like '".$c_contact."'";
-        }
+//        if ($c_contact) $sql .= " AND c_contact like '".$c_contact."'";
+        if ($c_contact)$sql=$this->sqlSearchWay($sql,$c_contact,'c_contact');
         if ($c_tel2){
             $sql .= " AND (c_tel2 like '".$c_tel2."' OR c_tel1 like '".$c_tel2."')";
         }
@@ -154,11 +155,13 @@ class OrderService
                 $sql.=")";
             }
         }
-        if ($orderno)$sql.=" and orderno like '".$orderno."%'";
+//        if ($orderno)$sql.=" and orderno like '".$orderno."%'";
+        if ($orderno)$sql=$this->sqlSearchWay($sql,$orderno,'orderno');
         if ($codename_c&&$codename_c_end)$sql.=" and sostatus between '".$codename_c."' and '".$codename_c_end."'";
         if ($codename_c&&!$codename_c_end)$sql.=" and sostatus = '".$codename_c."'";
         if (!$codename_c&&$codename_c_end)$sql.=" and sostatus = '".$codename_c_end."'";
-        if ($carriername)$sql.=" and carriername like '".$carriername."%'";
+//        if ($carriername)$sql.=" and carriername like '".$carriername."%'";
+        if ($carriername)$sql=$this->sqlSearchWay($sql,$carriername,'carriername');
         if ($soreference1){
             $arr=array_values(array_filter(preg_split('/[,， ]+/is', $soreference1)));
             if (count($arr)==1){
@@ -176,7 +179,8 @@ class OrderService
                 $sql.=")";
             }
         }
-        if ($waveno)$sql.=" and WaveNo like '".$waveno."%'";
+//        if ($waveno)$sql.=" and WaveNo like '".$waveno."%'";
+        if ($waveno)$sql=$this->sqlSearchWay($sql,$waveno,'WaveNo');
         if ($issuepartyname)$sql.=" and issuepartyname like '".$issuepartyname."%'";
         if ($notes){
             if ($addtime&&$addtime!=0)$sql.=" and addtime >= to_date('".date('Y-m-d H:i:s',strtotime("-".$addtime." day"))."','yyyy-mm-dd hh24:mi:ss')";
@@ -211,12 +215,9 @@ class OrderService
                 $sql.=")";
             }
         }
-        if ($edisendflag2){
-            $sql.=" and edisendflag2 like '".$edisendflag2."%'";
-        }
-        if ($edisendflag){
-            $sql.=" and edisendflag like '".$edisendflag."%'";
-        }
+        if ($edisendflag2) $sql.=" and edisendflag2 like '".$edisendflag2."%'";
+
+        if ($edisendflag) $sql.=" and edisendflag like '".$edisendflag."%'";
         return $sql;
     }
 

app/Services/OwnerFeeDetailService.php

@@ -24,8 +24,8 @@ class OwnerFeeDetailService
             'worked_at_end' => ['alias' => 'worked_at', 'endDate' => ''],
             'owner_id' => ['multi' => ','],
             'id' => ['multi' => ','],
-            'operation_bill' => ['like' => ''],
-            'logistic_bill' => ['like' => ''],
+            'operation_bill' => ['batch' => ''],
+            'logistic_bill' => ['batch' => ''],
         ];
         if ($params["customer_id"] ?? false){
             $builder->whereHas('owner',function ($query)use(&$params){

app/Traits/ModelSearchWay.php

@@ -23,4 +23,23 @@ trait ModelSearchWay
         }
         return $query;
     }
+
+    private function sqlSearchWay($sql,$condition,$column)
+    {
+        if ($condition){
+            if (strpos($condition, ',') || strpos($condition, '，') || strpos($condition, ' ')) {
+                $arr = array_filter(preg_split('/[,， ]+/is', $condition));
+                $sql .= ' and '.$column.' in (';
+                foreach ($arr as $index => $arr){
+                    if ($index != 0)$sql .= ',';
+                    $sql .= "'".$arr."'";
+                }
+                $sql .= ') ';
+                unset($condition);
+            } else {
+                $sql .= " and $column like '".$condition."' ";
+            }
+        }
+        return $sql;
+    }
 }

resources/views/finance/instantBill.blade.php

@@ -146,11 +146,11 @@
                         {name:'worked_at_start',type:'dateTime',tip:'起始作业日期'},
                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的项目'],
                             placeholder:['项目','定位或多选项目'],data:this.owners},
-                        {name: 'operation_bill', type: 'input', tip: '发/收/退/提货单号：可在两侧增加百分号(%)进行模糊搜索', placeholder: '单据号'},
+                        {name: 'operation_bill', type: 'input', tip: '可支持多发/收/退/提货单号：模糊搜索可在两侧增加百分号(%)进行', placeholder: '单据号'},
                     ],[
                         {name:'customer_id',type:'select',tip:'客户',placeholder: '客户',data:this.customers},
                         {name:'worked_at_end',type:'dateTime',tip:'结束作业日期'},
-                        {name:'logistic_bill', type: 'input', tip: '物流/快递单号：可在两侧增加百分号(%)进行模糊搜索', placeholder: '快递单号'},
+                        {name:'logistic_bill', type: 'input', tip: '可支持多物流/快递单号,模糊搜索可在两侧增加百分号(%)进行', placeholder: '快递单号'},
                         {name:'type',type:'select',tip:'类型',placeholder: '类型',data:this.types},
                     ],
                 ];
@@ -218,4 +218,4 @@
             },
         });
     </script>
-@stop
+@stop

resources/views/order/index/delivering.blade.php

@@ -285,13 +285,13 @@
                     [   {name:'codename_c',type:'select',placeholder:'订单状态',data:this.codes},
                         {name:'orderdate_start',type:'time',tip:['选择显示日期的起始时间','选择显示日期的起始时间'],
                             rules:{date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'relevance',default:[31,92,183,366]}}},
-                        {name:'orderno',type:'input',tip:'SO号，糊模查找需要在左边打上%符号',placeholder: 'SO号'},
-                        {name:'carriername',type:'input',tip:'',placeholder:'承运人'},
+                        {name:'orderno',type:'input',tip:'可支持多SO号，糊模查找需要在左边打上%符号',placeholder: 'SO号'},
+                        {name:'carriername',type:'input',tip:'可支持多承运人,糊模查找需要在左边打上%符号',placeholder:'承运人'},
                         {name:['notes','addtime'],type:'input_select',tip:['右侧选择查询范围，默认为一月内','查询范围，范围越短搜索越快'],placeholder: ['备注',''],
                             data:[{name:'31',value:'近一月'},{name:'92',value:'近三月'},{name:'183',value:'近半年'},{name:'366',value:'近一年'},{name:'0',value:'不限'},],
                             rules:{son:{addtime:{default:'31',required_without_all_if:['orderdate_start','orderdate_end']}},
                                 date_relevance:{date:['orderdate_start','orderdate_end'],relevance:'addtime',killing:'date',default:[31,92,183,366]}}},
-                        {name:'issuepartyname',type:'input',tip:'',placeholder: '店铺名称'},
+                        {name:'issuepartyname',type:'input',tip:'糊模查找需要在左边打上%符号',placeholder: '店铺名称'},
                         {name:'edisendflag2',type:'select',tip:'快递获取标记',placeholder: '快递获取标记',data:[{name:'Y',value:'是'},{name:'N',value:'否'},{name:'W',value:'错误'},]},
                         {name:'edisendflag',type:'select',tip:'接口回传标记',placeholder: '接口回传标记',data:[{name:'Y',value:'Y'},{name:'N',value:'N'},{name:'W',value:'W'},{name:'R',value:'R'},]}
                     ],
@@ -303,9 +303,9 @@
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'soreference5',type:'input',tip:'可支持多快递单号，糊模查找需要在左边打上%符号',placeholder: '多快递单号'},
                         {name:'soreference1',type:'input',tip:'客户订单号，糊模查找需要在左边打上%符号',placeholder: '客户订单号'},
-                        {name:'waveno',type:'input',tip:'波次编号，模糊查找需要在左边打上%的符号',placeholder: '波次编号'},
+                        {name:'waveno',type:'input',tip:'可支持多波次编号，模糊查找需要在左边打上%的符号',placeholder: '波次编号'},
                         {name:'alternate_sku1',type:'input',tip:'产品条码，模糊查找需要在左边打上%的符号',placeholder: '产品条码'},
-                        {name:'c_contact',type:'input',tip:'收货人名称：15天以内模糊搜索，15天以外精确搜索',placeholder:'收货人名称'},
+                        {name:'c_contact',type:'input',tip:'可支持多收货人名称：15天以内模糊搜索，15天以外精确搜索',placeholder:'收货人名称'},
                     ],
                     [
                         {name:'c_tel2',type:'input',tip:'收货人电话：15天以内模糊搜索，15天以外精确搜索',placeholder:'收货人电话'},

resources/views/order/issue/index.blade.php

@@ -788,7 +788,9 @@
                 userWorkGroup: [
                         @foreach($userWorkgroup as $item)
                     {name:{{$item->id}},value:'{{$item->name}}'},
-                    @endforeach],
+                    @endforeach
+                    {name:'空',value:'空'},
+                ],
                 userOwnerGroups:{!! $userOwnerGroups !!},
                 rejectingStatus: [
                     {name:'无',value:'无'},
@@ -871,8 +873,8 @@
                         placeholder: ['货主', '定位或多选货主'],
                         data: _this.owners
                     },
-                    {name: 'client_code', type: 'input', tip: '原始订单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '原始订单号'},
-                    {name: 'logistic_number', type: 'input', tip: ['输入原始运单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索'], placeholder: '运单号'},
+                    {name: 'client_code', type: 'input', tip: '可支持多客户订单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '客户订单号'},
+                    {name: 'logistic_number', type: 'input', tip: ['可支持原始运单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索'], placeholder: '原始运单号'},
                     {
                         name: 'logistic_id',
                         type: 'select_multiple_select',
@@ -880,17 +882,17 @@
                         placeholder: ['承运商', '定位或多选承运商'],
                         data: this.logistics
                     },
-                    {name: 'logistic_number_return', type: 'input', tip: '退回单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '退回单号'},
+                    {name: 'logistic_number_return', type: 'input', tip: '可支持多退回单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '退回单号'},
                     // {name: 'send_client_code', type: 'input', tip: '二次订单号：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '二次订单号'},
                     {name: ['shop_name','shop_name_limit_time'], type: 'input_select', tip: ['商铺:前或后加 百分号为单个模糊搜索，默认添加后%，否则为多条件精确搜索','查询范围越短，搜索速度越快'], placeholder: ['店铺',''],
                         data:log_content_range,
                         rules:[{son:{shop_name_limit_time:{default:'15',required_without_all_if:['created_at_start','created_at_end']}}}]},
                 ], [
                     {name: 'created_at_end', type: 'dateTime', tip: '登记结束日期'},
-                    {name: 'consignee_name', type: 'input', tip: '收货人名称：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '收货人名称'},
-                    {name: 'consignee_phone', type: 'input', tip: '收货人电话：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '收货人电话'},
-                    {name: 'good_barcode', type: 'input', tip: '条码：前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '条码'},
-                    {name: 'good_name', type: 'input', tip: '商品名:前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '商品名'},
+                    {name: 'consignee_name', type: 'input', tip: '可支持多收货人名称：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '收货人名称'},
+                    {name: 'consignee_phone', type: 'input', tip: '可支持多收货人电话：前或后加百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '收货人电话'},
+                    {name: 'good_barcode', type: 'input', tip: '可支持多条码：前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '条码'},
+                    {name: 'good_name', type: 'input', tip: '可支持多商品名:前或后加 百分号为单个模糊搜索，否则为多条件精确搜索', placeholder: '商品名'},
                     {name: 'id_quality_label', type: 'select', tip: '是否正品', placeholder: '是否正品', data: this.qualityLabel},
                     {name: 'is_imported', type: 'select', tip: '是否导入处理', placeholder: '是否导入处理', data: imported_status},
                     {name: 'user_workgroups', type: 'select_multiple_select', tip: ['事故责任方',''], placeholder: ['事故责任方',''], data: this.userWorkGroup},

resources/views/order/wave/search.blade.php

@@ -120,7 +120,7 @@
                 let data = [[
                     {name: 'start_time', type: 'dateTime', tip: '选择显示指定日期的起始时间', placeholder: ''},
                     {name: 'end_time', type: 'dateTime', tip: '选择显示指定日期的结束时间', placeholder: ''},
-                    {name: 'wave_num', type: 'input', tip: '波次编号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: ''},
+                    {name: 'wave_num', type: 'input', tip: '波次编号：如模糊搜索需要在条件前后输入%号，回车提交', placeholder: '波次编号'},
                 ]];
                 this.form = new query({
                     el: '#form_div',

resources/views/personnel/discharge/statement/index.blade.php

@@ -71,7 +71,7 @@
                     },
                     {name: 'created_at_start', type: 'dateTime', tip: '创建开始日期'},
                     {name: 'created_at_end', type: 'dateTime', tip: '创建结束日期'},
-                    {name: 'numbers', type: 'input', tip: '入库单号', placeholder: '入库单号'},
+                    {name: 'numbers', type: 'input', tip: '可支持多入库单号，模糊搜索可在两侧增加百分号(%)进行', placeholder: '入库单号'},
                     {name: 'status', type: 'select', tip: '状态', data: status, placeholder: '状态'},
                 ], [
                     {

resources/views/personnel/discharge/task/index.blade.php

@@ -99,7 +99,7 @@
                     },
                     {name: 'created_at_start', type: 'dateTime', tip: '创建开始日期'},
                     {name: 'created_at_end', type: 'dateTime', tip: '创建结束日期'},
-                    {name: 'numbers', type: 'input', tip: '入库单号',placeholder:'入库单号'},
+                    {name: 'numbers', type: 'input', tip: '可支持多入库单号，模糊搜索可在两侧增加百分号(%)进行',placeholder:'入库单号'},
                     {name: 'status', type: 'select', tip: '状态' , data: _this.status,placeholder:'状态'},
                     {name: 'income_remark', type: 'input', tip: '备注' , data: _this.status,placeholder:'备注'}
                 ]];

resources/views/personnel/laborReport/index.blade.php

@@ -439,14 +439,14 @@
                                 placeholder:['小组','定位或多选小组'],data:this.userWorkGroups},
                             {name:'labor_company_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的劳务所'],
                                 placeholder:['劳务所','定位或多选劳务所'],data:this.laborCompanies},
-                            {name:'enter_number',type:'input',tip:'进场编号:支持15天内模糊搜索，15天外精确搜索',placeholder: '进场编号'},
+                            {name:'enter_number',type:'input',tip:'可支持多进场编号:支持15天内模糊搜索',placeholder: '进场编号'},
                             {name:'is_export',type:'checkbox',data:[{name:true,value:'显示已退场'}]},
                         ],
                         [
                             {name:'created_at_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
-                            {name:'name',type:'input',tip:'',placeholder: '姓名'},
-                            {name:'mobile_phone',type:'input',tip:'',placeholder: '电话号'},
-                            {name:'identity_number',type:'input',tip:'',placeholder: '身份证号'},
+                            {name:'name',type:'input',tip:'可支持多姓名，模糊搜索可在两侧增加百分号(%)进行',placeholder: '姓名'},
+                            {name:'mobile_phone',type:'input',tip:'可支持多电话号，模糊搜索可在两侧增加百分号(%)进行',placeholder: '电话号'},
+                            {name:'identity_number',type:'input',tip:'可支持多身份证号:支持15天内模糊搜索',placeholder: '身份证号'},
                         ],
                     ];
                     this.form = new query({

resources/views/store/checkingReceive/mission.blade.php

@@ -114,7 +114,7 @@
                     {name:'created_at_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
                     {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                         placeholder:['货主','定位或多选货主'],data:_this.owners},
-                    {name:'asn',type:'input',tip:'ASN单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'ASN单号'},
+                    {name:'asn',type:'input',tip:'可支持多ASN单号：模糊搜索可在两侧增加百分号(%)进行',placeholder:'ASN单号'},
                 ]];
 
                 _this.form = new query({

resources/views/store/inStorage/index.blade.php

@@ -99,7 +99,7 @@
                     ],
                     [
                         {name:'created_at_end',type:'dateTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'asn_code',type:'input',tip:'进场编号:支持15天内模糊搜索，15天外精确搜索',placeholder: 'ASN单号'},
+                        {name:'asn_code',type:'input',tip:'可支持多asn编号:支持15天内模糊搜索，15天外精确搜索，模糊搜索可在两侧增加百分号(%)进行',placeholder: 'ASN单号'},
                         {name:'status',type:'select',placeholder: '订单状态',data:[{name:'完全收货',value:'完全收货'},{name:'部分收货',value:'部分收货'},
                                 {name:'已码盘',value:'已码盘'},{name:'订单创建',value:'订单创建'},{name:'ASN关闭',value:'ASN关闭'},{name:'等待释放',value:'等待释放'},{name:'收货取消',value:'收货取消'}]},
                         {name:'stored_method',type:'select',placeholder: '入库类型',data:[{name:'采购入库',value:'采购入库'},{name:'笕尚退货入库单',value:'笕尚退货入库单'},

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

@@ -374,19 +374,19 @@
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'created_at_start',type:'time',tip:['选择显示指定日期的起始时间','选择显示指定日期的起始时间']},
                         {name:'origination',type:'input',tip:'始发地：可在左侧增加百分号(%)进行模糊搜索',placeholder: '始发地'},
-                        {name:'carrier_bill',type:'input',tip:'承运商单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '承运商单号'},
+                        {name:'carrier_bill',type:'input',tip:'可支持多承运商单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '承运商单号'},
                         {name:'status',type:'select',placeholder: '运单状态',data:this.status},
-                        {name:'source_bill',type:'input',tip: '上游单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '上游单号'},
-                        {name:'recipient',type:'input',tip: '收货人姓名：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人姓名'},
+                        {name:'source_bill',type:'input',tip: '可支持多上游单号：可在左侧增加百分号(%)进行模糊搜索',placeholder: '上游单号'},
+                        {name:'recipient',type:'input',tip: '可支持多收货人姓名：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人姓名'},
                         {name:'car_owner_info',type:'input',tip: '车辆信息：可在左侧增加百分号(%)进行模糊搜索',placeholder: '车辆信息'},
                     ],
                     [
-                        {name:'wms_bill_number',type:'input',tip:'WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
+                        {name:'wms_bill_number',type:'input',tip:'可支持多WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
                         {name:'created_at_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
                         {name:'destination',type:'input',tip:'目的地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '目的地'},
                         {name:'waybill_number',type:'input',tip:'运单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '运单号'},
                         {name:'logistic_id',type:'select',placeholder: '承运商',data:this.logistics},
-                        {name:'recipient_mobile',type:'input',tip: '收货人电话：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人电话'},
+                        {name:'recipient_mobile',type:'input',tip: '可支持多收货人电话：可在左侧增加百分号(%)进行模糊搜索',placeholder: '收货人电话'},
                     ],
                 ];
                 let param=[];