分支BUG保留

app/Services/WaybillService.php

@@ -17,7 +17,8 @@ Class WaybillService
             ->orderBy('waybill_on_tops.updated_at','desc')
             ->orderBy('waybills.id','desc');
         $columnQueryRules=[
-            //TODO: 规则待完善
+            'waybill_number' => ['timeLimit' => 15],
+            'carrier_bill' => ['timeLimit' => 15],
         ];
         $waybills = app(QueryService::class)->query($request,$waybills,$columnQueryRules,"waybills");
         return $waybills;

public/js/app.js

@@ -61945,8 +61945,8 @@ module.exports = tempTip;
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\wamp64\www\bswas\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\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");
 
 
 /***/ }),

resources/js/queryForm/queryForm.js

@@ -33,9 +33,9 @@ const query = function getQueryForm(data) {
                 if (["string", "number"].includes(fetchJsType(map.value)) && map.value !== '') {
                     form.append("<input name='" + key + "' value='" + map.value + "'>")
                 } else if ('array' === fetchJsType(map.value)) {
-                    map.value.forEach(function (value) {
-                        form.append("<input type='checkbox' name='" + key + "' value='" + value + "' checked='checked' >");
-                    })
+                    let string = map.value.join(',');
+                    form.append("<input  name='" + key + "' value='" + string + "'>")
+                    console.log("string:"+string);
                 }
             }
             for (let key in this.param){
@@ -529,7 +529,7 @@ const query = function getQueryForm(data) {
             if ([undefined, null, ''].includes(select)) {
                 select = [];
             }
-            let select_data = _data[condition.name].data.filter(function (map) {
+            let select_data = condition.data.filter(function (map) {
                 return map.value.includes(value) || select.includes(map.name);
             })
 
@@ -638,7 +638,7 @@ const query = function getQueryForm(data) {
                 };
                 modifyData(dom);
                 redenerUl(ul);
-                isMultiple(name);
+                isMultiple(ul.attr('name'));
                 _this.onsubmit();
             })
         })
@@ -647,7 +647,10 @@ const query = function getQueryForm(data) {
     function isMultiple(name) {
         let label = $('#' + name + '_lab');
         let select = $('#' + name + '_sel');
-        let dom_data = _data[name].value;
+        let dom_data = _data[name].data;
+        console.log(_data[name],_data);
+        console.log(dom_data);
+        console.log(name);
 
         if (dom_data.length === 1 ) {
             select.show();
@@ -842,7 +845,7 @@ const query = function getQueryForm(data) {
                     $(dom).removeClass('active');
                 }
             })
-            isMultiple(name);
+            isMultiple(ul.attr('name'));
         }
     }
 
@@ -934,7 +937,8 @@ const query = function getQueryForm(data) {
                         type: condition.type,
                         value: condition.value,
                         select: condition.select,
-                        mold: ['input', 'dataTime'].includes(condition.type) ? 'input' : condition.type
+                        mold: ['input', 'dataTime'].includes(condition.type) ? 'input' : condition.type,
+                        data:condition.data
                     }
                     if (condition.type === 'search_select') {
                         data.mold = 'select';
@@ -1084,7 +1088,9 @@ const query = function getQueryForm(data) {
                     }
                 } else if (key === 'page') {
                     _page = data[key];
-                } else {
+                }  else if(_data[key].type === 'select_multiple_select' && !data[key]){
+                    _data[key].value = data[key].split(',');
+                }else {
                     _data[key].value = data[key];
                 }
                 // console.log('key', key, typeof key);
@@ -1175,6 +1181,43 @@ const query = function getQueryForm(data) {
         return saveData;
     }
 
+    function getPage(){
+        return  getSearchObj()['page'];
+    }
+    //  paginate
+    function pervPage() {
+        let obj = getSearchData();
+        _page = getPage();
+        if(!obj['paginate']){
+            obj['paginate'] = 50;
+        }
+        if(Number(_page)>1){
+            _page= Number(_page)-1;
+        }else{
+            _page = 1;
+        }
+        return getSearchUri(obj);
+    }
+
+    function nextPage() {
+        let obj = getSearchData();
+        _page = getPage();
+        if(!_page){_page=1;}
+        if(_page){
+            _page = Number(_page)+ 1;
+        }
+        if(!obj['paginate']){
+            obj['paginate'] = 50;
+        }
+        return getSearchUri(obj);
+    }
+
+    function goPage(page){
+        let obj = getSearchData();
+        _page = page;
+        return getSearchUri(obj);
+    }
+
     function getSearchUri(obj){
         let string = "?";
         for (const key in obj) {

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

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

resources/views/waybill/index.blade.php

@@ -361,7 +361,7 @@
             -webkit-animation-play-state: running;
         }
     </style>
-    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200722j.js')}}"></script>
+    <script type="text/javascript" src="{{asset('js/queryForm/queryForm200724.js')}}"></script>
     <script>
         let vueList=new Vue({
             el:'#list',

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

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

webpack.mix.js

@@ -22,4 +22,4 @@ 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/queryForm200722j.js');
+mix.copy('resources/js/queryForm/queryForm.js','public/js/queryForm/queryForm200724.js');