Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

app/Filters/OrderPackageFilters.php

@@ -31,6 +31,8 @@ class OrderPackageFilters
         'logistic',//承运商
         'owner',//货主
         'sent_at_start',//复核时间开始
+        'created_at_start',//创建时间开始
+        'created_at_end',//创建时间开始
         'sent_at_end',//复核时间截止
         'default_date',//默认日期
         'has_transfer_status',//是否有路由信息
@@ -143,12 +145,22 @@ class OrderPackageFilters
 
     private function sent_at_start($sent_at_start)
     {
-        $this->queryBuilder->where('created_at', '>=', Carbon::parse($sent_at_start)->startOfDay());
+        $this->queryBuilder->where('sent_at', '>=', Carbon::parse($sent_at_start)->startOfDay());
     }
 
     private function sent_at_end($sent_at_end)
     {
-        $this->queryBuilder->where('created_at', '<=', Carbon::parse($sent_at_end)->endOfDay());
+        $this->queryBuilder->where('sent_at', '<=', Carbon::parse($sent_at_end)->endOfDay());
+    }
+
+    private function created_at_start($created_at_start)
+    {
+        $this->queryBuilder->where('created_at', '>=', Carbon::parse($created_at_start)->startOfDay());
+    }
+
+    private function created_at_end($created_at_end)
+    {
+        $this->queryBuilder->where('created_at', '<=', Carbon::parse($created_at_end)->endOfDay());
     }
 
     public function default_date()

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

@@ -32,6 +32,14 @@
                 <input v-model="search.endTime" class="form-control" type="date">
             </div>
 
+            <div class="form-group m-2" data-toggle="tooltip" data-placement="top" title="单号">
+                <input v-model="search.content" class="form-control" type="text" placeholder="单号">
+            </div>
+
+            <div class="form-group m-2" data-toggle="tooltip" data-placement="top" title="桌号">
+                <input v-model="search.scanLocationCode" class="form-control" type="text" placeholder="桌号">
+            </div>
+
             <div class="form-group m-2">
                 <button class="form-control btn btn-sm btn-info" @click="searchData()">查询</button>
             </div>

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

@@ -389,7 +389,8 @@
                                 {name: '9', value: '返回中'},
                             ]
                         },
-                        {name: 'sent_at_start', type: 'dateTime', tip: '选择显示发出时间的起始时间'},
+                        {name: 'created_at_start', type: 'dateTime', tip: '选择显示创建时间的起始时间'},
+                        {name: 'sent_at_start', type: 'dateTime', tip: '选择显示复核时间的起始时间'},
                         {
                             name: 'is_weighed',
                             type: 'select',
@@ -439,7 +440,8 @@
                             placeholder: '是否有查询记录',
                             data: [{name: true, value: '是'}, {name: false, value: '否'}]
                         },
-                        {name: 'sent_at_end', type: 'dateTime', tip: '选择显示发出时间的截止时间'},
+                        {name: 'created_at_end', type: 'dateTime', tip: '选择显示创建时间的截至时间'},
+                        {name: 'sent_at_end', type: 'dateTime', tip: '选择显示复核时间的截止时间'},
                         {
                             name: 'is_issue',
                             type: 'select',