运输管理--导出添加计件字段

app/Http/Controllers/LaborReportController.php

@@ -100,8 +100,6 @@ class LaborReportController extends Controller
                 $this->guardClock($laborReport,$userDutyCheck);
             }
         }
-
-        //dd($laborReports);
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
         return view('personnel/laborReport/index',['laborReports'=>$laborReports,'userWorkGroups'=>$userWorkGroups,'laravelEchoPrefix'=>$laravelEchoPrefix,'permittingWorkgroups'=>$permittingWorkgroups]);
 

app/Http/Controllers/UserDutyCheckController.php

@@ -64,7 +64,7 @@ class UserDutyCheckController extends Controller
                 $yesterdayDate=Carbon::now()->subDays(1)->format('Y-m-d');
                 $laborReportYesterday=LaborReport::where('user_id',$userDutyCheck->user_id)->where('created_at','like',$yesterdayDate.'%')->orderBy('id','desc')->first();
                 if (!$laborReportYesterday->check_out_at){
-                    UserDutyCheck::where('user_id',$laborReportYesterday->user_id)->where('type','登出')->orderBy('id','desc')->delete();
+                    UserDutyCheck::where('user_id',$laborReportYesterday->user_id)->where('type','登出')->orderBy('id','desc')->where('checked_at','like',Carbon::now()->format('Y-m-d H:i').'%')->delete();
                     return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可退场，请联系组长!</h1>";
                 }
                 if ($laborReportYesterday){
@@ -74,7 +74,7 @@ class UserDutyCheckController extends Controller
                 }
             }else if($laborReport&&$importAndExportQRCodeType=='export'){
                 if (!$laborReport->check_out_at){
-                    UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登出')->orderBy('id','desc')->delete();
+                    UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登出')->where('checked_at','like',Carbon::now()->format('Y-m-d H:i').'%')->orderBy('id','desc')->delete();
                     return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可退场，请联系组长!</h1>";
                 }
                 $exportReport=LaborReport::exportToCreateLaborReportData($laborReport,$userDutyCheck);
@@ -109,6 +109,7 @@ class UserDutyCheckController extends Controller
         if ($userDutyCheck&&$userDutyCheck->import==true)return "<h1 style='color: darkred;text-align:center'>您已入场，不可再次入场!</h1>";
         if ($userDutyCheck&&$userDutyCheck->export==true)return "<h1 style='color: darkred;text-align:center'>您已出场，不可再次出场!!</h1>";
         if (!$userDutyCheck)return "<h1 style='color: red;text-align:center'>打卡异常，请联系相关人员!</h1>";
+        $userLaborToken=$userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
         $dateNow=Carbon::now()->format('Y-m-d');
         $laborReport=LaborReport::where('user_id',$userDutyCheck->user_id)->where('created_at','like',$dateNow.'%')->orderBy('id','desc')->first();
 //        if (!$laborReport){
@@ -127,7 +128,7 @@ class UserDutyCheckController extends Controller
             $yesterdayDate=Carbon::now()->subDays(1)->format('Y-m-d');
             $laborReportYesterday=LaborReport::where('user_id',$userDutyCheck->user_id)->where('created_at','like',$yesterdayDate.'%')->orderBy('id','desc')->first();
             if (!$laborReportYesterday->check_out_at){
-                UserDutyCheck::where('user_id',$laborReportYesterday->user_id)->where('type','登出')->orderBy('id','desc')->delete();
+                UserDutyCheck::where('user_id',$laborReportYesterday->user_id)->where('type','登出')->where('checked_at','like',Carbon::now()->format('Y-m-d H:i').'%')->orderBy('id','desc')->delete();
                 return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可退场，请联系组长!</h1>";
             }
             if ($laborReportYesterday){
@@ -137,14 +138,13 @@ class UserDutyCheckController extends Controller
             }
         }else if($laborReport&&$importAndExportQRCodeType=='export'){
             if (!$laborReport->check_out_at){
-                UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登出')->orderBy('id','desc')->delete();
+                UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登出')->where('checked_at','like',Carbon::now()->format('Y-m-d H:i').'%')->orderBy('id','desc')->delete();
                 return "<h1 style='color: darkred;text-align:center'>您还未退组，暂不可退场，请联系组长!</h1>";
             }
             $exportReport=LaborReport::exportToCreateLaborReportData($laborReport,$userDutyCheck);
             $this->log(__METHOD__,"退场建临时工报表记录__".__FUNCTION__,json_encode([$laborReport,$userDutyCheck]));
             if ($exportReport) event(new ExportEvent($userDutyCheck));
         }
-        $userLaborToken=$userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
         $laravelEchoPrefix = config('database.redis.options.prefix');
         return response()->view('personnel/checking-in/importAndExportSuccess',['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'),'/');
@@ -386,6 +386,7 @@ class UserDutyCheckController extends Controller
         $userDutyCheck=UserDutyCheck::where('user_id',$userDetail->user_id)->where('checked_at','like',$dateNow.'%')->orderBy('id','desc')->first();
         if(!$userDutyCheck->verify_user_id)return "<h1 style='color: red;text-align:center'>进场门卫还未审核，暂无法进组！</h1>";
         if($userDutyCheck->type=='登出')return "<h1 style='color: red;text-align:center'>进场是否未打卡？如若未打，请先返回打进场卡！</h1>";
+        $userLaborToken=$userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
         //判断是否是第一次进组
         $laborReport=LaborReport::where('user_id',$userDetail->user_id)->where('user_workgroup_id',null)->where('created_at','like',$dateNow.'%')->orderBy('id','desc')->first();
         if ($laborReport){
@@ -406,7 +407,6 @@ class UserDutyCheckController extends Controller
                 if ($newLaborReport){
                     event(new ClockinEvent($newLaborReport));
                 }
-                $userLaborToken=$userDetail->getDutyCheckToken(config('users.token_check_in_expire_minutes'));
                 return response()->view('personnel/checking-in/success',['group_name'=>$group_name??'','full_name'=>$userDetail->full_name,'check_in_at'=>$newLaborReport->check_in_at,'laravelEchoPrefix'=>$laravelEchoPrefix])
                     ->cookie('userLaborToken',$userLaborToken,config('users.token_check_in_expire_minutes'),'/');
             }else{

app/Http/Controllers/WaybillsController.php

@@ -685,6 +685,7 @@ class WaybillsController extends Controller
             'carrier_weight_other'=>'承运商计重',
             'carType'=>'车型',
             'car_owner_info'=>'车辆信息',
+            'amount'=>'计件',
             'mileage'=>'里程数',
             'fee'=>'运费(元)',
             'pick_up_fee'=>'提货费(元)',
@@ -741,6 +742,7 @@ class WaybillsController extends Controller
                 'carrier_weight_other'=>isset($waybill->carrier_weight_other)?$waybill->carrier_weight_other.' '.(isset($waybill->carrier_weight_unit_other_name)?$waybill->carrier_weight_unit_other_name:''):'',
                 'carType'=>isset($waybill->carType->name)?$waybill->carType->name.($waybill->carType->length.'米'):'',
                 'car_owner_info'=>isset($waybill->car_owner_info)?$waybill->car_owner_info:'',
+                'amount'=>isset($waybill->amount)?$waybill->amount.' '.(isset($waybill->amount_unit_name)?$waybill->amount_unit_name:''):'',
                 'mileage'=>isset($waybill->mileage)?$waybill->mileage:'',
                 'fee'=>isset($waybill->fee)?$waybill->fee:'',
                 'pick_up_fee'=>isset($waybill->pick_up_fee)?$waybill->pick_up_fee:'',

app/LaborReport.php

@@ -43,6 +43,9 @@ class LaborReport extends Model
                 if ($updated_at == $checked_at){
                     return true;
                 }
+//                if($userDutyCheck['checked_at']==$this['updated_at']){
+//                    return true;
+//                }
                 continue;
             }
         return false;

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

@@ -109,29 +109,31 @@
                                 <input class="checkItem" type="checkbox" :value="laborReport.id" v-model="checkData">
                             </td>
                             <td>@{{ i+1  }}</td>
-                            <td>
+                            <td >
                                 @can('人事管理-门卫审核')
                                  <span >
                                 <b v-if="laborReport.userDutyCheckVerifyUserId"  class="text-success">已审核</b>
                                 <button v-else class="btn btn-sm btn-outline-secondary"  @click="guardClockAudit(laborReport.userDutyCheckId,laborReport.userDutyCheckType)">门卫审核</button>
                                 </span>
                                 @else
-                                    <span class="text-center"><p style="color: red">门卫未审核</p></span>
+                                    <span class="text-center"><b class="text-danger">门卫未审核</b></span>
                                 @endcan
                                     &nbsp;&nbsp;&nbsp;&nbsp;
                                 @can('人事管理-组长审核')
-                                <span class="inline">
+                                <span>
                                 <button v-if="laborReport.groupUserId&&!laborReport.is_exportGroup" @click="groupExport(laborReport.id,laborReport.name)" class="btn btn-sm btn-outline-danger">退组</button>
                                 <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_export&&!laborReport.is_exportReplenish" class="text-success">已退场</b>
-                                    {{-- 补卡记录是否已退场--}}
-                                <b v-else-if="laborReport.is_exportReplenish&&!laborReport.is_export" class="text-success">已退场</b>
+{{--                                 --}}{{-- 正常打卡记录是否已退场--}}
+{{--                                <b v-else-if="laborReport.is_export&&!laborReport.is_exportReplenish" class="text-success">已退场</b>--}}
+{{--                                    --}}{{-- 补卡记录是否已退场--}}
+{{--                                <b v-else-if="laborReport.is_exportReplenish&&!laborReport.is_export" class="text-success">已退场</b>--}}
+                                    <b v-else-if="laborReport.is_exportReplenish || laborReport.is_export" class="text-success">已退场</b>
                                 <button v-else-if="laborReport.userWorkGroupId" @click="groupClockAudit(laborReport.id)" class="btn btn-sm btn-outline-primary">组长审核</button>
                                 </span>
                                 @else
-                                    <span  v-if="laborReport.groupUserId"><p style="color: green">在场</p></span>
-                                    <span class="text-center"><p style="color: red">组长未审核</p></span>
+{{--                                        !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-else-if="laborReport.userWorkGroupId" class="text-center"><b class="text-danger">组长未审核</b></span>
                                 @endcan
 
                             </td>

resources/views/waybill/index.blade.php

@@ -176,7 +176,7 @@
                     <th class="td-cool">承运商计抛</th>
                     <th class="td-cool">仓库计重</th>
                     <th class="td-cool">承运商计重</th>
-                    <th class="td-cool">计数</th>
+                    <th class="td-cool">计件</th>
                     <th class="td-cool">里程</th>
                     @can('运输管理-运费')
                     <th class="td-helpful">运费</th>