人事管理修改相关需求

app/Events/ClockinEvent.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 ClockinEvent 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

@@ -2,14 +2,13 @@
 
 namespace App\Http\Controllers;
 
+use App\Events\ClockinEvent;
 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 App\UserWorkgroup;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder;
@@ -90,20 +89,17 @@ class PersonnelController extends Controller
         $userDutyCheck->update();
         $checkInDate=Carbon::parse($userDutyCheck->checked_at)->format('Y-m-d');
         $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('user_workgroup_id',$workgroup->id)->where('created_at','like',$checkInDate."%")->first();
-        $this->updateLaborReportVerify($laborReport,$userDutyCheck);
-        $this->log(__METHOD__,"打卡组长审核".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
+        if (!$laborReport){
+            LaborReport::createLaborReportData($userDutyCheck->user_id,$userDutyCheck->workgroup_id,$userDutyCheck);
+            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck->user_id,$userDutyCheck->workgroup_id,$userDutyCheck]));
+        }else if ($laborReport){
+            LaborReport::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 updateLaborReportVerify($laborReport,$userDutyCheck){
-        $date=date('Y-m-d H:i:s');
-        $laborReport['verify_at']=$date;
-        $laborReport['group_user_id']=$userDutyCheck->group_user_id;
-        $laborReport->update();
-        $this->log(__METHOD__,"打卡组长审核更新临时工报表的审核时间".__FUNCTION__,json_encode($laborReport),Auth::user()['id']);
-        return;
-    }
+
 
     //去往任务审核
     public function missionAudit(Request $request){
@@ -161,8 +157,9 @@ class PersonnelController extends Controller
         $dateNow=Carbon::now()->addDays(1)->format('Y-m-d');
         $beforeYesterdayDate=Carbon::now()->addDays(-2)->format('Y-m-d');
         $userDutyChecks=UserDutyCheck::with(['userWorkgroup','userLabor.laborCompany','userDetail'])->whereIn("user_id",$user_ids)
-            ->whereBetween('checked_at',[$beforeYesterdayDate,$dateNow])->where('type','登入')->get();
-        return view('personnel/checking-in/clockAudit',['userDutyChecks'=>$userDutyChecks,'workgroupSign'=>$result['workgroupSign']]);
+            ->whereBetween('checked_at',[$beforeYesterdayDate,$dateNow])->where('type','登入')->orderBy('checked_at','DESC')->get();
+        $laravelEchoPrefix = config('database.redis.options.prefix');
+        return view('personnel/checking-in/clockAudit',['userDutyChecks'=>$userDutyChecks,'laravelEchoPrefix'=>$laravelEchoPrefix,'workgroupSign'=>$result['workgroupSign']]);
     }
 
     //录入补卡
@@ -181,18 +178,16 @@ class PersonnelController extends Controller
             'source'=>'补入',
             'workgroup_id'=>$userWorkgroupID
         ]);
-        $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);
-            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$user_id,$userWorkgroupID,$userDutyCheck]));
+        $userDutyCheck->save();
+        if ($userDutyCheck&&$userDutyCheck->type=='登入'){
+            event(new ClockinEvent($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();
         if ($laborReport&&$userDutyCheck->type){
             LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
             $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
         }
-        $userDutyCheck->save();
-
         $this->log(__METHOD__,"录入补卡".__FUNCTION__,json_encode($userDutyCheck),Auth::user()['id']);
         return ['success'=>true,'data'=>$userDutyCheck];
     }

app/Http/Controllers/UserDutyCheckController.php

@@ -2,22 +2,17 @@
 
 namespace App\Http\Controllers;
 
+use App\Events\ClockinEvent;
 use App\LaborCompany;
 use App\LaborReport;
 use App\User;
 use App\UserDetail;
 use App\UserDutyCheck;
 use App\UserLabor;
-use App\UserToken;
-use App\UserWorkgroup;
-use App\Warehouse;
 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;
 use Ramsey\Uuid\Uuid;
 
@@ -46,16 +41,20 @@ class UserDutyCheckController extends Controller
             $userDetail=UserDetail::find($user_id);
             if (!$userDetail)   return redirect('personnel/checking-in/userDutyCheck/createUserDetail/'.$userDetail->mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
             $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
+            if ($userDutyCheck&&$userDutyCheck->type=='登入'){
+                event(new ClockinEvent($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();
-            if(!isset($laborReport)&&$userDutyCheck->type=='登入'){
-                LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
-                $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
-            }else if ($laborReport&&$userDutyCheck->type=='登出'){
+//            if(!isset($laborReport)&&$userDutyCheck->type=='登入'){
+//                LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+//                $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode($laborReport));
+//            }else
+            if ($laborReport&&$userDutyCheck->type=='登出'){
                 LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
                 $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode($laborReport));
             }
-            if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+            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>";
             $userWorkgroups=$userDetail->user->userWorkgroups();
             if($userWorkgroups->count()>0)
@@ -87,16 +86,20 @@ class UserDutyCheckController extends Controller
             return redirect('personnel/checking-in/userDutyCheck/updateUserDetail/'.$mobile_phone)->with("userWorkgroupID",$userWorkgroupID);
         }
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
+        if ($userDutyCheck&&$userDutyCheck->type=='登入'){
+            event(new ClockinEvent($userDutyCheck));
+        }
         //正常情况
         $laborReport=LaborReport::where('user_workgroup_id',$userWorkgroupID)->where('created_at','like',$dateNow."%")->where('user_id',$userDetail->user_id)->first();
-        if(!$laborReport&&$userDutyCheck->type=='登入'){
-            LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
-            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDetail->user_id,$userWorkgroupID,$userDutyCheck]));
-        }else if ($laborReport&&$userDutyCheck->type=='登出'){
+//        if(!$laborReport&&$userDutyCheck->type=='登入'){
+//            LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+//            $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDetail->user_id,$userWorkgroupID,$userDutyCheck]));
+//        }else
+            if ($laborReport&&$userDutyCheck->type=='登出'){
             LaborReport::updateLaborReportData($laborReport,$userDutyCheck);
             $this->log(__METHOD__,"更新临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
         }
-        if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+        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>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
         $group_name=$userDetail->user->userWorkgroups->first()['name'];
@@ -130,10 +133,13 @@ class UserDutyCheckController extends Controller
         ]);
         $this->log(__METHOD__,"更改临时工劳务所信息".__FUNCTION__,json_encode($userLabor),Auth::user()['id']);
         $userDutyCheck=$this->dutyCheck($userDetail->user_id,$userWorkgroupID);
-        //添加临时工报表数据
-        LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
-        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDetail->user_id,$userWorkgroupID,$userDutyCheck]));
-        if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+        if ($userDutyCheck&&$userDutyCheck->type=='登入'){
+            event(new ClockinEvent($userDutyCheck));
+        }
+//        //添加临时工报表数据
+//        LaborReport::createLaborReportData($userDetail->user_id,$userWorkgroupID,$userDutyCheck);
+//        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$userDetail->user_id,$userWorkgroupID,$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>";
         $user=User::find($userDetail->user_id);
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
@@ -171,13 +177,17 @@ class UserDutyCheckController extends Controller
         ]);
         $userLabor->save();
         $userDutyCheck=$this->dutyCheck($user->id,$userWorkgroupID);
-        LaborReport::createLaborReportData($user->id,$userWorkgroupID,$userDutyCheck);
-        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$user->id,$userWorkgroupID,$userDutyCheck]));
-        if ($userDutyCheck&&$userDutyCheck->error)return "<h1 style='color: darkred;text-align:center'>重复打卡!</h1>";
+        if ($userDutyCheck&&$userDutyCheck->type=='登入'){
+            event(new ClockinEvent($userDutyCheck));
+        }
+//        LaborReport::createLaborReportData($user->id,$userWorkgroupID,$userDutyCheck);
+//        $this->log(__METHOD__,"提交临时工报表记录__".__FUNCTION__,json_encode([$user->id,$userWorkgroupID,$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>";
         $userLaborToken=$user->token(config('users.token_check_in_expire_minutes'));
         $this->log(__METHOD__,"录入临时工,用户,对应工作组,打卡记录".__FUNCTION__,json_encode($request->all()));
-        $group_name=$userDetail->user->userWorkgroups->first()['name'];
+//        $group_name=$userDetail->user->userWorkgroups->first()['name'];
+        $group_name=$userDutyCheck->userWorkgroup->first()['name'];
         $laravelEchoPrefix = config('database.redis.options.prefix');
         return response()->view('personnel/checking-in/success',['group_name'=>$group_name??'','full_name'=>$userDetail->full_name,'checked_at'=>$userDutyCheck->checked_at,'type'=>$userDutyCheck->type,'laravelEchoPrefix'=>$laravelEchoPrefix])
             ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
@@ -215,6 +225,15 @@ class UserDutyCheckController extends Controller
         }
         if($diffDate<=5){
             $userDutyCheck->error=true;//重复打卡
+            if($userWorkgroupID!=$userDutyCheckOld['workgroup_id']&&$userDutyCheckOld->type=='登入'){
+                if ($userDutyCheck->error){
+                    $userDutyCheck->error=false;
+                }
+                $userDutyCheckOld->checked_at=$date;
+                $userDutyCheckOld->workgroup_id=$userWorkgroupID;
+                $userDutyCheckOld->update();
+                return $userDutyCheckOld;
+            }
             return $userDutyCheck;
         }
         if ($userDutyCheckOld->type=="登入"){

app/LaborReport.php

@@ -6,6 +6,7 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use App\Traits\ModelTimeFormat;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Date;
 use Ramsey\Uuid\Uuid;
 
 class LaborReport extends Model
@@ -13,7 +14,7 @@ class LaborReport extends Model
     use ModelTimeFormat;
 
     protected $fillable=[
-        'id','enter_number','user_workgroup_id','user_id','name','mobile_phone','identity_number','labor_company','check_in_at','verify_at','check_out_at','online_duration','working_duration'
+        'id','enter_number','user_workgroup_id','user_id','name','mobile_phone','identity_number','labor_company','check_in_at','verify_at','group_user_id','check_out_at','online_duration','working_duration',
     ];
 
     public function userWorkgroup(){
@@ -34,6 +35,7 @@ class LaborReport extends Model
         if ($userDutyCheck->type=='登入'){
             $check_in_at=$userDutyCheck['checked_at'];
         }
+        $date=date('Y-m-d H:i:s');
         $laborReport=new LaborReport([
             'enter_number'=>Uuid::uuid1(),
             'user_workgroup_id'=>$userWorkgroupID,
@@ -43,6 +45,8 @@ class LaborReport extends Model
             'identity_number'=>$identity_number,
             'labor_company'=>$labor_company,
             'check_in_at'=>$check_in_at,
+            'verify_at'=>$date,
+            'group_user_id'=>$userDutyCheck->group_user_id,
         ]);
         $laborReport->save();
         $number_id=$laborReport->id;
@@ -55,12 +59,12 @@ class LaborReport extends Model
     static function updateLaborReportData($laborReport,$userDutyCheck){
             //正常打卡情况
             if($userDutyCheck->type=='登出'){
-                $laborReport->check_out_at=$userDutyCheck->checked_at;
+//                $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']= $laborReport['online_duration'];
+                $laborReport['working_duration']=$hour;
                 $laborReport->update();
             }
         $date=Carbon::parse($laborReport['check_in_at'])->format('Y-m-d');
@@ -82,7 +86,7 @@ class LaborReport extends Model
             $laborReport->update();
         }
         if ($userDutyCheck->type=='登出'&&$userDutyCheckOld->checked_at<$userDutyCheck->checked_at){
-            $laborReport->check_out_at=$userDutyCheck->checked_at;
+//            $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; //在线时长
@@ -101,6 +105,8 @@ class LaborReport extends Model
             $lunchHour=($endTime->diffInSeconds($beginTime))/3600;
             if($userDutyCheck->type=='登入'&&$userDutyCheck->checked_at<=$date." 14:00:00"){
                 $laborReport['working_duration']=$laborReport['online_duration'];
+            }else if($userDutyCheck->type=='登出'&&$userDutyCheck->checked_at<=$date." 14:00:00"){
+                $laborReport['working_duration']=$laborReport['online_duration'];
             }else{
                 $laborReport['working_duration']=$laborReport['online_duration']-$lunchHour;
             }
@@ -108,4 +114,12 @@ class LaborReport extends Model
         }
         return;
     }
+    //修改临时工报表审核时间
+    static function updateLaborReportVerify($laborReport,$userDutyCheck){
+        $date=date('Y-m-d H:i:s');
+        $laborReport['verify_at']=$date;
+        $laborReport['group_user_id']=$userDutyCheck->group_user_id;
+        $laborReport->update();
+        return;
+    }
 }

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

@@ -20,7 +20,7 @@
                 </div>
                 <div v-if="userWorkgroups.length>3">
                 <div class="row row-cols-3">
-                    <div class="col text-center" style="float:left;" v-for="userWorkgroup in userWorkgroups">
+                    <div class="col-sm-3  col-lg-3 col-xl-3 text-center" style="float:left;" v-for="userWorkgroup in userWorkgroups">
                             <img id="img" class="img-thumbnail"  :src="userWorkgroup.url" />
                         <p class="m-2 h5 text-center" >@{{ userWorkgroup.name }}工作组</p>
                     </div>

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

@@ -19,7 +19,7 @@
                         <tr>
                             <td>序号</td>
                             <td>姓名</td>
-                            @can('人事管理-打卡审核')<td>操作</td>@endcan
+                            @can('人事管理-打卡审核')<td>门卫审核</td>@endcan
                             <td v-if="workgroupSign">组长审核</td>
                             <td >打卡时间</td>
                             <td>打卡类型</td>
@@ -87,6 +87,12 @@
                 ],
                 workgroupSign:'{{$workgroupSign}}',
             },
+            mounted(){
+                initEcho();
+                Echo.channel('{{$laravelEchoPrefix}}userDutyCheck').listen('ClockinEvent',(e)=>{
+                    window.location.reload();
+                });
+            },
             methods:{
                 whichDay(dateStr){
                     let nowDate=new Date();

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

@@ -20,7 +20,7 @@
     <h2 class="text-danger">小组：{{$group_name}}</h2><br/>
     <h3 style="margin-bottom: 0">姓名：@if($full_name)<b style="color: #2a9055">{{$full_name}}</b>@endif&nbsp;&nbsp;&nbsp;&nbsp;打卡时间：@if($checked_at)<b style="color: #2a9055">{{$checked_at}}</b> @endif</h3><br/>
     @if($type=='登入')
-        <div v-if="userDutyCheck.group_user_id"><button class="btn btn-danger" @click="closeWindow">确认关闭</button></div>
+        <div v-if="userDutyCheck.group_user_id"><h5 style="color: #2a9055" >组长已确认</h5></div>
         <h5 v-else style="margin-top: 0;color: red">等待组长确认登入，请勿关闭:<span id="_lefttime" ></span></h5>
     @endif
 
@@ -45,11 +45,6 @@
                 _this.userDutyCheck.group_user_id=userDutyCheck.group_user_id;
             });
         },
-        methods:{
-            closeWindow:function () {
-                window.close();
-            }
-        }
     });
     var secondsInit = 0;
     function _fresh()

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

@@ -11,7 +11,7 @@
             <div class="">
                 <div>
                     <form  method="GET" action="{{url('personnel/laborReport/')}}" id="optionSubmit">
-                        <table class="table table-sm table-bordered  text-nowrap mb-0">
+                        <table class="table table-sm table-bordered m-0">
                             <tr v-if="isBeingFilterConditions">
                                 <td colspan="10"><div class="col" style="padding:0">
                                         <a  href="{{url('personnel/laborReport')}}"><span class="btn btn-warning text-dark">清除过滤条件</span></a>
@@ -19,45 +19,47 @@
                             </tr>
                             <tr>
 
-                                <td  colspan="9">
+                                <td  colspan="7">
                                     <select name="paginate" v-model="filterData.paginate" class="tooltipTarget form-control-sm" style="vertical-align: middle" @change="setPaginate">
-                                        <option value="50">50行</option>
-                                        <option value="100">100行</option>
-                                        <option value="200">200行</option>
-                                        <option value="500">500行</option>
-                                        <option value="1000">1000行</option>
+                                        <option value="50">每页显示50条</option>
+                                        <option value="100">每页显示100条</option>
+                                        <option value="200">每页显示200条</option>
+                                        <option value="500">每页显示500条</option>
+                                        <option value="1000">每页显示1000条</option>
                                     </select></td>
                             </tr>
                             <tr>
                                 <td >
-                                    <input style="width: 150px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
+                                    <input style="width: 140px" name="created_at_start" type="date" v-model="filterData.created_at_start" :class="filterData.created_at_start?'bg-warning':''" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的起始时间">
 
                                 </td>
                                 <td>
-                                    <input type="text" class="form-control-sm tooltipTarget" placeholder="小组"
+                                    <div class="form-inline">
+                                    <input type="text" class="form-control form-control-sm tooltipTarget" placeholder="小组"
                                            style="width:70px" @input="owner_seek"
                                            title="输入关键词快速定位下拉列表，回车确定">
                                     <select name="user_workgroup_id" id="user_workgroup_id" :class="filterData.user_workgroup_id?'bg-warning':''" v-model="filterData.user_workgroup_id" @change="setUserWorkGroup"
-                                            class="form-control-sm tooltipTarget"  title="选择要显示的工作组">
+                                            class="form-control form-control-sm tooltipTarget"  title="选择要显示的工作组">
                                         @foreach($userWorkGroups as $userWorkGroup)
                                             <option value="{{$userWorkGroup->id}}">{{$userWorkGroup->name}}</option>
                                         @endforeach
                                     </select>
                                     <input hidden type="submit" >
+                                    </div>
                                 </td>
 
                                 <td >
-                                    <input :class="filterData.enter_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="enter_number" class="form-control-sm  tooltipTarget" v-model="filterData.enter_number" style="vertical-align: middle" placeholder="进厂编号"></td>
+                                    <input :class="filterData.enter_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="enter_number" class="form-control form-control-sm  tooltipTarget" style="width: 150px" v-model="filterData.enter_number"  placeholder="进厂编号"></td>
                                 <td >
-                                    <input :class="filterData.identity_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="identity_number" class="form-control-sm  tooltipTarget" v-model="filterData.identity_number" style="vertical-align: middle" placeholder="身份证号"></td>
+                                    <input :class="filterData.identity_number?'bg-warning':''" type="text" title="支持15内模糊搜索与15天外精确搜索" name="identity_number" class="form-control form-control-sm  tooltipTarget" style="width: 150px"  v-model="filterData.identity_number"  placeholder="身份证号"></td>
                                 <td colspan="5"></td>
                             </tr>
                             <tr>
                                 <td>
-                                    <input style="width: 150px" type="date" name="created_at_end" v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" class="form-control-sm tooltipTarget" title="选择显示指定日期的结束时间">
+                                    <input style="width: 140px" type="date" name="created_at_end" v-model="filterData.created_at_end" :class="filterData.created_at_end?'bg-warning':''" class="form-control form-control-sm tooltipTarget" title="选择显示指定日期的结束时间">
                                 </td>
                                 <td >
-                                    <input type="text"  name="mobile_phone" class="form-control-sm  tooltipTarget" v-model="filterData.mobile_phone"  :class="filterData.mobile_phone?'bg-warning':''" style="vertical-align: middle" placeholder="电话号"></td>
+                                    <input type="text"  name="mobile_phone" class="form-control form-control-sm tooltipTarget" v-model="filterData.mobile_phone"  :class="filterData.mobile_phone?'bg-warning':''" style="width: 150px" placeholder="电话号"></td>
                             </tr>
                             <tr>
                                 <td colspan="9">
@@ -259,5 +261,6 @@
     </script>
 @endsection
 <style>
-    .laborReport_1{background-color: #FFFF00}
+    .laborReport_1{background-color: rgb(241, 234, 190)
+    }
 </style>