Merge branch 'yang'

routes/web.php

@@ -52,24 +52,6 @@ Route::post('personnel/checking-in/refreshQRCode','QRCodeController@refreshQRCod
 Route::post("record","ReceiveRecordController@receive");
 Route::get("record",function (){return view("rejected.record");});
 
-//人事管理
-Route::group(['prefix'=>'personnel','middleware'=>'auth'],function() {
-
-    //临时开放录入
-    Route::put('laborApply/temporaryOpen','LaborApplyController@temporaryOpen')->name('laborApply.temporaryOpen');
-    Route::get('laborApply/createDispatch','LaborApplyController@createDispatch')->name('laborApply.createDispatch');
-    //劳务派遣查看
-    Route::group(['prefix' => 'laborApply'], function () {
-        Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/laborCompanyReceivingOrder', 'LaborCompanyDispatchController@laborCompanyReceivingOrder')->name('laborCompanyDispatch.laborCompanyReceivingOrder');
-        Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/personnelCheck', 'LaborCompanyDispatchController@personnelCheck')->name('laborCompanyDispatch.personnelCheck');
-        Route::resource('laborCompanyDispatch','LaborCompanyDispatchController')->only(['index','edit','update']);
-        Route::get('laborCompanyDispatch/{laborCompanyDispatch}/detail/create','LaborCompanyDispatchController@createDetail')->name('laborCompanyDispatch.createDetail');
-        Route::get('laborCompanyDispatch/{laborCompanyDispatch}/detail/edit','LaborCompanyDispatchController@editDetail')->name('laborCompanyDispatch.editDetail');
-        Route::post('laborCompanyDispatch/{laborCompanyDispatch}/detail','LaborCompanyDispatchController@storeDetail')->name('laborCompanyDispatch.storeDetail');
-    });
-    Route::resource('laborApply', 'LaborApplyController');
-
-});
 
 //监视器
 Route::get('station/monitor/{station}','StationController@monitorShow');
@@ -638,8 +620,25 @@ Route::group(['prefix'=>'package'],function(){
         Route::post('deleteProcessContent/{id}','ProcessController@deleteProcessContent');
     });
     $route->resource('process','ProcessController');
+
     /** 人事 */
     $route->group(['prefix'=>'personnel'],function(){
+        Route::group(['middleware' => 'auth'], function () {
+            //临时开放录入
+            Route::put('laborApply/temporaryOpen','LaborApplyController@temporaryOpen')->name('laborApply.temporaryOpen');
+            Route::get('laborApply/createDispatch','LaborApplyController@createDispatch')->name('laborApply.createDispatch');
+            //劳务派遣查看
+            Route::group(['prefix' => 'laborApply'], function () {
+                Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/laborCompanyReceivingOrder', 'LaborCompanyDispatchController@laborCompanyReceivingOrder')->name('laborCompanyDispatch.laborCompanyReceivingOrder');
+                Route::patch('laborCompanyDispatch/{laborCompanyDispatch}/personnelCheck', 'LaborCompanyDispatchController@personnelCheck')->name('laborCompanyDispatch.personnelCheck');
+                Route::resource('laborCompanyDispatch','LaborCompanyDispatchController')->only(['index','edit','update']);
+                Route::get('laborCompanyDispatch/{laborCompanyDispatch}/detail/create','LaborCompanyDispatchController@createDetail')->name('laborCompanyDispatch.createDetail');
+                Route::get('laborCompanyDispatch/{laborCompanyDispatch}/detail/edit','LaborCompanyDispatchController@editDetail')->name('laborCompanyDispatch.editDetail');
+                Route::post('laborCompanyDispatch/{laborCompanyDispatch}/detail','LaborCompanyDispatchController@storeDetail')->name('laborCompanyDispatch.storeDetail');
+            });
+            Route::resource('laborApply', 'LaborApplyController');
+        });
+
         /** 绩效 */
         Route::group(['prefix'=>'report'],function(){
             Route::match(['GET','POST'],'export','CustomerController@projectReportExport');