Merge branch 'master' into Haozi

# Conflicts:
#	resources/views/inventory/stockInventory/mission.blade.php

app/Services/OrderIssueService.php

@@ -209,7 +209,7 @@ class OrderIssueService
         $rejectedBill = RejectedBill::where('order_number', $orderHeader['soreference1'])->first();
         $arr = [
             'order_id' => $order['id'],
-            'rejecetd_bill_id' => $rejectedBill['id'],
+            'rejected_bill_id' => $rejectedBill['id'],
         ];
         $orderIssue = OrderIssue::create($arr);
         $this->judgeRejectingStatus($orderIssue);

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

@@ -56,7 +56,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue=new Vue({

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

@@ -80,7 +80,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -134,7 +134,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -83,7 +83,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({
@@ -172,7 +172,7 @@
                 },
                 checkAll(e){
                     if (e.target.checked){
-                        this.inventoryAccounts.forEach((el,i)=>{
+                        this.inventories.forEach((el,i)=>{
                             if (this.checkData.indexOf(el.id) == '-1'){
                                 this.checkData.push(el.id);
                             }

resources/views/maintenance/role/index.blade.php

@@ -50,7 +50,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         new Vue({

resources/views/maintenance/user/index.blade.php

@@ -63,7 +63,7 @@
     <script>
 
     </script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         new Vue({

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

@@ -175,7 +175,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue=new Vue({

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

@@ -211,14 +211,6 @@
                 },
             },
             methods: {
-                asyncMethodChain(func){
-                    return new Promise(function (resolve,error) {
-                        if(1){
-                            error();
-                        }
-                        resolve();
-                    })
-                },
                 submitFake(){
                     let _this = this;
                     let p= new Promise(function (resolve) {
@@ -238,6 +230,8 @@
                                 tempTip.setDuration(4000);
                                 tempTip.show('网络异常:' + err);
                             });
+                        }else{
+                            resolve();
                         }
                     })
                     p.then(this.orderIssueUpdate);

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

@@ -532,7 +532,7 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script>
         let listVue = new Vue({

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

@@ -65,7 +65,7 @@
 
 @endsection
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script>
         let performance_vue = new Vue({

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

@@ -74,7 +74,7 @@
 
 @endsection
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>

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

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

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

@@ -211,7 +211,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let today=(new Date());

resources/views/process/index.blade.php

@@ -462,7 +462,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -61,7 +61,7 @@
 
 @section('lastScript')
     <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -176,7 +176,7 @@
         let csrfInput='@csrf';
     </script>
     <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

resources/views/waybill/index.blade.php

@@ -334,7 +334,7 @@
         }
     </style>
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
         let vue = new Vue({

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

@@ -58,7 +58,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200828a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200901.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/header200826b.js')}}"></script>
     <script>
             @if(isset($request))

webpack.mix.js

@@ -19,7 +19,7 @@ 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/queryForm200828a.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200901.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818a.js');
 mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200826b.js');