调整人事管理 路由路径

app/Http/Controllers/LaborReportController.php

@@ -24,12 +24,7 @@ class LaborReportController extends Controller
     {
         app()->singleton('laborReportService',LaborReportService::class);
     }
-    /**
-     * Display a listing of the resource.
-     * @param  Request $request
-     * @return void
-     * 临时工报表
-     */
+
     public function index(Request $request)
     {
         if(!Gate::allows('人事管理-临时工报表')){ view('personnel/index');  }
@@ -278,7 +273,7 @@ class LaborReportController extends Controller
     function recycle(Request $request){
         if(!Gate::allows('人事管理-临时工报表-删除')){ return redirect('/');  }
         $paginateParams=$request->input();
-        $laborReports=LaborReport::query()->with(['user','userDutyCheck','userWorkgroup','laborCompany'])->onlyTrashed()->paginate($request->paginate??50);
+        $laborReports=LaborReport::query()->with(['user','userDutyCheck','userWorkgroup','laborCompany'])->orderByDesc('id')->onlyTrashed()->paginate($request->paginate??50);
         return view('personnel.laborReport.recycle',compact('laborReports','paginateParams'));
     }
 

app/Services/LaborReportService.php

@@ -202,10 +202,10 @@ class LaborReportService
     }
     public function 删除($id){
         $laborReport=LaborReport::query()->where('id',$id)->delete();
-        if ($laborReport>0)LaborReportStatus::create([
-            'labor_report_id'=>$id,
-            'status'=>'已删除',
-        ]);
+//        if ($laborReport>0)LaborReportStatus::create([
+//            'labor_report_id'=>$id,
+//            'status'=>'已删除',
+//        ]);
         Controller::logS(__METHOD__,'删除盘点记录时修改盘点任务信息'.__FUNCTION__,json_encode($id));
         return $laborReport;
     }

resources/views/layouts/menu.blade.php

@@ -48,7 +48,7 @@
                     <span class="fa fa-money" style="color: #72441b"></span>
                     结算管理</a></li> @endcan
         @can('人事管理')
-            <li class="nav-item"><a href="{{url("personnel/laborReport")}}" class="nav-link" target="personnel/laborReport"
+            <li class="nav-item"><a href="{{url("personnel/laborReport/index")}}" class="nav-link" target="personnel/laborReport"
                                     :class="{active:isActive('personnel',1)}">
                     <span class="fa fa-header" style="color: #72441b"></span>
                     人事管理</a></li> @endcan

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

@@ -524,7 +524,7 @@
                         let oldRemark = span.text();
                         let remark = target.val();
                         if(remark !== span.text()){
-                            let ajaxUrl= '{{url("laborReport/changeLaborReportRemark")}}';
+                            let ajaxUrl= '{{url("personnel/laborReport/changeLaborReportRemark")}}';
                             axios.post(ajaxUrl,{'id':id,'remark':remark}).then(function (response) {
                                 if(response.data.success){
                                     _this.updateLaborReports(id,remark);
@@ -550,7 +550,7 @@
                         let _this = this;
                         let id = target.attr('data_id');
                         let remark = target.val();
-                        let ajaxUrl= '{{url("laborReport/changeLaborReportRemark")}}';
+                        let ajaxUrl= '{{url("personnel/laborReport/changeLaborReportRemark")}}';
                         if(remark === ''|| remark === null){
                             target.css('width','75px');
                             return;
@@ -588,13 +588,13 @@
                         this.selectedStyle=id;
                     },
                     laborReportExport(checkAllSign){
-                        let url = '{{url('laborReport/export')}}';
+                        let url = '{{url('personnel/laborReport/export')}}';
                         let token='{{ csrf_token() }}';
                         excelExport(checkAllSign,checkData,url,this.sum,token);
                     },
                     //门卫审核
                     guardClockAudit(id,user_duty_check_id){
-                        let url='{{url("laborReport/guardClockAudit")}}';
+                        let url='{{url("personnel/laborReport/guardClockAudit")}}';
                         let _this=this;
                         axios.post(url,{id:id,user_duty_check_id:user_duty_check_id})
                             .then(function (response) {
@@ -622,7 +622,7 @@
                         let _this=this;
                         let id = getSelectId();
                         let remark=document.getElementById('remark').value;
-                        let url='{{url("laborReport/addRemarkAndGroupClock")}}';
+                        let url='{{url("personnel/laborReport/addRemarkAndGroupClock")}}';
                         if (remark==null|| remark=='' || remark=="undefined"){
                             tempTip.setDuration(3000);
                             tempTip.show("您还未添加任何备注");
@@ -655,7 +655,7 @@
                     },
                     //组长打卡审核
                     groupClockAudit(id,userWorkgroupNeedRemark){
-                        let url='{{url("laborReport/groupClockAudit")}}';
+                        let url='{{url("personnel/laborReport/groupClockAudit")}}';
                         let _this=this;
                         if (userWorkgroupNeedRemark){
                             selectId(id);
@@ -692,7 +692,7 @@
                     noDinner(){
                         let _this=this;
                         let id = _this.laborReportId;
-                        let url='{{url("laborReport/groupExport")}}';
+                        let url='{{url("personnel/laborReport/groupExport")}}';
                         axios.post(url,{id:id})
                             .then(function (response) {
                                 if (!response.data.success){
@@ -719,7 +719,7 @@
                     },
                     //退场有晚饭时间
                     makeSureRelax_time(){
-                        let url='{{url("laborReport/groupExportEnsure")}}';
+                        let url='{{url("personnel/laborReport/groupExportEnsure")}}';
                         let _this=this;
                         let id = _this.laborReportId;
                         axios.post(url,{id:id,relax_time:_this.relax_time})
@@ -765,7 +765,7 @@
                             $('#dinnerModal').modal('show');
                             return;
                         }
-                        let url='{{url("laborReport/groupExport")}}';
+                        let url='{{url("personnel/laborReport/groupExport")}}';
                         axios.post(url,{id:id})
                             .then(function (response) {
                                 if (!response.data.success){
@@ -803,7 +803,7 @@
                     },
                     updateLaborCompany(laborCompanyId,enter_number){
                         let _this=this;
-                        let url='{{url("laborReport/updateLaborCompany")}}';
+                        let url='{{url("personnel/laborReport/updateLaborCompany")}}';
                         axios.post(url,{enter_number:enter_number,laborCompanyId:laborCompanyId}).then(function (response) {
                             if (!response.data.success){
                                 tempTip.setDuration(3000);
@@ -828,7 +828,7 @@
                     删除(id,name){
                         let _this=this;
                         if(!confirm('确定要删除临时工为：“'+name+'”的报表记录吗？')){return};
-                        let url='{{url("laborReport/删除")}}/'+id;
+                        let url='{{url("personnel/laborReport/删除")}}/'+id;
                         axios.delete(url).then(
                             function (response) {
                                 if(!response.data.success){

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

@@ -6,11 +6,11 @@
             <ul class="nav nav-pills">
                 @can('人事管理-临时工报表')
                     <li class="nav-item">
-                        <a target="personnel/laborReport" class="nav-link" href="{{url('personnel/laborReport')}}" :class="{active:isActive('laborReport',2)}">查看</a>
+                        <a target="personnel/laborReport" class="nav-link" href="{{url('personnel/laborReport/index')}}" :class="{active:isActive('index',3)}">查看</a>
                     </li> @endcan
                 @can('人事管理-临时工报表-删除')
                     <li class="nav-item">
-                        <a target="laborReport/recycle" class="nav-link" href="{{url('laborReport/recycle')}}" :class="{active:isActive('recycle',2)}">回收站</a>
+                        <a target="laborReport/recycle" class="nav-link" href="{{url('personnel/laborReport/recycle')}}" :class="{active:isActive('recycle',3)}">回收站</a>
                     </li> @endcan
             </ul>
         </div>

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

@@ -131,7 +131,7 @@
                     let _this=this;
                     let delArr=[];
                     if (!confirm('确定要恢复所选内容吗？'))return;
-                    axios.post('{{url('laborReport/recover')}}',{checkData:checkData})
+                    axios.post('{{url('personnel/laborReport/recover')}}',{checkData:checkData})
                         .then(function (response) {
                             if (response.data.success){
                                 checkData.forEach(function (data) {

resources/views/personnel/menu.blade.php

@@ -4,7 +4,7 @@
         <ul class="nav nav-pills">
             @can('人事管理-临时工报表')
                 <li class="nav-item">
-                    <a target="personnel/laborReport" class="nav-link" href="{{url('personnel/laborReport')}}" :class="{active:isActive('laborReport',2)}">临时工报表</a>
+                    <a target="personnel/laborReport/index" class="nav-link" href="{{url('personnel/laborReport/index')}}" :class="{active:isActive('laborReport',2)}">临时工报表</a>
                 </li> @endcan
             @can('人事管理-卸货')
                 <li class="nav-item">

routes/web.php

@@ -560,7 +560,6 @@ Route::group(['prefix'=>'personnel'],function(){
 
     Route::get('relating',function (){return view('personnel/menuPersonnel');});
 
-    Route::resource('laborReport','LaborReportController');
     Route::group(['prefix'=>'discharge'],function(){
         /** 卸货任务 */
         Route::group(['prefix'=>'task'],function(){
@@ -584,24 +583,25 @@ Route::group(['prefix'=>'personnel'],function(){
             });
         });
     });
+    /** 临时工报表 */
+    Route::group(['prefix'=>'laborReport'],function(){
+        Route::get('index','LaborReportController@index');
+        Route::post('recover','LaborReportController@recover');
+        Route::get('recycle','LaborReportController@recycle');
+        Route::post('guardClockAudit','LaborReportController@guardClockAudit');
+        Route::post('groupClockAudit','LaborReportController@groupClockAudit');
+        Route::post('addRemarkAndGroupClock','LaborReportController@addRemarkAndGroupClock');
+        Route::post('groupExport','LaborReportController@groupExport');
+        Route::post('groupExportEnsure','LaborReportController@groupExportEnsure');
+        Route::any('export','LaborReportController@export');
+        Route::post('updateLaborCompany','LaborReportController@updateLaborCompany');
+        Route::any('删除/{id}','LaborReportController@删除');
+        Route::post('changeLaborReportRemark', 'LaborReportController@changeLaborReportRemark');
+    });
+//    Route::resource('laborReport','LaborReportController');
 });
 
-Route::get('getLaborReport','LaborReportController@getDailyLabor');
-
-/** 临时工报表 */
-Route::group(['prefix'=>'laborReport'],function(){
-    Route::post('recover','LaborReportController@recover');
-    Route::get('recycle','LaborReportController@recycle');
-    Route::post('guardClockAudit','LaborReportController@guardClockAudit');
-    Route::post('groupClockAudit','LaborReportController@groupClockAudit');
-    Route::post('addRemarkAndGroupClock','LaborReportController@addRemarkAndGroupClock');
-    Route::post('groupExport','LaborReportController@groupExport');
-    Route::post('groupExportEnsure','LaborReportController@groupExportEnsure');
-    Route::any('export','LaborReportController@export');
-    Route::post('updateLaborCompany','LaborReportController@updateLaborCompany');
-    Route::any('删除/{id}','LaborReportController@删除');
-    Route::post('changeLaborReportRemark', 'LaborReportController@changeLaborReportRemark');
-});
+
 
 /** 库存 */
 Route::group(['prefix'=>'inventory'],function(){