js

app/Http/Controllers/WaybillsController.php

@@ -96,7 +96,7 @@ class WaybillsController extends Controller
     public function update(Request $request, $id)
     {
         if(!Gate::allows('运输管理-调度')){ return redirect(url('/'));  }
-        $waybill=Waybill::find($id);
+        $waybill=app('waybillService')->find($id);
         if (!$request->warehouse_weight && $request->warehouse_weight_unit_id){
             $request->offsetUnset('warehouse_weight_unit_id');
         }

resources/js/queryForm/queryForm.js

@@ -551,10 +551,10 @@ const query = function getQueryForm(data) {
         })
         input.blur(function () {
             setTimeout(function () {
-                if (!select_div.is(':focus')) {
+                if (!ul_div.is(':focus')) {
                     ul_div.hide();
                 }
-            }, 1000);
+            }, 100);
         })
         select_div.focus(function () {
             ul_div.show();
@@ -566,6 +566,11 @@ const query = function getQueryForm(data) {
             ul_div.hide();
         })
         ul_div.hide();
+        ul_div.mouseleave(function () {
+            if(_data[condition.name].value){
+                _this.onsubmit();
+            }
+        });
         return div;
     }
 
@@ -620,15 +625,18 @@ const query = function getQueryForm(data) {
             li.click(function () {
                 let value = li.attr('value');
                 let dom_data = _data[name].value;
-                if (controlJsType(dom_data, ['undefined', 'null', 'string'])) {
+                if(!dom_data){
+                    dom_data = [];
+                }
+                if (controlJsType(dom_data,'string')){
                     dom_data = [dom_data];
                 }
                 if (dom_data.includes(value)) {
-                    dom_data.splice(dom_data.findIndex(value), 1);
+                    dom_data.splice(dom_data.indexOf(value), 1);
                 } else {
                     dom_data.push(value);
-                    dom_data = arrDuplicate(dom_data);
                 }
+                dom_data = arrDuplicate(dom_data);
                 let dom = {
                     name: ul.attr('name'),
                     type: 'select_multiple_select',
@@ -636,10 +644,10 @@ const query = function getQueryForm(data) {
                     select: dom_data,
                     mold: 'select_multiple_select'
                 };
+                modifyData(dom)
                 modifyData(dom);
                 redenerUl(ul);
                 isMultiple(ul.attr('name'));
-                _this.onsubmit();
             })
         })
     }
@@ -647,11 +655,7 @@ const query = function getQueryForm(data) {
     function isMultiple(name) {
         let label = $('#' + name + '_lab');
         let select = $('#' + name + '_sel');
-        let dom_data = _data[name].data;
-        console.log(_data[name],_data);
-        console.log(dom_data);
-        console.log(name);
-
+        let dom_data = _data[name].value;
         if (dom_data.length === 1 ) {
             select.show();
             select.val(dom_data[0]);
@@ -1088,12 +1092,15 @@ const query = function getQueryForm(data) {
                     }
                 } else if (key === 'page') {
                     _page = data[key];
-                }  else if(_data[key].type === 'select_multiple_select' && !data[key]){
-                    _data[key].value = data[key].split(',');
+                }  else if(_data[key].type === 'select_multiple_select' ){
+                    if(!_data[key]){
+                        _data[key].value = [];
+                    }else{
+                        _data[key].value = data[key].split(',');
+                    }
                 }else {
                     _data[key].value = data[key];
                 }
-                // console.log('key', key, typeof key);
             }
         }
     }
@@ -1232,4 +1239,4 @@ const query = function getQueryForm(data) {
         return string;
     }
 
-};
+};

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

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

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

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

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

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

resources/views/process/index.blade.php

@@ -475,7 +475,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.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/export.js')}}"></script>
-    <script src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
+    <script src="{{asset('js/queryForm/queryForm.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/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

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

@@ -82,7 +82,7 @@
 
 @section('lastScript')
     <script type="text/javascript" src="{{asset('js/queryForm/export.js')}}"></script>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm.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/queryForm200724.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm.js');
 mix.copy('resources/js/queryForm/export.js','public/js/queryForm/export.js');