完善人事管理录入补卡相关逻辑

app/Http/Controllers/PersonnelController.php

@@ -3,17 +3,21 @@
 namespace App\Http\Controllers;
 
 use App\Events\TeamAuditEvent;
+use App\LaborCompany;
 use App\LaborReport;
 use App\ProcessDailyParticipant;
 use App\User;
 use App\UserDetail;
 use App\UserDutyCheck;
+use App\UserLabor;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Validator;
+use Ramsey\Uuid\Uuid;
 
 class PersonnelController extends Controller
 {
@@ -83,15 +87,15 @@ class PersonnelController extends Controller
         $type=$request->input('type');
         $userDutyCheck->type=$type;
         $userDutyCheck->group_user_id=Auth::user()['id'];
+        $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->where('check_in_at',$userDutyCheck->checked_at)->first();
         $userDutyCheck->update();
-        $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->first();
-        $this->updateLaborReportData($laborReport,$userDutyCheck);
+        $this->updateLaborReportVerify($laborReport,$userDutyCheck);
         $this->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         event(new TeamAuditEvent($userDutyCheck));
         return ["success"=>true,"data"=>$userDutyCheck->group_user_id];
     }
-    //修改临时工报表数据
-    public function updateLaborReportData($laborReport,$userDutyCheck){
+    //修改临时工报表审核时间
+    public function updateLaborReportVerify($laborReport,$userDutyCheck){
         $date=date('Y-m-d H:i:s');
         $laborReport['verify_at']=$date;
         $laborReport['group_user_id']=$userDutyCheck->group_user_id;
@@ -104,7 +108,7 @@ class PersonnelController extends Controller
     public function missionAudit(Request $request){
         if(!Gate::allows('人事管理-任务审核')){ return redirect(url('/'));  }
         $processDailyParticipants=ProcessDailyParticipant::with(['processDaily','user_detail'=>function($builder){
-           return $builder->with(['user'=>function($builder){return $builder->with(['userWorkgroups']);},'user_labor'=>function($builder){return $builder->with(['laborCompany']);}]);
+            return $builder->with(['user'=>function($builder){return $builder->with(['userWorkgroups']);},'user_labor'=>function($builder){return $builder->with(['laborCompany']);}]);
         }])->orderBy('id','DESC');
         $start_date=$request->input('start_date');
         $end_date=$request->input('end_date');
@@ -156,11 +160,11 @@ class PersonnelController extends Controller
         $dateNow=Carbon::now()->format('Y-m-d');
         $yesterdayDate=Carbon::now()->addDays(-1)->format('Y-m-d');
         $beforeYesterdayDate=Carbon::now()->addDays(-2)->format('Y-m-d');
-        $userDutyCheckNows=UserDutyCheck::with(['userDetail.user.userWorkgroups','userDetail.user_labor.laborCompany'])->whereIn("user_id",$user_ids)
+        $userDutyCheckNows=UserDutyCheck::with(['userDetail.user.userWorkgroups','userLabor.laborCompany'])->whereIn("user_id",$user_ids)
             ->where('checked_at','like',$dateNow."%")->where('type','登入')->get();
-        $userDutyCheckYesterdays=UserDutyCheck::with(['userDetail.user.userWorkgroups','userDetail.user_labor.laborCompany'])->whereIn("user_id",$user_ids)
+        $userDutyCheckYesterdays=UserDutyCheck::with(['userDetail.user.userWorkgroups','userLabor.laborCompany'])->whereIn("user_id",$user_ids)
             ->where('checked_at','like',$yesterdayDate."%")->where('type','登入')->get();
-        $userDutyCheckBefores=UserDutyCheck::with(['userDetail.user.userWorkgroups','userDetail.user_labor.laborCompany'])->whereIn("user_id",$user_ids)
+        $userDutyCheckBefores=UserDutyCheck::with(['userDetail.user.userWorkgroups','userLabor.laborCompany'])->whereIn("user_id",$user_ids)
             ->where('checked_at','like',$beforeYesterdayDate."%")->where('type','登入')->get();
         return view('personnel/checking-in/clockAudit',['userDutyCheckYesterdays'=>$userDutyCheckYesterdays,'userDutyCheckNows'=>$userDutyCheckNows,'userDutyCheckBefores'=>$userDutyCheckBefores,'workgroupSign'=>$result['workgroupSign']]);
     }
@@ -173,17 +177,25 @@ class PersonnelController extends Controller
         $user_id=$request->input('user_id');
         $checked_at=$request->input('checked_at');
         $type=$request->input('type');
+        $userWorkgroupID=DB::table('user_workgroup_user')->where('user_id',$user_id)->value('user_workgroup_id');
         $userDutyCheck=new UserDutyCheck([
             'user_id'=>$user_id,
             'checked_at'=>$checked_at,
             'type'=>$type,
             'source'=>'补入',
+            'workgroup_id'=>$userWorkgroupID
         ]);
         $userDutyCheck->save();
+        $checkInDate=Carbon::parse($checked_at)->format('Y-m-d');
+        $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('check_in_at','like',$checkInDate."%")->where('user_id',$user_id)->first();
+        if(!$laborReport&&$userDutyCheck->type=='登入'){
+            LaborReport::createLaborReportData($user_id,$userWorkgroupID,$userDutyCheck);
+        }else if ($laborReport&&$userDutyCheck->type=='登出'){
+            LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
+        }
         $this->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         return ['success'=>true,'data'=>$userDutyCheck];
     }
-
     //搜索临时工下打卡信息
     public function checkUserLabors(Request $request){
         if(!Gate::allows('人事管理-录入补卡')){ return redirect(url('/'));  }

app/Http/Controllers/UserDutyCheckController.php

@@ -46,17 +46,13 @@ class UserDutyCheckController extends Controller
             $user_id=Cache::get('tokenStr_'.$userLaborToken);
             $userDetail=UserDetail::find($user_id);
             if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$userDetail->mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
-            if ($userWorkgroupID){
-                $user=UserToken::getUser($userLaborToken);
-                $user->userWorkgroups()->sync([$userWorkgroupID]);
-            }
             $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
             //正常情况
             $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',Carbon::now()->format('Y-m-d')."%")->where('user_id',$userDetail->user_id)->first();
             if(!isset($laborReport)&&$userDutyCheck->type=='登入'){
-                $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
+                LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
             }else if ($laborReport&&$userDutyCheck->type=='登出'){
-                $this->updateLaborReportData($laborReport,$userDutyCheck);
+                LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
             }
             if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
             if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
@@ -78,8 +74,7 @@ class UserDutyCheckController extends Controller
         if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
         $user=User::find($userDetail->user_id);
         if (Cache::has('tokenUser_'.$user->id))return "<h1 style='color: red;text-align:center'>请使用原有设备进行打卡,如无法使用原有设备请联系管理人员解绑设备!</h1>";
-        if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
-
+        //if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
         $userDutyCheckOld=UserDutyCheck::where('user_id',$userDetail->user_id)->orderBy('checked_at','DESC')->limit(10)->first();
         $date=date('Y-m-d H:i:s');
         $lastDate=Carbon::parse($userDutyCheckOld['checked_at']);
@@ -94,9 +89,9 @@ class UserDutyCheckController extends Controller
         //正常情况
         $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
         if(!$laborReport&&$userDutyCheck->type=='登入'){
-            $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
+            LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
         }else if ($laborReport&&$userDutyCheck->type=='登出'){
-            $this->updateLaborReportData($laborReport,$userDutyCheck);
+            LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
         }
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
@@ -133,7 +128,7 @@ class UserDutyCheckController extends Controller
         $this->log(__METHOD__,"更改临时工劳务所信息".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
         //添加临时工报表数据
-        $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
+        LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
         $user=User::find($userDetail->user_id);
@@ -157,7 +152,7 @@ class UserDutyCheckController extends Controller
         ]);
         $user->save();
         $this->log(__METHOD__,"创建临时工用户__".__FUNCTION__,json_encode($user));
-        if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
+        //if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
         $userDetail=new UserDetail([
             'user_id'=>$user->id,
             'full_name'=>$full_name,
@@ -176,7 +171,7 @@ class UserDutyCheckController extends Controller
         $userLabor->save();
         $this->log(__METHOD__,"提交临时工对应劳务所信息__".__FUNCTION__,json_encode($userLabor));
         $userDutyCheck=$this->dutyCheck($user->id,$userWorkgroupID);
-        $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
+        LaborReport::createLaborReportData($user->id,$userWorkgroupID,$userDutyCheck);
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
@@ -188,15 +183,19 @@ class UserDutyCheckController extends Controller
     }
 
     //根据用户提交打卡记录
-    public function dutyCheck($user_id,$workgroup_id){
+    public function dutyCheck($user_id,$userWorkgroupID){
         $userDutyCheckOld=UserDutyCheck::where('user_id',$user_id)->orderBy('checked_at','DESC')->limit(10)->first();
+        if ($userWorkgroupID!=$userDutyCheckOld['workgroup_id']){
+            $user=User::find($user_id);
+            $user->userWorkgroups()->sync([$userWorkgroupID]);
+        }
         $date=date('Y-m-d H:i:s');
         $userDutyCheck=new UserDutyCheck([
             'user_id'=>$user_id,
             'checked_at'=>$date,
             'source'=>'正常',
             'verify_user_id'=>'',
-            'workgroup_id'=>$workgroup_id,
+            'workgroup_id'=>$userWorkgroupID,
         ]);
         if (!$userDutyCheckOld){
             $userDutyCheck->type="登入";
@@ -243,59 +242,59 @@ class UserDutyCheckController extends Controller
         $this->log(__METHOD__,"提交打卡记录__".__FUNCTION__,json_encode($userDutyCheck));
         return $userDutyCheck;
     }
-    //添加临时工报表数据
-    public function createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck){
-        $user_id=$userDetail['user_id'];
-        $name=$userDetail['full_name'];
-        $mobile_phone=$userDetail['mobile_phone'];
-        $identity_number=$userDetail['identity_number'];
-        $labor_company_id=UserLabor::where('user_id',$user_id)->value('labor_company_id');
-        $labor_company=LaborCompany::where('id',$labor_company_id)->value('name');
-        if ($userDutyCheck->type=='登入'){
-            $check_in_at=$userDutyCheck['checked_at'];
-        }
-        $laborReport=new LaborReport([
-            'enter_number'=>Uuid::uuid1(),
-            'user_workgroup_id'=>$userWorkgroupID,
-            'user_id'=>$user_id,
-            'name'=>$name,
-            'mobile_phone'=>$mobile_phone,
-            'identity_number'=>$identity_number,
-            'labor_company'=>$labor_company,
-            'check_in_at'=>$check_in_at,
-        ]);
-        $laborReport->save();
-        $number_id=$laborReport->id;
-        $enter_number=$userWorkgroupID.date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
-        $laborReport->enter_number=$enter_number;
-        $laborReport->update();
-        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
-        return;
-    }
-    //修改临时工报表数据
-    public function updateLaborReportData($laborReport,$userDutyCheck){
-        $laborReport->check_out_at=$userDutyCheck->checked_at;
-        $checkInDate=Carbon::parse($laborReport['check_in_at']);
-        $checkOutDate=Carbon::parse($userDutyCheck->checked_at);
-        $hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
-        $laborReport['online_duration']=$hour;
-        $laborReport['working_duration']=$hour;
-        $laborReport->update();
-        $date=Carbon::parse($laborReport['check_in_at'])->format('Y-m-d');
-        if ($laborReport->check_out_at>$date." 14:00:00"){
-            $userDutyCheckStart=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
-                ->where('checked_at','<=',$date." 14:00:00")->where('type','登出')->first();
-            $userDutyCheckEnd=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
-                ->where('checked_at','<=',$date." 14:00:00")->where('type','登入')->first();
-            $beginTime=Carbon::parse($userDutyCheckStart['checked_at']);
-            $endTime=Carbon::parse($userDutyCheckEnd['checked_at']);
-            $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
-            $laborReport['working_duration']=$hour-$lunchHour;
-            $laborReport->update();
-        }
-        $this->log(__METHOD__,__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
-        return;
-    }
+//    //添加临时工报表数据
+//    public function createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck){
+//        $user_id=$userDetail['user_id'];
+//        $name=$userDetail['full_name'];
+//        $mobile_phone=$userDetail['mobile_phone'];
+//        $identity_number=$userDetail['identity_number'];
+//        $labor_company_id=UserLabor::where('user_id',$user_id)->value('labor_company_id');
+//        $labor_company=LaborCompany::where('id',$labor_company_id)->value('name');
+//        if ($userDutyCheck->type=='登入'){
+//            $check_in_at=$userDutyCheck['checked_at'];
+//        }
+//        $laborReport=new LaborReport([
+//            'enter_number'=>Uuid::uuid1(),
+//            'user_workgroup_id'=>$userWorkgroupID,
+//            'user_id'=>$user_id,
+//            'name'=>$name,
+//            'mobile_phone'=>$mobile_phone,
+//            'identity_number'=>$identity_number,
+//            'labor_company'=>$labor_company,
+//            'check_in_at'=>$check_in_at,
+//        ]);
+//        $laborReport->save();
+//        $number_id=$laborReport->id;
+//        $enter_number=$userWorkgroupID.date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
+//        $laborReport->enter_number=$enter_number;
+//        $laborReport->update();
+//        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
+//        return;
+//    }
+//    //修改临时工报表数据
+//    public function updateLaborReportData($laborReport,$userDutyCheck){
+//        $laborReport->check_out_at=$userDutyCheck->checked_at;
+//        $checkInDate=Carbon::parse($laborReport['check_in_at']);
+//        $checkOutDate=Carbon::parse($userDutyCheck->checked_at);
+//        $hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
+//        $laborReport['online_duration']=$hour;
+//        $laborReport['working_duration']=$hour;
+//        $laborReport->update();
+//        $date=Carbon::parse($laborReport['check_in_at'])->format('Y-m-d');
+//        if ($laborReport->check_out_at>$date." 14:00:00"){
+//            $userDutyCheckStart=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
+//                ->where('checked_at','<=',$date." 14:00:00")->where('type','登出')->first();
+//            $userDutyCheckEnd=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
+//                ->where('checked_at','<=',$date." 14:00:00")->where('type','登入')->first();
+//            $beginTime=Carbon::parse($userDutyCheckStart['checked_at']);
+//            $endTime=Carbon::parse($userDutyCheckEnd['checked_at']);
+//            $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
+//            $laborReport['working_duration']=$hour-$lunchHour;
+//            $laborReport->update();
+//        }
+//        $this->log(__METHOD__,__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
+//        return;
+//    }
 
     public function validator(Request $request){
         $validator=Validator::make($request->input(),[

app/LaborReport.php

@@ -2,8 +2,11 @@
 
 namespace App;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
+use Illuminate\Support\Facades\Auth;
+use Ramsey\Uuid\Uuid;
 
 class LaborReport extends Model
 {
@@ -19,4 +22,58 @@ class LaborReport extends Model
     public function user(){
         return $this->belongsTo('App\User','group_user_id','id');
     }
+
+    //添加临时工报表数据
+    static function createLaborReportData($user_id,$userWorkgroupID,$userDutyCheck){
+        $userDetail=UserDetail::find($user_id);
+        $name=$userDetail['full_name'];
+        $mobile_phone=$userDetail['mobile_phone'];
+        $identity_number=$userDetail['identity_number'];
+        $labor_company_id=UserLabor::where('user_id',$user_id)->value('labor_company_id');
+        $labor_company=LaborCompany::where('id',$labor_company_id)->value('name');
+        if ($userDutyCheck->type=='登入'){
+            $check_in_at=$userDutyCheck['checked_at'];
+        }
+        $laborReport=new LaborReport([
+            'enter_number'=>Uuid::uuid1(),
+            'user_workgroup_id'=>$userWorkgroupID,
+            'user_id'=>$user_id,
+            'name'=>$name,
+            'mobile_phone'=>$mobile_phone,
+            'identity_number'=>$identity_number,
+            'labor_company'=>$labor_company,
+            'check_in_at'=>$check_in_at,
+        ]);
+        $laborReport->save();
+        $number_id=$laborReport->id;
+        $enter_number=$userWorkgroupID.date ("ymd").str_pad($number_id>99999?$number_id%99999:$number_id,4,"0",STR_PAD_LEFT);
+        $laborReport->enter_number=$enter_number;
+        $laborReport->update();
+        //$this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
+        return;
+    }
+    //修改临时工报表数据
+    static function updateLaborReportData($laborReport,$userDutyCheck){
+        $laborReport->check_out_at=$userDutyCheck->checked_at;
+        $checkInDate=Carbon::parse($laborReport['check_in_at']);
+        $checkOutDate=Carbon::parse($userDutyCheck->checked_at);
+        $hour=($checkOutDate->diffInSeconds($checkInDate))/3600; //在线时长
+        $laborReport['online_duration']=$hour;
+        $laborReport['working_duration']=$hour;
+        $laborReport->update();
+        $date=Carbon::parse($laborReport['check_in_at'])->format('Y-m-d');
+        if ($laborReport->check_out_at>$date." 14:00:00"){
+            $userDutyCheckStart=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
+                ->where('checked_at','<=',$date." 14:00:00")->where('type','登出')->first();
+            $userDutyCheckEnd=UserDutyCheck::where('user_id',$laborReport->user_id)->where('workgroup_id',$laborReport->user_workgroup_id)->where('checked_at','>=',$date." 11:00".":00")
+                ->where('checked_at','<=',$date." 14:00:00")->where('type','登入')->first();
+            $beginTime=Carbon::parse($userDutyCheckStart['checked_at']);
+            $endTime=Carbon::parse($userDutyCheckEnd['checked_at']);
+            $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
+            $laborReport['working_duration']=$hour-$lunchHour;
+            $laborReport->update();
+        }
+        //$this->log(__METHOD__,__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
+        return;
+    }
 }

app/UserDetail.php

@@ -29,7 +29,9 @@ class UserDetail extends Model
     }
     public function getUserLaborCompanyAttribute()
     {
-        return $this['user_labor'] ?$this['user_labor']['labor_company_id'] : null;
+        $laborCompanyId=$this['user_labor']['labor_company_id']??0;
+        $laborCompany=LaborCompany::find($laborCompanyId);
+        return $this['user_labor_company']=$laborCompany['name'];
     }
 
 

app/UserDutyCheck.php

@@ -18,5 +18,8 @@ class UserDutyCheck extends Model
         return $this->belongsTo('App\UserDetail','user_id','user_id');
     }
 
+    public function userLabor(){
+        return $this->belongsTo('App\UserLabor','user_id','user_id');
+    }
 
 }

resources/views/personnel/checking-in/clock.blade.php

@@ -14,7 +14,7 @@
                         <label for="mobile_phone" class="form-check-label col-3 pull-right">手机号：</label>
                         <input name="mobile_phone" id="mobile_phone" class="@error('mobile_phone') is-invalid @enderror col-7 form-control" type="text">
                     </div>
-                    <input hidden name="userWorkgroupID" value="{{$userWorkgroupID}}">
+                    <input type="hidden" name="userWorkgroupID" value="{{$userWorkgroupID}}">
                     <div class="form-group row pt-3">
                         <button type="submit" class="col-7 offset-3 btn btn-success">提交</button>
                     </div>

resources/views/personnel/checking-in/clockAudit.blade.php

@@ -47,7 +47,7 @@
                             </select>
                         </td>
                         <td  class="text-muted"><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.mobile_phone }}</span></td>
-                        <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.user_labor.labor_company.name }}</span></td>
+                        <td ><span v-if="userDutyCheck.user_labor">@{{ userDutyCheck.user_labor.labor_company.name }}</span></td>
                         <td class="font-weight-bold"><span v-if="userDutyCheck.user_detail.user.user_workgroups&&userDutyCheck.user_detail.user.user_workgroups.length>0">
                                 @{{ userDutyCheck.user_detail.user.user_workgroups[0].name }}</span></td>
                         <td>@{{ userDutyCheck.exception }}</td>
@@ -95,7 +95,7 @@
                             </select>
                         </td>
                         <td  class="text-muted"><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.mobile_phone }}</span></td>
-                        <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.user_labor.labor_company.name }}</span></td>
+                        <td ><span v-if="userDutyCheck.user_labor">@{{ userDutyCheck.user_labor.labor_company.name }}</span></td>
                         <td class="font-weight-bold"><span v-if="userDutyCheck.user_detail.user.user_workgroups&&userDutyCheck.user_detail.user.user_workgroups.length>0">
                                 @{{ userDutyCheck.user_detail.user.user_workgroups[0].name }}</span></td>
                         <td>@{{ userDutyCheck.exception }}</td>
@@ -143,7 +143,7 @@
                             </select>
                         </td>
                         <td  class="text-muted"><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.mobile_phone }}</span></td>
-                        <td ><span v-if="userDutyCheck.user_detail">@{{ userDutyCheck.user_detail.user_labor.labor_company.name }}</span></td>
+                        <td ><span v-if="userDutyCheck.user_labor">@{{ userDutyCheck.user_labor.labor_company.name }}</span></td>
                         <td class="font-weight-bold"><span v-if="userDutyCheck.user_detail.user.user_workgroups&&userDutyCheck.user_detail.user.user_workgroups.length>0">
                                 @{{ userDutyCheck.user_detail.user.user_workgroups[0].name }}</span></td>
                         <td>@{{ userDutyCheck.exception }}</td>
@@ -166,7 +166,8 @@
                     {id:'{{$userDutyCheck->id}}',user_id:'{{$userDutyCheck->user_id}}',
                         checked_at:'{{$userDutyCheck->checked_at}}',
                         type:'{{$userDutyCheck->type}}',verify_user_id:'{{$userDutyCheck->verify_user_id}}',group_user_id:'{{$userDutyCheck->group_user_id}}',
-                        exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif },
+                        exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif,
+                        @if($userDutyCheck->userLabor)user_labor:{!! $userDutyCheck->userLabor !!} @endif},
                     @endforeach
                 ],
                 userDutyCheckNows:[
@@ -174,7 +175,8 @@
                     {id:'{{$userDutyCheck->id}}',user_id:'{{$userDutyCheck->user_id}}',
                         checked_at:'{{$userDutyCheck->checked_at}}',
                         type:'{{$userDutyCheck->type}}',verify_user_id:'{{$userDutyCheck->verify_user_id}}',group_user_id:'{{$userDutyCheck->group_user_id}}',
-                        exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif },
+                        exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif,
+                        @if($userDutyCheck->userLabor)user_labor:{!! $userDutyCheck->userLabor !!} @endif},
                     @endforeach
                 ],
                 userDutyCheckBefores:[
@@ -182,7 +184,8 @@
                     {id:'{{$userDutyCheck->id}}',user_id:'{{$userDutyCheck->user_id}}',
                         checked_at:'{{$userDutyCheck->checked_at}}',
                         type:'{{$userDutyCheck->type}}',verify_user_id:'{{$userDutyCheck->verify_user_id}}',group_user_id:'{{$userDutyCheck->group_user_id}}',
-                        exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif },
+                        exception:'',duration_man_hour:'',@if($userDutyCheck->userDetail)user_detail:{!! $userDutyCheck->userDetail !!} @endif,
+                        @if($userDutyCheck->userLabor)user_labor:{!! $userDutyCheck->userLabor !!} @endif},
                     @endforeach
                 ],
                 workgroupSign:'{{$workgroupSign}}',

resources/views/personnel/checking-in/createUserDetail.blade.php

@@ -62,7 +62,7 @@
                 </select>
                 </div>
             </div>
-            <input type="hidden" name="userWorkgroupID" value="{{$userWorkgroupID}}">
+            <input type="hidden" name="userWorkgroupID" value="{{ old('userWorkgroupID',$userWorkgroupID)}}" >
             <div class="form-group row pt-3">
                 <button type="submit" class="col-8 offset-3 btn btn-success">登记</button>
             </div>