Merge branch 'master' into waybill_ZD

# Conflicts:
#	routes/web.php

routes/web.php

@@ -122,8 +122,75 @@ Route::resource('store/storeItem','StoreItemsController');
 /**
  * 二次加工单
  */
+Route::group(['prefix'=>'process'],function(){
+    //相关设置
+    Route::get('relating',function (){return view('process.menuProcess');});
+    //统计页面
+    Route::get('statistic','ProcessStatisticController@index');
+    //获取每日参与人
+    Route::post('getDailyParticipant','ProcessController@getDailyParticipant');
+    //驳回
+    Route::post('reject/{id}','ProcessController@reject');
+    //接单
+    Route::post('receive/{id}','ProcessController@receive');
+    //完成
+    Route::post('accomplish/{id}','ProcessController@accomplish');
+    //修改每日产量
+    Route::post('updateDailyOutput','ProcessController@updateDailyOutput');
+    //添加参与人
+    Route::post('shortProcessDailyParticipant','ProcessController@shortProcessDailyParticipant');
+    //验证参与人
+    Route::post('verifyUserName','ProcessController@verifyUserName');
+    //修改参与人
+    Route::post('updateProcessDailyParticipant','ProcessController@updateProcessDailyParticipant');
+    //参与人审核
+    Route::post('processDailyParticipantAudit/{id}','ProcessController@processDailyParticipantAudit');
+    //临时工详情
+    //Route::post('showUserDetail','ProcessController@showUserDetail');
+    //获取全部教程
+    Route::post('getTutorials/{id}','ProcessController@getTutorials');
+    //添加教程关联
+    Route::post('selectedTutorial','ProcessController@selectedTutorial');
+    //删除教程关联
+    Route::post('deleteTutorial','ProcessController@deleteTutorial');
+    //根据货主获取教程
+    Route::post('ownerGetTutorials/{owner_id}','ProcessController@ownerGetTutorials');
+    //录入补卡
+    Route::get('checking-in/createReplenishClock','ProcessController@createReplenishClock');
+    //搜索临时工下打卡信息
+    Route::post('checkUserLabors','ProcessController@checkUserLabors');
+    //录入补卡
+    Route::post('storeReplenishClock','ProcessController@storeReplenishClock');
+    //去往打卡审核
+    Route::get('checking-in/clockAudit','ProcessController@clockAudit');
+    //去往任务审核
+    Route::get('checking-in/missionAudit','ProcessController@missionAudit');
+    //打卡审核
+    Route::post('storeClockAudit','ProcessController@storeClockAudit');
+    //打卡审核登出类型判断异常
+    Route::post('isException','ProcessController@isException');
+    //任务审核
+    Route::post('storeMissionAudit','ProcessController@storeMissionAudit');
+    //删除二次加工内容单
+    Route::post('deleteProcessContent/{id}','ProcessController@deleteProcessContent');
+});
 //process主方法 restful
 Route::resource('process','ProcessController');
+/**
+ *  用户打卡
+ */
+Route::group(['prefix'=>'userDutyCheck'],function(){
+    //获取当日二维码
+    Route::get('getQRCode','UserDutyCheckController@getQRCode');
+    //进入打卡接口
+    Route::get('clock','UserDutyCheckController@clock');
+    //提交打卡
+    Route::post('storeClock','UserDutyCheckController@storeClock');
+    //去往登记资料页面
+    Route::get('createUserDetail/{mobile_phone}','UserDutyCheckController@createUserDetail');
+    //提交登记资料
+    Route::post('storeUserDetail','UserDutyCheckController@storeUserDetail');
+});
 Route::group(['prefix'=>'process'],function(){
     //相关设置
     Route::get('relating',function (){return view('process.menuProcess');});
@@ -176,6 +243,8 @@ Route::group(['prefix'=>'process'],function(){
     //删除二次加工内容单
     Route::post('deleteProcessContent/{id}','ProcessController@deleteProcessContent');
 });
+//process主方法 restful
+Route::resource('process','ProcessController');
 /**
  *  用户打卡
  */