名词修改，过滤改为筛选

app/Commodity.php

@@ -46,7 +46,7 @@ class Commodity extends Model
             if($commodity)$commodities[]=$commodity;
         }
 
-        if(count($barcodes)==count($commodities)&&count($commodities)>0){//过滤掉仅有一个条码相等的。
+        if(count($barcodes)==count($commodities)&&count($commodities)>0){//筛选掉仅有一个条码相等的。
             $commodity=$commodities[0];
         }else{
             $commodity=null;

app/library/baidu-api-speech/lib/AipBCEUtil.php

@@ -298,7 +298,7 @@ class AipSampleSigner
     }
 
     /**
-     * 根据headsToSign过滤应该参与签名的header
+     * 根据headsToSign筛选应该参与签名的header
      * @param  array $headers
      * @param  array $headersToSign
      * @return array
@@ -328,7 +328,7 @@ class AipSampleSigner
 
         $filtered_keys = null;
         if ($headersToSign !== null) {
-            //如果有headersToSign，则根据headersToSign过滤
+            //如果有headersToSign，则根据headersToSign筛选
 
             //预处理headersToSign：去掉前后的空白并转化成小写
             $headersToSign = array_map($trim_and_lower, $headersToSign);

resources/js/queryForm/queryForm.js

@@ -170,9 +170,9 @@ const query = function getQueryForm(data) {
         _table.css('width', max_width + 'px');
     }
 
-    // 清空过滤条件按钮
+    // 清空筛选按钮
     function crateClearBtn() {
-        let clearbtn = $("<button type='button' class='btn btn-warning text-dark '>清除过滤条件</button>");
+        let clearbtn = $("<button type='button' class='btn btn-warning text-dark '>清除筛选</button>");
         clearbtn.click(function () {
             clearData();
             visibleClearBtn();

resources/views/inventory/statement/allInventory.blade.php

@@ -7,7 +7,7 @@
     <div id="form_div"></div>
     <span class="dropdown">
         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
             导出Excel
         </button>
         <div class="dropdown-menu">

resources/views/inventory/statement/changeInventory.blade.php

@@ -8,7 +8,7 @@
     <div id="form_div"></div>
     <span class="dropdown">
         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
             导出Excel
         </button>
         <div class="dropdown-menu">

resources/views/inventory/stockInventory/mission.blade.php

@@ -8,7 +8,7 @@
         <div id="form_div"></div>
         <span class="dropdown">
         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
             导出Excel
         </button>
         <div class="dropdown-menu">

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

@@ -10,7 +10,7 @@
                 <div class="ml-3 form-inline">
                     <span class="dropdown">
                         <button type="button" class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                             导出Excel
                         </button>
                         <div class="dropdown-menu">

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

@@ -10,7 +10,7 @@
                 <div class="form-inline mt-1">
                     <span class="dropdown">
                         <button type="button" class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">导出Excel
+                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">导出Excel
                         </button>
                         <div class="dropdown-menu">
                             <a class="dropdown-item" @click="orderIssueExport(false)" href="javascript:">导出勾选内容</a>

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

@@ -14,7 +14,7 @@
                 <tr>
                     <td colspan="20">
                         <button type="button" class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                             导出Excel
                         </button>
                         <div class="dropdown-menu">

resources/views/personnel/checking-in/missionAudit.blade.php

@@ -14,7 +14,7 @@
                     <tr v-if="isBeingFilterConditions">
                         <td colspan="4">
                             <div class="col" style="padding:0">
-                                <a  href="{{url('personnel/checking-in/missionAudit')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                                <a  href="{{url('personnel/checking-in/missionAudit')}}"><span class="btn btn-warning text-dark">清除筛选</span></a>
                             </div></td>
                         <td></td>
                     </tr>

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

@@ -10,7 +10,7 @@
         <div id="form_div"></div>
         <span class="dropdown">
                 <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget mt-1 mb-1" :class="[checkData.length>0?'btn-dark text-light':'']"
-                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
                 <div class="dropdown-menu">

resources/views/process/index.blade.php

@@ -9,7 +9,7 @@
             <div id="form_div"></div>
             <span class="dropdown">
             <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                 导出Excel
             </button>
             <div class="dropdown-menu">

resources/views/process/statistic.blade.php

@@ -12,7 +12,7 @@
                     <table class="table  table-sm table-bordered text-nowrap  mb-0">
                         <tr v-if="isBeingFilterConditions">
                             <td colspan="10"><div class="col" style="padding:0" >
-                                    <a  href="{{url('process/statistic')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                                    <a  href="{{url('process/statistic')}}"><span class="btn btn-warning text-dark">清除筛选</span></a>
                                 </div></td>
                         </tr>
                         <tr>
@@ -75,7 +75,7 @@
                             <td colspan="3">
                                 <span class="dropdown">
                                     <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
-                                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                                         导出Excel
                                     </button>
                                     <div class="dropdown-menu">

resources/views/rejected/recycle.blade.php

@@ -18,7 +18,7 @@
                                 <div class="row">
                                     <div class="col" v-if="isBeingFilterConditions">
                                         <label for="">
-                                            <a :href="'{{url('rejected').'?paginate='}}'+filterParams.paginate"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                                            <a :href="'{{url('rejected').'?paginate='}}'+filterParams.paginate"><span class="btn btn-warning text-dark">清除筛选</span></a>
                                         </label>
                                     </div>
                                     <table class="table mb-n3 table-sm table-bordered">
@@ -39,7 +39,7 @@
                                             <td width="80%"></td>
                                         </tr>
 {{--                                        <tr>--}}
-{{--                                            <td class="text-muted">按条件过滤：</td>--}}
+{{--                                            <td class="text-muted">按条件筛选：</td>--}}
 {{--                                            <td colspan="2">--}}
 {{--                                                <label for="">时间：</label>--}}
 {{--                                                <input type="date" name="created_at_start" class="form-control-sm tooltipTarget" style="width:140px"--}}

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

@@ -12,7 +12,7 @@
             <button
                     class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
                     :class="[rejectedBills_checkBoxes.length>0?'btn-dark text-light':'']"
-                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                 导出Excel
             </button>
             <div class="dropdown-menu">

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

@@ -15,7 +15,7 @@
                 @endif                <div id="form_div"></div>
                 <span class="dropdown">
                     <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget":class="[rejectedBills_checkBoxes.length>0?'btn-dark text-light':'']"
-                            data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                            data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                         导出Excel
                     </button>
                     <div class="dropdown-menu">

resources/views/waybill/delivering.blade.php

@@ -8,7 +8,7 @@
             <div class="text-nowrap mb-0" style="background: #fff;">
                 <div v-if="isBeingFilterConditions">
                     <div><div class="col" style="padding:0">
-                            <a  href="{{url('waybill/delivering')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                            <a  href="{{url('waybill/delivering')}}"><span class="btn btn-warning text-dark">清除筛选</span></a>
                         </div>
                     </div>
                 </div>
@@ -32,7 +32,7 @@
                 <div class="ml-4 mt-2">
                     <span class="dropdown">
                         <button type="button" class="btn  btn-sm  form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'btn-outline-dark']"
-                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                             导出Excel
                         </button>
                         <div class="dropdown-menu">

resources/views/waybill/index.blade.php

@@ -29,7 +29,7 @@
             <div id="form_div"></div>
             <span class="dropdown">
                 <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark text-light':'']"
-                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
                 <div class="dropdown-menu">

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

@@ -45,7 +45,7 @@
     <label>操作选定记录：</label>
         <span class="dropdown">
             <button class="btn btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark':'btn-outline-dark']"
-                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                    data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                 导出Excel
             </button>
             <div class="dropdown-menu">

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

@@ -12,7 +12,7 @@
             <div id="form_div"></div>
             <span class="dropdown">
                 <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget mt-1 mb-1" :class="[checkData.length>0?'btn-dark text-light':'']"
-                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                     导出Excel
                 </button>
                 <div class="dropdown-menu">

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

@@ -13,7 +13,7 @@
                         <table class="table  table-sm table-bordered text-nowrap  mb-0">
                             <tr v-if="isBeingFilterConditions">
                                 <td colspan="10"><div class="col" style="padding:0">
-                                        <a  href="{{url('package/statistics')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
+                                        <a  href="{{url('package/statistics')}}"><span class="btn btn-warning text-dark">清除筛选</span></a>
                                     </div></td>
                             </tr>
                             <tr >
@@ -101,7 +101,7 @@
                                 <td colspan="3">
                                     <span class="dropdown">
                                         <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget" {{--:class="[rejectedBills_checkBoxes.length>0?'btn-dark text-light':'']"--}}
-                                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                        data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                                             导出Excel
                                         </button>
                                         <div class="dropdown-menu">

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

@@ -28,7 +28,7 @@
                                     <label style="margin-left: 5px"> 操作选定记录：</label>
                                     <span class="dropdown">
                                         <button class="btn btn-sm form-control-sm dropdown-toggle tooltipTarget" :class="[checkData.length>0?'btn-dark':'btn-outline-dark']"
-                                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的过滤结果，将其全部记录（每一页）导出">
+                                                data-toggle="dropdown" title="导出所有页将会以搜索条件得到的筛选结果，将其全部记录（每一页）导出">
                                             导出Excel
                                         </button>
                                         <div class="dropdown-menu">