合并

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

@@ -65,7 +65,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         $.cookie('xxx', 2223);

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

@@ -71,8 +71,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
     <script>
         $.cookie('xxx', 2223);
         new Vue({

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

@@ -73,7 +73,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script type="text/javascript" src="{{asset('js/queryForm/queryForm200805b.js')}}"></script>
     <script>
         new Vue({

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

@@ -172,8 +172,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

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

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

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

@@ -231,8 +231,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/process/index.blade.php

@@ -459,9 +459,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200813b.js')}}"></script>
     <script>
         new Vue({
             el:"#process",
@@ -634,7 +634,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200813.js
+                    //excelExport 定义在 js/queryForm/export200813b.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时

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

@@ -67,7 +67,7 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export200813.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200813b.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
     <script>
         new Vue({

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

@@ -178,9 +178,9 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200813a.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200813b.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

resources/views/waybill/index.blade.php

@@ -385,8 +385,8 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

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

@@ -77,8 +77,8 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200813.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200813b.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($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/queryForm200813.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200813.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200813.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200813b.js');
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200813b.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200813b.js');