搜索修改

app/Http/Controllers/OrderController.php

@@ -37,7 +37,20 @@ class OrderController extends Controller
         if ($orderdate_end){
             $sql.=" and addtime<='".$orderdate_end.":59' ";
         }
-        if ($customerid)$sql.=" and customerid='".$customerid."'";
+        if ($customerid){
+            $arr = explode(',',$customerid);
+            if (count($arr)>0) {
+                $sql.=" and customerid in (";
+                foreach ($arr as $index=>$str){
+                    if ($index==0){
+                        $sql.="'".$str."'";
+                        continue;
+                    }
+                    $sql.=",'".$str."'";
+                }
+                $sql.=")";
+            }
+        }
         if ($orderno)$sql.=" and orderno like '".$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."'";
@@ -45,7 +58,10 @@ class OrderController extends Controller
         if ($carriername)$sql.=" and carriername like '".$carriername."%'";
         if ($soreference1){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference1));
-            if (count($arr)>0){
+            if (count($arr)==1){
+                $sql.=" and soreference1 like '".$soreference1."%'";
+            }
+            if (count($arr)>1){
                 $sql.=" and soreference1 in (";
                 foreach ($arr as $index=>$str){
                     if ($index==0){
@@ -65,7 +81,10 @@ class OrderController extends Controller
         }else $request->offsetUnset('addtime');
         if ($soreference5){
             $arr=array_filter(preg_split('/[,， ]+/is', $soreference5));
-            if (count($arr)>0){
+            if (count($arr)==1){
+                $sql.=" and soreference5 like '".$soreference5."%'";
+            }
+            if (count($arr)>1){
                 $sql.=" and (soreference5 in (";
                 foreach ($arr as $index=>$str){
                     if ($index==0){
@@ -93,10 +112,10 @@ class OrderController extends Controller
             }
         }
         if ($edisendflag2){
-            $sql.=" and edisendflag2 = '".$edisendflag2."'";
+            $sql.=" and edisendflag2 like '".$edisendflag2."%'";
         }
         if ($edisendflag){
-            $sql.=" and edisendflag = '".$edisendflag."'";
+            $sql.=" and edisendflag like '".$edisendflag."%'";
         }
         return $sql;
     }

app/Services/LaborReportService.php

@@ -23,10 +23,11 @@ class LaborReportService
     private function conditionQuery(Request $request){
         $laborReports=LaborReport::query()->orderBy('id','DESC');
         $columnQueryRules=[
-            'enter_number' => ['timeLimit' => 15],
+            'enter_number' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
-            'identity_number' => ['timeLimit' => 15]
+            'identity_number' => ['like' => ''],
+            'mobile_phone' => ['like' => ''],
         ];
         $laborReports = app(QueryService::class)->query($request,$laborReports,$columnQueryRules);
         return $laborReports;

app/Services/RejectedService.php

@@ -19,8 +19,10 @@ Class RejectedService
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'owner_id' => ['alias' => 'id_owner'],
-            'order_number' => ['timeLimit' => 15],
-            'logistic_number' => ['timeLimit' => 15]
+            'order_number' => ['like' => ''],
+            'logistic_number' => ['like' => ''],
+            'mobile_sender' => ['like' => ''],
+            'checked_numbers' => ['like' => ''],
         ];
         if($request->id_quality_label!=''){
             if($request->id_quality_label==1){

app/Services/WaybillService.php

@@ -19,12 +19,12 @@ Class WaybillService
             ->orderBy('waybill_on_tops.updated_at','desc')
             ->orderBy('waybills.id','desc');
         $columnQueryRules=[
-            'waybill_number' => ['timeLimit' => 15],
-            'carrier_bill' => ['timeLimit' => 15],
+            'waybill_number' => ['like' => ''],
+            'carrier_bill' => ['like' => ''],
             'owner_id' => ['multi' => ','],
-            'wms_bill_number' => ['timeLimit' => 15],
-            'origination' => ['timeLimit' => 15],
-            'destination' => ['timeLimit' => 15],
+            'wms_bill_number' => ['like' => ''],
+            'origination' => ['like' => ''],
+            'destination' => ['like' => ''],
             'created_at_start' => ['alias' => 'created_at' , 'startDate' => ' 00:00:00'],
             'created_at_end' => ['alias' => 'created_at' , 'endDate' => ' 23:59:59'],
             'uriType' => ['alias' => 'type']

app/Services/common/QueryService.php

@@ -60,7 +60,7 @@ Class QueryService
                     $isExecute = true;
                 }
                 if ($rule === 'like'){
-                    $query = $query->where($tableName.$column,'like',$value.$request->input($param).'%');
+                    $query = $query->where($tableName.$column,'like',$value.$request->input($param).$value);
                     $isExecute = true;
                 }
                 if ($rule === 'multi'){

resources/js/queryForm/queryForm.js

@@ -624,7 +624,7 @@ const query = function getQueryForm(data) {
                     dom_data = [dom_data];
                 }
                 if (dom_data.includes(value)) {
-                    dom_data.splice(dom_data.indexOf(value), 1);
+                    dom_data.splice(dom_data.findIndex(value), 1);
                 } else {
                     dom_data.push(value);
                     dom_data = arrDuplicate(dom_data);

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

@@ -178,7 +178,7 @@
                 checkData:[],
                 owners:[
                         @foreach($customers as $customer)
-                    { name:'{{$customer->descr_c}}',value:'{{$customer->customerid}}' },
+                    { name:'{{$customer->customerid}}',value:'{{$customer->descr_c}}' },
                     @endforeach
                 ],
                 orders:{!! $orders !!},

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

@@ -342,7 +342,7 @@
                     [
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
                         {name:'user_workgroup_id',type:'search_select',tip:['',''],placeholder:['小组',''],data:this.userWorkGroups},
-                        {name:'enter_number',type:'input',tip:'进场编号:支持15天内模糊搜索，15天外精确搜索',placeholder: '进场编号'},
+                        {name:'enter_number',type:'input',tip:'进场编号:可在两侧增加百分号(%)进行模糊搜索',placeholder: '进场编号'},
                     ],
                     [
                         {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},

resources/views/process/index.blade.php

@@ -558,13 +558,13 @@
                     [
                         {name:'date_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
                         {name:'owner_id',type:'select',placeholder: '客户',data:this.owners},
-                        {name:'wms_code',type:'input',tip:'单据号：支持15内模糊搜索与15天外精确搜索',placeholder: '单据号'},
+                        {name:'wms_code',type:'input',tip:'单据号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '单据号'},
                         {name:'status',type:'select',placeholder: '状态',data:this.status},
                     ],
                     [
                         {name:'date_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'commodity_barcode',type:'input',tip:'商品条码：支持15内模糊搜索与15天外精确搜索',placeholder: '商品条码'},
-                        {name:'code',type:'input',tip:'任务号：支持15内模糊搜索与15天外精确搜索',placeholder: '任务号'},
+                        {name:'commodity_barcode',type:'input',tip:'商品条码：可在两侧增加百分号(%)进行模糊搜索',placeholder: '商品条码'},
+                        {name:'code',type:'input',tip:'任务号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '任务号'},
                         {name:'is_accomplish',type:'checkbox',data:[{name:'sign',value:'显示交接完成的记录'}]},
                     ],
                 ];

resources/views/rejected/recycle.blade.php

@@ -62,13 +62,13 @@
 {{--                                                <label for="">订单号：</label>--}}
 {{--                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索订单号" name="order_number"--}}
 {{--                                                       :class="filterParams.order_number?'bg-warning':''"--}}
-{{--                                                       @keypress="order_numberEntering" title="15天以内的支持模糊搜索，回车提交">--}}
+{{--                                                       @keypress="order_numberEntering" title="可在两侧增加百分号(%)进行模糊搜索">--}}
 {{--                                            </td>--}}
 {{--                                            <td>--}}
 {{--                                                <label for="">退回单号：</label>--}}
 {{--                                                <input type="text" class="form-control-sm tooltipTarget" placeholder="搜索退回单号" name="logistic_number_return"--}}
 {{--                                                       :class="filterParams.logistic_number_return?'bg-warning':''"--}}
-{{--                                                       @keypress="logistic_number_returnEntering" title="15天以内的支持模糊搜索，回车提交">--}}
+{{--                                                       @keypress="logistic_number_returnEntering" title="可在两侧增加百分号(%)进行模糊搜索">--}}
 {{--                                            </td>--}}
 {{--                                            <td>--}}
 {{--                                                <label for="">审核：</label>--}}

resources/views/rejected/search/general.blade.php

@@ -240,9 +240,9 @@
                     [
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
                         {name:'owner_id',type:'search_select',tip:['',''],placeholder:['客户',''],data:this.owners},
-                        {name:'order_number',type:'input',tip:'订单号：支持15内模糊搜索与15天外精确搜索',placeholder:'订单号'},
-                        {name:'logistic_number_return',type:'input',tip:'退回单号：支持查找多个以逗号或空格分隔的单号，15天以内的支持模糊搜索，回车提交',placeholder:'退回单号'},
-                        {name:'logistic_number',type:'input',tip:'原单单号：支持15内模糊搜索与15天外精确搜索',placeholder:'原单单号'},
+                        {name:'order_number',type:'input',tip:'订单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'订单号'},
+                        {name:'logistic_number_return',type:'input',tip:'退回单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'退回单号'},
+                        {name:'logistic_number',type:'input',tip:'原单单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'原单单号'},
                         {name:'is_checked',type:'select',placeholder: '是否审核',data:[{name:1,value:'已审核'},{name:0,value:'未审核'}]},
                         {name:'id_logistic_return',type:'select',placeholder: '快递名称',data:this.logistics},
                     ],[

resources/views/waybill/delivering.blade.php

@@ -20,11 +20,11 @@
                                v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" >
                     </div>
                     <div class=" col-md-2 mr-0 " style="max-width: 160px">
-                        <input type="text" title="运单号：支持15内模糊搜索与15天外精确搜索" name="waybill_number" placeholder="运单号"
+                        <input type="text" title="运单号：可在两侧增加百分号(%)进行模糊搜索" name="waybill_number" placeholder="运单号"
                                class="form-control form-control-sm tooltipTarget" v-model="filterData.waybill_number" style="vertical-align: middle;width: 153px" :class="filterData.waybill_number?'bg-warning':''">
                     </div>
                     <div class=" col-md-2 ml-2 p-0" style="max-width: 160px">
-                        <input type="text" title="承运商单号：支持15内模糊搜索与15天外精确搜索"  name="carrier_bill" placeholder="承运商单号"
+                        <input type="text" title="承运商单号：可在两侧增加百分号(%)进行模糊搜索"  name="carrier_bill" placeholder="承运商单号"
                                class="form-control form-control-sm tooltipTarget" v-model="filterData.carrier_bill" style="vertical-align: middle;width: 153px" :class="filterData.carrier_bill?'bg-warning':''">
                     </div>
                     <input type="submit" hidden>

resources/views/waybill/index.blade.php

@@ -448,15 +448,15 @@
                         {name:'owner_id',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
                         {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
-                        {name:'origination',type:'input',tip:'始发地：支持15内模糊搜索与15天外精确搜索',placeholder: '始发地'},
-                        {name:'carrier_bill',type:'input',tip:'承运商单号：支持15内模糊搜索与15天外精确搜索',placeholder: '承运商单号'},
+                        {name:'origination',type:'input',tip:'始发地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '始发地'},
+                        {name:'carrier_bill',type:'input',tip:'承运商单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '承运商单号'},
                         {name:'status',type:'select',placeholder: '运单状态',data:this.status},
                     ],
                     [
-                        {name:'wms_bill_number',type:'input',tip:'WMS单号：支持15内模糊搜索与15天外精确搜索',placeholder: 'WMS单号'},
+                        {name:'wms_bill_number',type:'input',tip:'WMS单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: 'WMS单号'},
                         {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                        {name:'destination',type:'input',tip:'目的地：支持15内模糊搜索与15天外精确搜索',placeholder: '目的地'},
-                        {name:'waybill_number',type:'input',tip:'运单号：支持15内模糊搜索与15天外精确搜索',placeholder: '运单号'},
+                        {name:'destination',type:'input',tip:'目的地：可在两侧增加百分号(%)进行模糊搜索',placeholder: '目的地'},
+                        {name:'waybill_number',type:'input',tip:'运单号：可在两侧增加百分号(%)进行模糊搜索',placeholder: '运单号'},
                         {name:'carrier_id',type:'select',placeholder: '承运商',data:this.carriers},
                     ],
                 ];

resources/views/weight/package/index.blade.php

@@ -118,10 +118,10 @@
                 let data = [[
                     {name:'created_at_start',type:'dataTime',tip:'选择显示指定日期的起始时间'},
                     {name:'owner_id',type:'search_select',tip:['',''],placeholder:['客户',''],data:_this.owners},
-                    {name:'logistic_number',type:'input',tip:'快递单号：支持15内模糊搜索与15天外精确搜索',placeholder:'快递单号'},
+                    {name:'logistic_number',type:'input',tip:'快递单号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'快递单号'},
                 ],[
                     {name:'created_at_end',type:'dataTime',tip:'选择显示指定日期的结束时间'},
-                    {name:'batch_number',type:'input',tip:'波次号：支持15内模糊搜索与15天外精确搜索',placeholder:'波次号'}
+                    {name:'batch_number',type:'input',tip:'波次号：可在两侧增加百分号(%)进行模糊搜索',placeholder:'波次号'}
                 ]];
 
                 _this.form = new query({