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

app/Http/Controllers/UserDutyCheckController.php

@@ -15,6 +15,7 @@ use Carbon\Carbon;
 use Endroid\QrCode\QrCode;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Facades\Validator;
@@ -123,16 +124,15 @@ class UserDutyCheckController extends Controller
         $mobile_phone=$request->input('mobile_phone');
         $userWorkgroupID=$request->input('userWorkgroupID');
         $user=User::where('name',$mobile_phone)->first();
-        $userDetail=UserDetail::where('user_id',$user->id)->first();
+        $userDetail=UserDetail::where('mobile_phone',$mobile_phone)->first();
         if ($userWorkgroupID)$user->userWorkgroups()->sync([$userWorkgroupID]);
         $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=UserLabor::where('user_id',$userDetail->user_id)->first();
         $userLabor->update([
-            'user_id'=>$user->id,
             'labor_company_id'=>$labor_company_id,
         ]);
-        $userDutyCheck=$this->dutyCheck($user->id,$userWorkgroupID);
+        $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
         //添加临时工报表数据
         $this->createLaborReportData($userDetail,$userWorkgroupID,$userDutyCheck);
         if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
@@ -170,7 +170,6 @@ class UserDutyCheckController extends Controller
 //        $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,
         ]);
         $userLabor->save();
@@ -292,6 +291,7 @@ class UserDutyCheckController extends Controller
             $laborReport['working_duration']=$hour-$lunchHour;
             $laborReport->update();
         }
+        $this->log(__METHOD__,__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
         return;
     }
 

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

@@ -125,12 +125,12 @@
                             <td class="text-muted">@{{laborReport.laborCompany}}</td>
                             <td class="text-muted">@{{laborReport.checkInAt}}</td>
                             <td class="text-muted">@{{laborReport.verifyAt}}</td>
-                            <td class="text-muted" v-if="laborReport.verifyPerson">@{{laborReport.verifyPerson}}</td>
+                            <td class="text-muted"><span v-if="laborReport.verifyPerson">@{{laborReport.verifyPerson}}</span></td>
                             <td class="text-muted">@{{laborReport.checkOutAt}}</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>
+                            <td class="text-muted"><span v-if="laborReport.onlineDuration">@{{laborReport.onlineDuration}}</span></td>
+                            <td class="text-muted"><span  v-if="laborReport.workingDuration">@{{laborReport.workingDuration}}</span></td>
                         </tr>
                     </table>
                 </div>