Merge branch 'Haozi'

app/Http/Controllers/LaborReportController.php

@@ -78,7 +78,7 @@ class LaborReportController extends Controller
             $userWorkGroups=UserWorkgroup::select('id','name')->get();
             return view('personnel.laborReport.index',['laborReports'=>$laborReports,'userWorkGroups'=>$userWorkGroups,'request'=>$request->input(),'permittingWorkgroups'=>$permittingWorkgroups,'laravelEchoPrefix'=>$laravelEchoPrefix,]);
         }
-        $laborReports=LaborReport::with(['userWorkgroup','user','userDutyCheck'])->orderBy('id','DESC')->paginate(50);
+        $laborReports=LaborReport::with(['user','userDutyCheck','userWorkgroup'])->whereIn('user_workgroup_id',$userWorkgroupIds)->orderBy('id','DESC')->paginate(50);
         foreach ($laborReports as $laborReport){
             if (!$laborReport->group_user_id){
                 //十分钟之内组长未审核实行软删除

app/Http/Controllers/OrderController.php

@@ -187,13 +187,13 @@ class OrderController extends Controller
         $orders=OracleDOCOrderHeader::select('OrderNo','SoStatus')->whereIn('orderno',$checkData)->whereIn('SoStatus',$sostatus)->get();
         if(count($checkData)!=count($orders))return ['success'=>false,'fail_info'=>"勾选订单有不可冻结订单"];
         foreach ($orders as $order){
-            $is_freeze=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['releasestatus'=>'H','waveno'=>'*']);
-            $this->log(__METHOD__,'批量冻结修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             $waveno=OracleDOCOrderHeader::where('orderno',$order->orderno)->value('waveno');
             if ($waveno && $waveno!='*'){
                 OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$order->orderno)->delete();
                 $this->log(__METHOD__,'批量冻结删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
+            $is_freeze=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['releasestatus'=>'H','waveno'=>'*']);
+            $this->log(__METHOD__,'批量冻结修改'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             if (!$is_freeze)return ['success'=>false,'fail_info'=>"数据 {$order['orderno']} 更新失败"];
         }
         return ['success'=>true];
@@ -211,13 +211,13 @@ class OrderController extends Controller
         if(count($checkData)!=count($orders))return ['success'=>false,'fail_info'=>"勾选订单有不可取消分配订单"];
         foreach ($orders as $order){
             $is_deAllocation=$this->isDeAllocation($order->orderno);
-            $deAllocation=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['sostatus'=>'00','waveno'=>'*']);
-            $this->log(__METHOD__,'批量取消分配'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             $waveno=OracleDOCOrderHeader::where('orderno',$order->orderno)->value('waveno');
             if ($waveno && $waveno!='*'){
                 OracleDOCWaveDetails::where('waveno',$waveno)->where('orderno',$order->orderno)->delete();
                 $this->log(__METHOD__,'批量取消分配删除波次号'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             }
+            $deAllocation=OracleDOCOrderHeader::where('orderno',$order->orderno)->update(['sostatus'=>'00','waveno'=>'*']);
+            $this->log(__METHOD__,'批量取消分配'.__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
             if (!$is_deAllocation||!$deAllocation)return ['success'=>false,'fail_info'=>"数据 {$order['orderno']} 更新失败"];
         }
         return ['success'=>true];

app/Http/Controllers/PersonnelController.php

@@ -169,7 +169,7 @@ class PersonnelController extends Controller
 //            $query->whereIn("id",$userWorkgroupIds);
 //        })->get();
         $permittingWorkgroups=UserWorkgroup::whereIn('id',$userWorkgroupIds)->get();
-        if($permittingWorkgroups->isEmpty())$permittingWorkgroups="\'\'";
+        if($permittingWorkgroups->isEmpty())$permittingWorkgroups="[]";
 
 //        $user_ids=array_column($users->toArray(),'id');
         $dateNow=Carbon::now()->addDays(1)->format('Y-m-d');

database/migrations/2020_06_30_111337_change_auth_hr_verifies.php

@@ -23,7 +23,7 @@ class ChangeAuthHrVerifies extends Migration
     {
         Authority::where('name','人事管理-门卫审核')->first();
         foreach ($this->addNames as $namePack){
-            if(!Authority::where('name',$namePack)->first())(new Authority(['name'=>$namePack]))->save();
+            if(!Authority::where('name',$namePack)->first())(new Authority(['name'=>$namePack,'alias_name'=>$namePack]))->save();
         }
         //修改或没有则添加
         foreach ($this->changeNames as $namePack){

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

@@ -116,7 +116,8 @@
                                 <button v-else class="btn btn-sm btn-outline-secondary"  @click="guardClockAudit(laborReport.userDutyCheckId,laborReport.userDutyCheckType)">门卫审核</button>
                                 </span>
                                 @else
-                                    <span class="text-center"><b class="text-danger">门卫未审核</b></span>
+                                    <b v-if="laborReport.userDutyCheckVerifyUserId"  class="text-success">已审核</b>
+                                    <span v-else class="text-center"><b class="text-danger">门卫未审核</b></span>
                                 @endcan
                                     &nbsp;&nbsp;&nbsp;&nbsp;
                                 @can('人事管理-组长审核')
@@ -132,10 +133,11 @@
                                 </span>
                                 @else
 {{--                                        !laborReport.is_exportReplenish&&!laborReport.is_export   !laborReport.is_exportGroup--}}
-                                        <span  v-if="!laborReport.is_exportReplenish&&!laborReport.is_export&&laborReport.groupUserId"><b class="text-success">在场</b></span>&nbsp;&nbsp;
+                                        <span  v-if="laborReport.groupUserId&&!laborReport.is_exportGroup"><b class="text-success">在组</b></span>
+                                        <b v-else-if="laborReport.groupUserId&&laborReport.is_exportGroup&&!laborReport.is_export&&!laborReport.is_exportReplenish" class="text-info">已退组</b>
+                                        <b v-else-if="laborReport.is_exportReplenish || laborReport.is_export" class="text-success">已退场</b>
                                         <span v-else-if="laborReport.userWorkGroupId" class="text-center"><b class="text-danger">组长未审核</b></span>
                                 @endcan
-
                             </td>
                             <td class="text-muted">@{{laborReport.created_at}}</td>
                             <td class="text-muted">@{{laborReport.enterNumber}}</td>