js组件bug修复

public/js/app.js

@@ -2330,7 +2330,7 @@ function fromByteArray (uint8) {
 var BlobBuilder = typeof BlobBuilder !== 'undefined' ? BlobBuilder :
   typeof WebKitBlobBuilder !== 'undefined' ? WebKitBlobBuilder :
   typeof MSBlobBuilder !== 'undefined' ? MSBlobBuilder :
-  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder :
+  typeof MozBlobBuilder !== 'undefined' ? MozBlobBuilder : 
   false;
 
 /**
@@ -61974,8 +61974,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! D:\Demo\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\Demo\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -61991,4 +61991,4 @@ module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sa
 
 /***/ })
 
-/******/ });
+/******/ });

resources/js/queryForm/queryForm.js

@@ -694,7 +694,7 @@ const query = function getQueryForm(data) {
         *   {date_relevance:{date:['',''],relevance:'',killing:'',default:[]}}
         * */
         let rules = _data[dom.name].rules;
-        if (JSON.stringify(rules) !== '{}'){
+        if (rules && JSON.stringify(rules) !== '{}'){
             if (rules['son']){
                 for (let key in rules['son']){
                     if (!dom.value){

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

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

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

@@ -55,9 +55,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue=new Vue({
             el:"#list",

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

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

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

@@ -49,7 +49,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

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

@@ -49,7 +49,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         new Vue({
             el:"#list",

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

@@ -139,9 +139,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue=new Vue({
             el:"#list",

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

@@ -407,8 +407,8 @@
         }
 
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script>
         let listVue = new Vue({
             el: '#issue_div ',

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

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

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

@@ -210,9 +210,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let today=(new Date());
         function isTomorrow(){

resources/views/process/index.blade.php

@@ -456,9 +456,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#process",
@@ -641,7 +641,7 @@
                 processExport(checkAllSign) {
                     let url = '{{url('process/export')}}';
                     let token='{{ csrf_token() }}';
-                    //excelExport 定义在 js/queryForm/export200818.js
+                    //excelExport 定义在 js/queryForm/export200818a.js
                     excelExport(checkAllSign,this.checkData,url,this.sum,token);
                 },
                 //获取登记工时

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

@@ -60,9 +60,9 @@
 @endsection
 
 @section('lastScript')
-    <script src="{{asset('js/queryForm/export200818.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
     <script src="{{asset('js/queryForm/queryForm200803a.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

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

@@ -175,9 +175,9 @@
         let ajaxFinishAllUrl='{{url("rejected/ajaxFinishAll")}}';
         let csrfInput='@csrf';
     </script>
-    <script src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

resources/views/store/index.blade.php

@@ -34,7 +34,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#fast',

resources/views/store/storeItem/index.blade.php

@@ -38,7 +38,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#item',

resources/views/waybill/delivering.blade.php

@@ -187,7 +187,7 @@
     .color1{background-color: #FFA07A}
     .color2{background-color: cornflowerblue}
 </style>
-<script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+<script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
 <script>
     new Vue({
         el:"#list",

resources/views/waybill/index.blade.php

@@ -333,9 +333,9 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:'#list',

resources/views/waybill/waybillFinancialSnapshot/index.blade.php

@@ -133,7 +133,7 @@
 @stop
 
 @section('lastScript')
-<script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+<script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
 <script>
     let vue = new Vue({
         el:'#editingPanel',

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

@@ -57,9 +57,9 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/export200818.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200813b.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/export200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200818a.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
             @if(isset($request))
         let request={!! json_encode($request) !!};

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

@@ -86,7 +86,7 @@
 @endsection
 
 @section('lastScript')
-    <script type="text/javascript" src="{{asset('js/queryForm/header200818.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/header200818a.js')}}"></script>
     <script>
         let vue = new Vue({
             el:"#list",

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/queryForm200813b.js');
-mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818.js');
-mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200818.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200818a.js');
+mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export200818a.js');
+mix.js('resources/js/queryForm/header.js','public/js/queryForm/header200818a.js');