Merge branch 'master' into Haozi

app/Services/OrderIssuePerformanceService.php

@@ -72,9 +72,13 @@ class OrderIssuePerformanceService
 
     public function getAll($params)
     {
-        $arr = OrderIssueProcessLog::all()->groupBy('user_id');
+        $query  =  OrderIssueProcessLog::query()->selectRaw('user_id')->groupBy('user_id')->get();
+        $user_ids =  $query->map(function($value){
+            return $value->user_id;
+        });
         $owners = Owner::all();
-        $user_ids = array_keys($arr->toArray());
+/*        $arr = OrderIssueProcessLog::all()->groupBy('user_id');
+        $user_ids = array_keys($arr->toArray());*/
         $data = [];
         $total = 0;
         foreach ($user_ids as $key => $value) {

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

@@ -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;
 
 /**
@@ -61991,4 +61991,4 @@ module.exports = __webpack_require__(/*! D:\Reald\desktop\BsWAS\src\resources\sa
 
 /***/ })
 
-/******/ });
+/******/ });

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);
         })

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

@@ -1028,28 +1028,25 @@
                 showSecondeOrder() {
                     this.isShowSecondOrderInfo = true;
                 },
-                goPage(page){
-                    let href = window.location.href;
-                    if(href.indexOf('page=')!==-1){
-                        href = href.replace('page='+this.page.curPage,'page='+page);
-                    }else{
-                        href+='&page='+page;
-                    }
-                    window.location = href;
-                },
-                pageTurning(e) {
+                pageTurning(e){
                     let page = $(e.target).val();
                     if (page > this.page.lastPage) {
                         return;
                     }
+                    this.goPage(page);
+                },
+                goPage(page){
                     let href = window.location.href;
+                    if(href.indexOf('?')==-1){
+                        href+='?'
+                    }
                     if(href.indexOf('page=')!==-1){
                         href = href.replace('page='+this.page.curPage,'page='+page);
                     }else{
                         href+='&page='+page;
                     }
                     window.location = href;
-                },
+                }
             }
         })
         // modal 隐藏时修改 input 为空

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

@@ -21,12 +21,12 @@
                 @endcan
                 @can('订单管理-问题件-工作量')
                     <li class="nav-item" >
-                        <a class="nav-link" href="{{url('workLoad/index')}}" :class="{active:isActive('workLoad',1)}">工作量</a>
+                        <a class="nav-link" href="{{url('order/issue/workLoad/index')}}" :class="{active:isActive('workLoad',3)}">工作量</a>
                     </li>
                 @endcan
                 @can('订单管理-问题件-绩效统计')
                     <li class="nav-item" >
-                        <a class="nav-link" href="{{url('orderIssuePerformance/index')}}" :class="{active:isActive('orderIssuePerformance',1)}">绩效统计</a>
+                        <a class="nav-link" href="{{url('order/issue/orderIssuePerformance/index')}}" :class="{active:isActive('orderIssuePerformance',3)}">绩效统计</a>
                     </li>
                 @endcan
                 @can('订单管理-问题件-编辑')

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

@@ -47,11 +47,16 @@
                 </tr>
             </table>
 
-            <a :href="performance.prev_page_url" class="btn btn-sm" :class="performance.current_page === 1 ?'':'btn-outline-primary'"
-               :disabled="performance.current_page === 1">上一页</a>
-            <a :href="performance.next_page_url" class="btn btn-sm"
-               :class="performance.current_page === performance.last_page ?'':'btn-outline-primary'"
-               :disabled="performance.current_page === performance.lastPage">下一页</a>
+
+            <button class="btn btn-sm" :class="performance.current_page <= 1 ?'':'btn-outline-primary'"
+                    @click="goPage(performance.current_page - 1)"
+                    :disabled="performance.from === 1">上一页
+            </button>
+            <button class="btn btn-sm"
+                    @click="goPage(performance.current_page + 1)"
+                    :class="performance.current_page === performance.last_page ?'':'btn-outline-primary'"
+                    :disabled="performance.current_page === performance.last_page">下一页
+            </button>
             <input @keyup.enter="pageTurning($event)" class="form-control-sm ml-3 tooltipTarget"
                    :placeholder="'当前页数：'+performance.current_page+'/'+performance.last_page" title="去往指定页">
             <span class="text-muted m-1">共 @{{performance.total}} 条 </span>
@@ -71,12 +76,12 @@
                     timeFrame:'{{$options['timeFrame']}}',
                     create_start:'{{$options['create_start']}}',
                     create_end:'{{$options['create_end']}}',
-
                 },
                 checkData:[],
             },
             mounted:function(){
                 $('#performance_div').removeClass("d-none");
+                console.log(this.performance);
                 let data =[
                     [{name:'create_start',type:'dateTime',tip:'统计时段开始',placeholder:'统计时段开始',killings:['timeFrame']},
                     {name:'create_end',type:'dateTime',tip:'统计时段结束',placeholder:'统计时段结束',killings:['timeFrame']},
@@ -92,15 +97,9 @@
                 queryForm.init();
             },
             methods: {
-                pageTurning(e){
-                    let page = $(e.target).val();
-                    if(page){
-                        window.location = this.performance.path+'?page='+page;
-                    }
-                },
                 exportAll:function(){
                     let search = '?timeFrame='+this.option.timeFrame+'&create_start='+this.option.create_start+'&create_end='+this.option.create_end;
-                    let url = '{{url('orderIssuePerformance/export')}}'+search;
+                    let url = '{{url('order/issue/orderIssuePerformance/export')}}'+search;
                     let token='{{ csrf_token() }}';
                     excelExport(false,'',url,null,token);
                 },
@@ -115,6 +114,25 @@
                         this.checkData = [];
                     }
                 },
+                pageTurning(e){
+                    let page = $(e.target).val();
+                    if (page > this.performance.last_page) {
+                        return;
+                    }
+                    this.goPage(page);
+                },
+                goPage(page){
+                    let href = window.location.href;
+                    if(href.indexOf('?')==-1){
+                        href+='?'
+                    }
+                    if(href.indexOf('page=')!==-1){
+                        href = href.replace('page='+this.performance.current_page,'page='+page);
+                    }else{
+                        href+='&page='+page;
+                    }
+                    window.location = href;
+                }
             },
         });
     </script>

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

@@ -157,12 +157,12 @@
                     }
                 },
                 exportSelected() {
-                    let url = '{{url('workLoad/export')}}';
+                    let url = '{{url('order/issue/workLoad/export')}}';
                     let token = '{{ csrf_token() }}';
                     excelExport(false, this.checkData, url, this.page.total, token);
                 },
                 exportAll() {
-                    let url = '{{url('workLoad/export')}}';
+                    let url = '{{url('order/issue/workLoad/export')}}';
                     let token = '{{ csrf_token() }}';
                     excelExport(true, null, url, null, token);
                 },
@@ -184,6 +184,9 @@
                 },
                 goPage(page){
                     let href = window.location.href;
+                    if(href.indexOf('?')==-1){
+                        href+='?'
+                    }
                     if(href.indexOf('page=')!==-1){
                         href = href.replace('page='+this.page.curPage,'page='+page);
                     }else{

routes/web.php

@@ -376,14 +376,12 @@ Route::group(['prefix'=>'order'],function(){
     Route::get('issue/excelImport','OrderIssueController@excelImport'); // 前往
     Route::get('issue/edit/{id}','OrderIssueController@edit');// 编辑
     Route::match(['get','post'],'issue/export','OrderIssueController@exportOrderIssue');// 导出
-});
 
-Route::group(['prefix'=>'orderIssuePerformance'],function(){
-        Route::get('index','OrderIssuePerformanceController@index');
-        Route::any('export','OrderIssuePerformanceController@export');
-});
+    Route::get('issue/workLoad/index','OrderIssuePerformanceController@workLoadPage');
+    Route::any('issue/workLoad/export','OrderIssuePerformanceController@exportWorkLoad');
 
-Route::group(['prefix'=>'workLoad'],function(){
-   Route::get('index','OrderIssuePerformanceController@workLoadPage');
-   Route::any('export','OrderIssuePerformanceController@exportWorkLoad');
+    Route::get('issue/orderIssuePerformance/index','OrderIssuePerformanceController@index');
+    Route::any('issue/orderIssuePerformance/export','OrderIssuePerformanceController@export');
 });
+
+