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

.gitlab-ci.yml

@@ -51,6 +51,6 @@ deploy:
 #    - cd /var/www/bswas_test && sudo git config --global credential.helper store
 #    - sudo git pull
     - sudo bash ci/scpUpdate.sh
-#    - sudo bash ci/executeCommand.sh
+    - sudo bash ci/executeCommand.sh
   only:
     - master

app/Filters/DischargeTaskFilters.php

@@ -11,7 +11,7 @@ class DischargeTaskFilters
     protected $request;
     protected $queryBuilder;
     protected $filters = [
-        'owners', 'created_at_start', 'created_at_end', 'numbers', 'status', 'type', 'income_remark','facilitators','created_range','owners'
+        'owners', 'income_at_start', 'income_at_end', 'numbers', 'status', 'type', 'income_remark','facilitators','created_range','owners'
     ];
     protected $array_filter;
     protected $params = [];
@@ -65,13 +65,13 @@ class DischargeTaskFilters
         $this->queryBuilder->where('discharge_tasks.owner_id',$owner_id);
     }
 
-    public function created_at_start($created_at_start)
+    public function income_at_start($income_at_start)
     {
-        $this->queryBuilder->where('discharge_tasks.created_at','>=',$created_at_start);
+        $this->queryBuilder->where('discharge_tasks.income_at','>=',$income_at_start.' 00:00:00');
     }
-    public function created_at_end($created_at_end)
+    public function income_at_end($income_at_end)
     {
-        $this->queryBuilder->where('discharge_tasks.created_at','<=',$created_at_end);
+        $this->queryBuilder->where('discharge_tasks.income_at','<=',$income_at_end.' 23:59:59');
     }
 
     public function numbers($numbers)

resources/views/layouts/app.blade.php

@@ -27,7 +27,7 @@
     </nav>
     <div id="menu"></div>
 
-    @auth()
+    @auth
         @component('demand._create')@endcomponent
     @endauth
     @yield('content')

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

@@ -106,8 +106,8 @@
                         placeholder: ['货主', '定位或多选货主'],
                         data: _this.owners
                     },
-                    {name: 'created_at_start', type: 'dateTime', tip: '创建开始日期'},
-                    {name: 'created_at_end', type: 'dateTime', tip: '创建结束日期'},
+                    {name: 'income_at_start', type: 'dateTime', tip: '预约开始日期'},
+                    {name: 'income_at_end', type: 'dateTime', tip: '预约结束日期'},
                     {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:'备注'}