页头调整

app/Services/WaybillService.php

@@ -1,6 +1,6 @@
-<?php 
+<?php
 
-namespace App\Services; 
+namespace App\Services;
 
 use App\Services\common\QueryService;
 use App\Waybill;
@@ -114,6 +114,7 @@ Class WaybillService
         }
         sign:
         $waybill->fill($request->input());
+        $waybill->update();
         return $waybill;
     }
-}
+}

resources/js/queryForm/queryForm.js

@@ -6,7 +6,7 @@ const query = function getQueryForm(data) {
         this.url = data.url || getPathname();
         this.condition = data.condition;
         this.paginations = [50, 100, 200, 500,1000] || data.paginations;
-        this.isPaginations = data.isPaginations;
+        this.isPaginations = data.isPaginations !== false;
         this.keydownfun = data.keydownfun || undefined;
         this.selectChange = data.selectChange || undefined;
         this.searchClick = data.searchClick || undefined;
@@ -18,7 +18,7 @@ const query = function getQueryForm(data) {
         this.nextPage = nextPage;
         this.pervPage = pervPage;
         this.getSearchData = getSearchData;
-        this.autoSubmit = (data.autoSubmit === false) ? false : true ;
+        this.autoSubmit = (data.autoSubmit !== false) ;
         this.param = data.param || [];
 
         // 提交表单

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

@@ -70,8 +70,9 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
+        $.cookie('xxx', 2223);
         new Vue({
             el:"#list",
             data:{

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

@@ -173,7 +173,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         new Vue({
             el:"#list",
@@ -219,9 +219,9 @@
                     ],
                     [
                         {name:'codename_c_end',type:'select',placeholder:'订单状态范围',data:this.codes},
+                        {name:'orderdate_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
                         {name:'customerid',type:'select_multiple_select',tip:['输入关键词快速定位下拉列表，回车确定','选择要显示的客户'],
                             placeholder:['货主','定位或多选货主'],data:this.owners},
-                        {name:'orderdate_end',type:'time',tip:['选择显示指定日期的结束时间','选择显示指定日期的结束时间']},
                         {name:'soreference5',type:'input',tip:'可支持多快递单号，糊模查找需要在左边打上%符号',placeholder: '多快递单号'},
                         {name:'soreference1',type:'input',tip:'客户订单号，糊模查找需要在左边打上%符号',placeholder: '客户订单号'},
                         {name:'waveno',type:'input',tip:'波次编号，模糊查找需要在左边打上%的符号',placeholder: '波次编号'},

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

@@ -82,7 +82,7 @@
 @endsection
 
 @section("lastScript")
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         let vueList = new Vue({
             el: "#wave_div",

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

@@ -232,7 +232,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/process/index.blade.php

@@ -476,7 +476,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         new Vue({
             el:"#process",

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

@@ -209,7 +209,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/waybill/index.blade.php

@@ -362,7 +362,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

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

@@ -78,7 +78,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200804.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

webpack.mix.js

@@ -22,5 +22,5 @@ mix.copy('resources/images','public/images');
 mix.copy('resources/icon/faviconc.ico','public/faviconc.ico');
 mix.js('resources/js/trix.js','public/js/trix.js');
 mix.copy('resources/sass/trix.css','public/css/trix.css');
-mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200805.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200805b.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200804.js');