人事管理--临时工报表分页

全局自动修改number为input类型并过滤

app/Http/Controllers/LaborReportController.php

@@ -74,17 +74,18 @@ class LaborReportController extends Controller
         if ($request->input()){
             $laborReports=LaborReport::orderBy('id','DESC');
             $laborReports=$this->conditionQuery($request,$laborReports);
+            $laborReportsPaginate=$laborReports->paginate($request->input('paginate')?$request->input('paginate'):50);
             $laborReports=$laborReports->paginate($request->input('paginate')?$request->input('paginate'):50);
             $userWorkGroups=UserWorkgroup::select('id','name')->get();
-            return view('personnel.laborReport.index',['laborReports'=>$laborReports,'userWorkGroups'=>$userWorkGroups,'request'=>$request->input(),'permittingWorkgroups'=>$permittingWorkgroups,'laravelEchoPrefix'=>$laravelEchoPrefix,]);
+            return view('personnel.laborReport.index',['laborReportsPaginate'=>$laborReportsPaginate,'laborReports'=>$laborReports,'userWorkGroups'=>$userWorkGroups,'request'=>$request->input(),'permittingWorkgroups'=>$permittingWorkgroups,'laravelEchoPrefix'=>$laravelEchoPrefix,]);
         }
         $laborReportsBuilder=LaborReport::with(['user','userDutyCheck','userWorkgroup'])->whereIn('user_workgroup_id',$userWorkgroupIds);
         if(Gate::allows('人事管理-临时工报表-可见全部组')||Gate::allows('人事管理-门卫审核')){
             $laborReportsBuilder->orWhereNull('user_workgroup_id');
         }
-        $laborReports=$laborReportsBuilder->orderBy('id','DESC')->paginate(50);
-        $laborReports=$laborReports->sortBy('name');
-        $laborReports->values()->all();
+        $laborReportsPaginate=$laborReportsBuilder->orderBy('id','DESC')->paginate(50);
+        $laborReports=$laborReportsPaginate->sortBy('name');
+        //$laborReports->values()->all();
         foreach ($laborReports as $laborReport){
 //            if (!$laborReport->group_user_id){
 //                //三十分钟之内组长未审核实行软删除
@@ -101,7 +102,7 @@ class LaborReportController extends Controller
             }
         }
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
-        return view('personnel/laborReport/index',['laborReports'=>$laborReports,'userWorkGroups'=>$userWorkGroups,'laravelEchoPrefix'=>$laravelEchoPrefix,'permittingWorkgroups'=>$permittingWorkgroups]);
+        return view('personnel/laborReport/index',compact('laborReports','laborReportsPaginate','userWorkGroups','laravelEchoPrefix','permittingWorkgroups'));
 
     }
     public function export($id,Request $request){

resources/js/app.js

@@ -1,8 +1,10 @@
 
 require('./bootstrap');
+require('./mounted');
 
 window.Vue = require('vue');
 window.tempTip=require('./utilities/tempTip');
 window.getGetVal=require('./utilities/getGetVal');
 window.scanner=require('./utilities/scanner');
 window.datetimeRelating=require('./utilities/datetimeRelating');
+

resources/js/mounted.js

@@ -0,0 +1,15 @@
+
+
+//解决input number类型上下滚动 禁用滚轮事件
+setTimeout(function () {
+    for (let i=0;i<$("input[type='number']").length;i++){
+        $("input[type='number']")[i].setAttribute('onmousewheel','return false');//禁止谷歌浏览器、Opera浏览器以及360浏览器等采用谷歌内核的浏览器
+        $("input[type='number']")[i].addEventListener('DOMMouseScroll', MouseWheel, false);//禁止Firefox浏览器
+    }
+},100);
+function MouseWheel(event) {
+    event = event || window.event;
+    event.preventDefault();
+
+}
+

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

@@ -202,6 +202,7 @@
                     </tr>
                     </tbody>
                 </table>
+        <div>{{$laborReportsPaginate->links()}}</div>
         {{--      选择晚饭时长弹框      --}}
         <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
             <div class="modal-dialog">
@@ -336,12 +337,37 @@
                         window.location.reload();
                     }, 500);
                 });
+                {{--Echo.channel('{{$laravelEchoPrefix}}userDutyCheck').listen('GuardAuditEvent',(e)=>{--}}
+                {{--    let userDutyCheck=e.userDutyCheck;--}}
+                {{--    let _this=this;--}}
+                {{--    _this.laborReports.every(function (laborReport) {--}}
+                {{--        if (laborReport.userDutyCheckId==userDutyCheck.id){--}}
+                {{--            laborReport.userDutyCheck=userDutyCheck;--}}
+                {{--            laborReport.userDutyCheckVerifyUserId=userDutyCheck.verify_user_id;--}}
+                {{--            return false--}}
+                {{--        }--}}
+                {{--        return true;--}}
+                {{--    });--}}
+                {{--});--}}
                 //组长审核
                 Echo.channel('{{$laravelEchoPrefix}}laborReport').listen('TeamAuditEvent',(e)=>{
                     setTimeout(function (){
                         window.location.reload();
                     }, 500);
                 });
+                {{--Echo.channel('{{$laravelEchoPrefix}}laborReport').listen('TeamAuditEvent',(e)=>{--}}
+                {{--    let labor=e.laborReport;--}}
+                {{--    let _this=this;--}}
+                {{--    setTimeout(function (){--}}
+                {{--        _this.laborReports.every(function (laborReport) {--}}
+                {{--            if (laborReport.id==labor.id){--}}
+                {{--                laborReport.groupUserId==labor.group_user_id;--}}
+                {{--                return false--}}
+                {{--            }--}}
+                {{--            return true;--}}
+                {{--        });--}}
+                {{--    }, 500);--}}
+                {{--});--}}
                 //进组
                 this.permittingWorkgroups.forEach(function(workgroup){
                     Echo.channel('{{$laravelEchoPrefix}}'+workgroup.token).listen('ClockinEvent',(e)=>{

resources/views/waybill/edit.blade.php

@@ -260,7 +260,7 @@
                         <label for="carrier_id" class="col-2 col-form-label text-right text-primary">计数</label>
                         <div class="col-5">
                             <input type="number" class="form-control @error('amount') is-invalid @enderror"
-                                   name="amount" autocomplete="off" v-model="waybill.amount" id="amount" >
+                                   name="amount" autocomplete="off" v-model="waybill.amount" id="amount">
                             @error('amount')
                             <span class="invalid-feedback" role="alert">
                                 <strong>{{ $message }}</strong>