queryForm bug修改

app/Services/OrderIssueWorkLoadService.php

@@ -66,7 +66,6 @@ class OrderIssueWorkLoadService
             'id' =>['multi' => ','],
         ];
         $query = app(QueryService::class)->query($queryParam, $query, $columnQueryRules);
-
         return $query;
     }
 
@@ -77,14 +76,15 @@ class OrderIssueWorkLoadService
 
     public function getUsers()
     {
-        $arr = OrderIssueProcessLog::all()->groupBy('user_id');
-        $user_ids = array_keys($arr->toArray());
+        $query  =  OrderIssueProcessLog::query()->selectRaw('user_id')->groupBy('user_id')->get();
+        $user_ids =  $query->map(function($value){
+            return $value->user_id;
+        });
         return User::whereIn('id', $user_ids)->get();
     }
 
     public function getOwners(){
-        $user = Auth::user();
-        $owner_ids = $user ? $user->getPermittingOwnerIdsAttribute():[];
+        $owner_ids = Auth::user()->getPermittingOwnerIdsAttribute()??[];
         return Owner::whereIn('id', $owner_ids)->get();
     }
 

public/js/app.js

@@ -61974,8 +61974,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:\phpstudy_pro\WWW\bswas\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! D:\phpstudy_pro\WWW\bswas\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ }),
@@ -61991,4 +61991,4 @@ module.exports = __webpack_require__(/*! D:\wamp64\www\bswas\resources\sass\app.
 
 /***/ })
 
-/******/ });
+/******/ });

resources/js/queryForm/queryForm.js

@@ -27,7 +27,7 @@ const query = function getQueryForm(data) {
             if(!this.autoSubmit){
                 return;
             }
-            console.log(_data);
+            // console.log(_data);
             saveSearchOnCookie();
             let form = $("<form method='" + _this.method +"'></form>");
             for (const key in _data) {
@@ -417,7 +417,7 @@ const query = function getQueryForm(data) {
         min.attr('title', controlJsType(condition.tip[1], 'undefined') ? '' : condition.tip[1]);
 
         dateTime.bind('input propertychange', function () {
-            let value = this.value !== '' ? this.value + ' ' + ([null, undefined, ''].includes(min.value) ? '00:00' : min.value) : '';
+            let value = this.value !== '' ? this.value + ' ' +(!!min.val() ?  min.val() :'00:00' ) : '';
             let dom = {name: condition.name, type: 'time', value: value, mold: 'time'};
             modifyData(dom);
         })