人事功能修改

app/Events/ClockoutEvent.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Events;
+
+use App\UserDutyCheck;
+use Illuminate\Broadcasting\Channel;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+use Illuminate\Queue\SerializesModels;
+
+
+class ClockoutEvent implements ShouldBroadcast
+{
+    use  SerializesModels;
+
+    public $userDutyCheck;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct(UserDutyCheck $userDutyCheck)
+    {
+        $this->userDutyCheck=$userDutyCheck;
+    }
+
+    /**
+     * Get the channels the event should broadcast on.
+     *
+     * @return \Illuminate\Broadcasting\Channel|array
+     */
+    public function broadcastOn()
+    {
+        return new Channel('userDutyCheck');
+    }
+
+}

app/Http/Controllers/PersonnelController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Events\ClockinEvent;
+use App\Events\ClockoutEvent;
 use App\Events\TeamAuditEvent;
 use App\LaborReport;
 use App\ProcessDailyParticipant;
@@ -195,6 +196,8 @@ class PersonnelController extends Controller
         $userDutyCheck->save();
         if ($userDutyCheck&&$userDutyCheck->type=='登入'){
             event(new ClockinEvent($userDutyCheck));
+        }else if ($userDutyCheck&&$userDutyCheck->type=='登出'){
+            event(new ClockoutEvent($userDutyCheck));
         }
         $checkInDate=Carbon::parse($userDutyCheck->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();

app/Http/Controllers/UserDutyCheckController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Events\ClockinEvent;
+use App\Events\ClockoutEvent;
 use App\LaborCompany;
 use App\LaborReport;
 use App\User;
@@ -43,6 +44,8 @@ class UserDutyCheckController extends Controller
             $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
             if ($userDutyCheck&&$userDutyCheck->type=='登入'){
                 event(new ClockinEvent($userDutyCheck));
+            }else if ($userDutyCheck&&$userDutyCheck->type=='登出'){
+                event(new ClockoutEvent($userDutyCheck));
             }
             //正常情况
             $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',Carbon::now()->format('Y-m-d')."%")->where('user_id',$userDetail->user_id)->first();
@@ -84,6 +87,8 @@ class UserDutyCheckController extends Controller
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
         if ($userDutyCheck&&$userDutyCheck->type=='登入'){
             event(new ClockinEvent($userDutyCheck));
+        }else if ($userDutyCheck&&$userDutyCheck->type=='登出'){
+            event(new ClockoutEvent($userDutyCheck));
         }
         //正常情况
         $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
@@ -127,6 +132,8 @@ class UserDutyCheckController extends Controller
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
         if ($userDutyCheck&&$userDutyCheck->type=='登入'){
             event(new ClockinEvent($userDutyCheck));
+        }else if ($userDutyCheck&&$userDutyCheck->type=='登出'){
+            event(new ClockoutEvent($userDutyCheck));
         }
         if ($userDutyCheck&&$userDutyCheck->error==true)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
@@ -168,6 +175,8 @@ class UserDutyCheckController extends Controller
         $userDutyCheck=$this->dutyCheck($user->id,$userWorkgroupID);
         if ($userDutyCheck&&$userDutyCheck->type=='登入'){
             event(new ClockinEvent($userDutyCheck));
+        }else if ($userDutyCheck&&$userDutyCheck->type=='登出'){
+            event(new ClockoutEvent($userDutyCheck));
         }
         if ($userDutyCheck&&$userDutyCheck->error==true)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
@@ -247,6 +256,9 @@ class UserDutyCheckController extends Controller
                     $userDutyCheck->type="登入";
             }
         }
+        if ($userWorkgroupID!=$userDutyCheckOld['workgroup_id']&&$userDutyCheckOld->type=="登入"&&$userDutyCheck->type="登出"){
+            $userDutyCheck->workgroup_id=$userDutyCheckOld['workgroup_id'];
+        }
         $userDutyCheck->save();
         return $userDutyCheck;
     }

composer.lock

@@ -111,12 +111,6 @@
                 "brick",
                 "math"
             ],
-            "funding": [
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/brick/math",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-15T15:59:35+00:00"
         },
         {
@@ -406,20 +400,6 @@
                 "sqlserver",
                 "sqlsrv"
             ],
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal",
-                    "type": "tidelift"
-                }
-            ],
             "time": "2020-04-20T17:19:26+00:00"
         },
         {
@@ -940,12 +920,6 @@
                 "flare",
                 "reporting"
             ],
-            "funding": [
-                {
-                    "url": "https://www.patreon.com/spatie",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-03-02T15:52:04+00:00"
         },
         {
@@ -2155,16 +2129,6 @@
                 "php",
                 "phpspreadsheet"
             ],
-            "funding": [
-                {
-                    "url": "https://laravel-excel.com/commercial-support",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/patrickbrouwers",
-                    "type": "github"
-                }
-            ],
             "time": "2020-02-28T15:47:45+00:00"
         },
         {
@@ -2907,12 +2871,6 @@
                 "Pinyin",
                 "cn2pinyin"
             ],
-            "funding": [
-                {
-                    "url": "https://www.patreon.com/overtrue",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-04-13T08:53:30+00:00"
         },
         {
@@ -3887,12 +3845,6 @@
                 "identifier",
                 "uuid"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/ramsey",
-                    "type": "github"
-                }
-            ],
             "time": "2020-03-29T20:13:32+00:00"
         },
         {
@@ -3968,12 +3920,6 @@
                 "highlight.php",
                 "syntax"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/allejo",
-                    "type": "github"
-                }
-            ],
             "time": "2020-03-02T05:59:21+00:00"
         },
         {
@@ -6969,16 +6915,6 @@
                 "oracle",
                 "pdo_oci"
             ],
-            "funding": [
-                {
-                    "url": "https://www.paypal.me/yajra",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/yajra",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-03-04T02:15:19+00:00"
         },
         {
@@ -7102,12 +7038,6 @@
                 "profiler",
                 "webprofiler"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/barryvdh",
-                    "type": "github"
-                }
-            ],
             "time": "2020-05-05T10:53:32+00:00"
         },
         {
@@ -7629,20 +7559,6 @@
                 "php",
                 "symfony"
             ],
-            "funding": [
-                {
-                    "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/nunomaduro",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/nunomaduro",
-                    "type": "patreon"
-                }
-            ],
             "time": "2020-04-04T19:56:08+00:00"
         },
         {

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

@@ -96,6 +96,9 @@
                 Echo.channel('{{$laravelEchoPrefix}}userDutyCheck').listen('ClockinEvent',(e)=>{
                     window.location.reload();
                 });
+                Echo.channel('{{$laravelEchoPrefix}}userDutyCheck').listen('ClockoutEvent',(e)=>{
+                    window.location.reload();
+                });
             },
             methods:{
                 whichDay(dateStr){

resources/views/waybill/index.blade.php

@@ -988,6 +988,7 @@
                             tempTip.show('置顶失败,网络连接错误!'+err);
                         });
                     }
+                    });
                 },
                 changeRemark:function(){
                   $('#remark').removeClass('is-invalid');