修改人事管理系统相关逻辑

app/Http/Controllers/PersonnelController.php

@@ -75,7 +75,6 @@ class PersonnelController extends Controller
         if(!Gate::allows('人事管理')){ return ["success"=>false,"data"=>"您无此权限操作！！!"];  }
         $id=$request->input('id');
         $userDutyCheck=UserDutyCheck::find($id);
-        $check_in_at=$userDutyCheck->checked_at;
         $user=User::find($userDutyCheck->user_id);
         $workgroup=$user->userWorkgroups()->first();
         if ($workgroup){
@@ -85,8 +84,9 @@ class PersonnelController extends Controller
         $type=$request->input('type');
         $userDutyCheck->type=$type;
         $userDutyCheck->group_user_id=Auth::user()['id'];
+        $check_in_at=$userDutyCheck->checked_at;
         $userDutyCheck->update();
-        $laborReport=LaborReport::where('check_in_at',$check_in_at)->first();
+        $laborReport=LaborReport::where('check_in_at',$check_in_at)->where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->first();
         $this->updateLaborReportData($laborReport,$userDutyCheck);
         $this->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         event(new TeamAuditEvent($userDutyCheck));

app/Http/Controllers/UserDutyCheckController.php

@@ -125,8 +125,8 @@ class UserDutyCheckController extends Controller
         $user=User::where('name',$mobile_phone)->first();
         $userDetail=UserDetail::where('user_id',$user->id)->first();
         if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
-        $laborCompany=$request->input('laborCompany');
-        $labor_company_id=LaborCompany::where('name',$laborCompany)->value('id');
+        $labor_company_id=$request->input('labor_company_id');
+//        $labor_company_id=LaborCompany::where('name',$laborCompany)->value('id');
         $userLabor=UserLabor::where('user_id',$user->id)->first();
         $userLabor->update([
             'user_id'=>$user->id,
@@ -166,8 +166,9 @@ class UserDutyCheckController extends Controller
             'type'=>'临时工',
         ]);
         $userDetail->save();
-        $laborCompany=$request->input('laborCompany');
-        $labor_company_id=LaborCompany::where('name',$laborCompany)->value('id');
+//        $laborCompany=$request->input('laborCompany');
+//        $labor_company_id=LaborCompany::where('name',$laborCompany)->value('id');
+        $labor_company_id=$request->input('labor_company_id');
         $userLabor=new UserLabor([
             'user_id'=>$user->id,
             'labor_company_id'=>$labor_company_id,

resources/views/maintenance/userWorkGroup/index.blade.php

@@ -22,7 +22,7 @@
                     </tr>
                     <tr v-for="userWorkgroup in userWorkgroups">
                         <td class="text-muted">@{{userWorkgroup.id}}</td>
-                        <td v-if="userWorkgroup.warehouse">@{{userWorkgroup.warehouseName}}</td>
+                        <td><span v-if="userWorkgroup.warehouse">@{{userWorkgroup.warehouseName}}</span></td>
                         <td>@{{userWorkgroup.name}}</td>
                         <td class="text-muted">@{{userWorkgroup.created_at}}</td>
                         <td>

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

@@ -53,11 +53,11 @@
                 </div>
             </div>
             <div class="form-group row">
-                <label for="laborCompany" class="form-check-label col-3 pull-left">劳务所：</label>
+                <label for="labor_company_id" class="form-check-label col-3 pull-left">劳务所：</label>
                 <div class="col-8">
-                <select name="laborCompany" id="laborCompany" class=" form-control" type="text">
+                <select name="labor_company_id" id="labor_company_id" class=" form-control" type="text">
                     @foreach( $laborCompanies as $laborCompany )
-                        <option>{{$laborCompany->name}}</option>
+                        <option value="{{$laborCompany->id}}">{{$laborCompany->name}}</option>
                     @endforeach
                 </select>
                 </div>

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

@@ -15,10 +15,10 @@
                 <input name="mobile_phone" @if($mobile_phone) value="{{$mobile_phone}}" @endif readonly id="mobile_phone" class="@error('mobile_phone') is-invalid @enderror col-7 form-control" type="text">
             </div>
             <div class="form-group row">
-                <label for="laborCompany" class="form-check-label col-3 pull-left">劳务所：</label>
-                <select name="laborCompany" id="laborCompany" class="col-7 form-control" type="text">
+                <label for="labor_company_id" class="form-check-label col-3 pull-left">劳务所：</label>
+                <select name="labor_company_id" id="labor_company_id" class="col-7 form-control" type="text">
                     @foreach( $laborCompanies as $laborCompany )
-                        <option>{{$laborCompany->name}}</option>
+                        <option value="{{$laborCompany->id}}">{{$laborCompany->name}}</option>
                     @endforeach
                 </select>
             </div>

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

@@ -127,8 +127,8 @@
                             <td class="text-muted">@{{laborReport.verifyAt}}</td>
                             <td class="text-muted" v-if="laborReport.verifyPerson">@{{laborReport.verifyPerson}}</td>
                             <td class="text-muted">@{{laborReport.checkOutAt}}</td>
-                            <td class="text-muted" v-if="laborReport.beginLunch&&laborReport.endLunch&&laborReport.beginLunch<laborReport.endLunch">@{{laborReport.beginLunch}}-@{{laborReport.endLunch}}</td>
-                            <td v-else="laborReport.beginLunch||laborReport.endLunch"></td>
+                            <td class="text-muted"><span v-if="laborReport.beginLunch&&laborReport.endLunch&&laborReport.beginLunch<laborReport.endLunch">@{{laborReport.beginLunch}}-@{{laborReport.endLunch}}</span></td>
+{{--                            <td v-else="laborReport.beginLunch||laborReport.endLunch"></td>--}}
                             <td class="text-muted" v-if="laborReport.onlineDuration">@{{laborReport.onlineDuration}}</td>
                             <td class="text-muted" v-if="laborReport.workingDuration">@{{laborReport.workingDuration}}</td>
                         </tr>