Merge branch 'Haozi'

# Conflicts:
#	app/Http/Controllers/WaybillsController.php
#	resources/views/personnel/laborReport/index.blade.php
#	resources/views/waybill/index.blade.php

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'])->orderBy('id','DESC')->paginate(50);
+        $laborReports=LaborReport::with(['userWorkgroup','user','userDutyCheck'])->orderBy('id','DESC')->paginate(50);
         foreach ($laborReports as $laborReport){
             if (!$laborReport->group_user_id){
                 //十分钟之内组长未审核实行软删除
@@ -88,24 +88,34 @@ class LaborReportController extends Controller
                     $this->log(__METHOD__,"组长未审核该条记录将在10分钟后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
                 }
             }
-            $createdAtDate=Carbon::parse($laborReport->created_at)->format('Y-m-d H:i');
-            $userDutyCheck=UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登入')->where('checked_at','like',$createdAtDate.'%')->first();
-            if(!$userDutyCheck)$addOneHourCheckedAt=Carbon::parse($laborReport['created_at'])->subHours(-1)->format('Y-m-d H:i:s');
-            else $addOneHourCheckedAt=Carbon::parse($userDutyCheck['checked_at'])->subHours(-1)->format('Y-m-d H:i:s');
-            if ($userDutyCheck['verify_user_id']) $laborReport->userDutyCheck=$userDutyCheck;
-            if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')<$addOneHourCheckedAt){
-                $laborReport->userDutyCheck=$userDutyCheck;
-            }
-            else if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')>$addOneHourCheckedAt){
-                $laborReport->delete();
-                $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
+            //换场登入（当天有进场 退场 又进场 情况）
+            //换组登入 （当天进场后  换组 ）
+            if ($laborReport->user_workgroup_id){
+                $createdAtDate=Carbon::parse($laborReport->created_at)->format('Y-m-d');
+                $userDutyCheck=UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登入')->where('checked_at','like',$createdAtDate.'%')->first();
+                $this->guardClock($laborReport,$userDutyCheck);
+            }else if (!$laborReport->user_workgroup_id){
+                $createdAtDate=Carbon::parse($laborReport->created_at)->format('Y-m-d H:i');
+                $userDutyCheck=UserDutyCheck::where('user_id',$laborReport->user_id)->where('type','登入')->where('checked_at','like',$createdAtDate.'%')->first();
+                $this->guardClock($laborReport,$userDutyCheck);
             }
         }
         $userWorkGroups=UserWorkgroup::select('id','name')->get();
         return view('personnel/laborReport/index',['laborReports'=>$laborReports,'userWorkGroups'=>$userWorkGroups,'laravelEchoPrefix'=>$laravelEchoPrefix,'permittingWorkgroups'=>$permittingWorkgroups]);
 
     }
-
+    public function guardClock($laborReport,$userDutyCheck){
+        if(!$userDutyCheck)$addOneHourCheckedAt=Carbon::parse($laborReport['created_at'])->subHours(-1)->format('Y-m-d H:i:s');
+        else $addOneHourCheckedAt=Carbon::parse($userDutyCheck['checked_at'])->subHours(-1)->format('Y-m-d H:i:s');
+        if ($userDutyCheck['verify_user_id']) $laborReport->userDutyCheck=$userDutyCheck;
+        if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')<$addOneHourCheckedAt){
+            $laborReport->userDutyCheck=$userDutyCheck;
+        }
+        else if (!$userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')>$addOneHourCheckedAt){
+            $laborReport->delete();
+            $this->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
+        }
+    }
     public function export($id,Request $request){
         if (!Gate::allows('人事管理-临时工报表')){return redirect(url('/')); }
         ini_set('max_execution_time',3500);

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

@@ -182,6 +182,10 @@ class WaybillsController extends Controller
     {
         if(!Gate::allows('运输管理-编辑')){ return redirect(url('/'));  }
         $waybill=Waybill::find($id);
+        if ($waybill->deliver_at){
+            $waybill->deliver_at_date=Carbon::parse($waybill->deliver_at)->format('Y-m-d');
+            $waybill->deliver_at_time=Carbon::parse($waybill->deliver_at)->format('H:i:s');
+        }
         $carriers=Carrier::get();
         $cities=City::get();
         $units=Unit::get();
@@ -683,10 +687,12 @@ class WaybillsController extends Controller
             'carrier_weight_other'=>'承运商计重',
             'carType'=>'车型',
             'car_owner_info'=>'车辆信息',
+            'amount'=>'计件',
             'mileage'=>'里程数',
             'fee'=>'运费(元)',
             'pick_up_fee'=>'提货费(元)',
             'other_fee'=>'其他费用(元)',
+            'deliver_at'=>'发货时间',
             'dispatch_remark'=>'调度备注',
             'created_at'=>'创建时间'
         ]];
@@ -738,11 +744,13 @@ 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:'',
                 'other_fee'=>isset($waybill->other_fee)?$waybill->other_fee:'',
                 //'collect_fee'=>isset($waybill->collect_fee)?$waybill->collect_fee:'',
+                'deliver_at'=>isset($waybill->deliver_at)?$waybill->deliver_at:'',
                 'dispatch_remark'=>isset($waybill->dispatch_remark)?$waybill->dispatch_remark:'',
                 //'waybillAuditor'=>isset($waybillAuditor)?$waybillAuditor:'',
                 //'dispatchAuditor'=>isset($dispatchAuditor)?$dispatchAuditor:'',

app/LaborReport.php

@@ -37,15 +37,18 @@ class LaborReport extends Model
     }
     public function getIsExportAttribute(){
         $userDutyChecks=UserDutyCheck::where('user_id',$this['user_id'])->where('type','登出')->get();
-            $updated_at = Carbon::parse($this['updated_at'])->format('Y-m-d H-i');
+            $updated_at = Carbon::parse($this['updated_at'])->format('Y-m-d H:i');
             foreach ($userDutyChecks as $userDutyCheck){
-                $checked_at = Carbon::parse($userDutyCheck['checked_at'])->format('Y-m-d H-i');
+                $checked_at = Carbon::parse($userDutyCheck['checked_at'])->format('Y-m-d H:i');
                 if ($updated_at == $checked_at){
                     return true;
                 }
+//                if($userDutyCheck['checked_at']==$this['updated_at']){
+//                    return true;
+//                }
                 continue;
             }
-            return false;
+        return false;
     }
     public function getIsExportReplenishAttribute()
     {

app/Waybill.php

@@ -14,7 +14,7 @@ class Waybill extends Model
         'status','type','waybill_number','owner_id','wms_bill_number','origination','destination','recipient','recipient_mobile','charge','ordering_remark',
         'carrier_id','carrier_bill','origination_city_id','destination_city_id','warehouse_weight','warehouse_weight_unit_id','carrier_weight','carrier_weight_unit_id','carType_id',
         'car_owner_info','fee','pick_up_fee','other_fee','collect_fee','dispatch_remark','waybill_price_model_id','warehouse_weight_other','warehouse_weight_unit_id_other'
-        ,'carrier_weight_other','carrier_weight_unit_id_other','source_bill','mileage','amount','inquire_tel','amount_unit_id','other_charge','other_charge_remark'
+        ,'carrier_weight_other','carrier_weight_unit_id_other','source_bill','mileage','amount','inquire_tel','amount_unit_id','other_charge','other_charge_remark','deliver_at'
     ];
     protected $appends=[
         'origination_city_name',

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/edit.blade.php

@@ -132,9 +132,9 @@
                                     <option value="{{$carrier->id}}">{{$carrier->name}}</option>
                                 @endforeach
                             </select>
-{{--                            <div v-if="errors['carrier_id'] && errors['carrier_id'].length>0" class="invalid-feedback" role="alert" style="position: relative">--}}
-{{--                            <strong class="">@{{ errors['carrier_id'][0] }}</strong>--}}
-{{--                            </div>--}}
+                            <div v-if="errors['carrier_id'] && errors['carrier_id'].length>0" class="invalid-feedback" role="alert" style="position: relative">
+                            <strong class="">@{{ errors['carrier_id'][0] }}</strong>
+                            </div>
                             <span class="col-sm-5" style="position: absolute;height: 15px;padding: 0">
                                 <p class="form-control-static text-danger small font-weight-bold" style="">{{ $errors->first('carrier_id') }}</p>
                             </span>
@@ -349,6 +349,16 @@
                             @enderror
                         </div>
                     </div>
+                    <div class="form-group row">
+                        <label for="deliver_at" class="col-2 col-form-label text-right text-muted">发货时间</label>
+                        <div class="col-8 form-inline">
+                            <input  id="deliver_at_date" @input="spliceDeliverAt" name="deliver_at_date" type="date" class="form-control col-4"
+                                    value="@if(old('deliver_at_date')){{ old('deliver_at_date') }}@else{{$waybill->deliver_at_date}}@endif">
+                            <input  id="deliver_at_time" @input="spliceDeliverAt" name="deliver_at_time" type="time" class="form-control col-4"
+                                    value="@if(old('deliver_at_time')){{ old('deliver_at_time') }}@else{{$waybill->deliver_at_time}}@endif">
+                            <input hidden id="deliver_at"  name="deliver_at" type="text" class="form-control col-4">
+                        </div>
+                    </div>
                     <div class="form-group row">
                         <label for="dispatch_remark" class="col-2 col-form-label text-right text-muted">调度备注</label>
                         <div class="col-8">
@@ -409,7 +419,7 @@
             },
             mounted:function(){
                 let _this=this;
-                console.log(_this.waybillPriceModel.amount_unit_id)
+                //console.log(_this.waybillPriceModel.amount_unit_id)
                 $(".tooltipTarget").tooltip({'trigger':'hover'});
                 this.units.every(function (unit) {
                     switch (unit.name) {
@@ -518,22 +528,27 @@
                             function (response) {
 
                                 if (response.data.error){
-                                    console.log(response.data.error);
+                                    //console.log(response.data.error);
                                     _this.errors=response.data.error;return;}
 
                                 if (!response.data.success) {
                                     document.getElementById('waybillPriceModel').value='';
                                     tempTip.confirm('该目的地与计量单位对应的计费模型不存在，如录入将会标为异常记录，请通知相关负责人添加计费模型,点击'+'<b class="text-primary">"确定"</b>'+'则确认提交 ',
                                         function () {
+                                            document.getElementById('deliver_at').value= document.getElementById('deliver_at_date').value+' '+ document.getElementById('deliver_at_time').value;
                                             document.getElementById('waybillForm').submit();
                                         });
                                 }else{
                                     document.getElementById('waybillPriceModel').value=response.data.success;
+                                    document.getElementById('deliver_at').value= document.getElementById('deliver_at_date').value+' '+ document.getElementById('deliver_at_time').value;
                                     document.getElementById('waybillForm').submit();
                                 }
                             }
                         );
                 },
+                spliceDeliverAt:function () {
+                        document.getElementById('deliver_at').value= document.getElementById('deliver_at_date').value+' '+ document.getElementById('deliver_at_time').value;
+                },
                 submitForm(){
                     let type=document.getElementById('type').value;
                     if (type==='专线'){
@@ -545,6 +560,7 @@
                         let carrier_weight_unit_id_other=document.getElementById('carrier_weight_unit_id_other').value;
                         this.is_waybillPriceModel(carrier_id,carrier_weight,carrier_weight_unit_id,destination_city_id,carrier_weight_other,carrier_weight_unit_id_other);
                     }else {
+                        document.getElementById('deliver_at').value= document.getElementById('deliver_at_date').value+' '+ document.getElementById('deliver_at_time').value;
                         document.getElementById('waybillForm').submit();
                     }
                 },

resources/views/waybill/index.blade.php

@@ -176,13 +176,14 @@
                     <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>
                     @endcan
                     <th class="td-helpful">提货费</th>
                     <th class="td-helpful">其他支出</th>
+                    <th class="td-helpful">发货时间</th>
                     <th class="td-helpful">调度备注</th>
                     @can('运输管理-删除')
                         <th class="td-delete">操作</th>
@@ -301,7 +302,8 @@
                         <td class="td-helpful">@{{waybill.pick_up_fee}}</td>
                         <td class="td-helpful">@{{waybill.other_fee}}</td>
                     @endcan
-                    <td class="td-helpful"><span v-html="waybill.dispatch_remark"></span>
+                    <td class="td-helpful">@{{waybill.deliver_at}}</td>
+                    <td class="td-helpful"><span v-html="waybill.dispatch_remark"></td>
                     @can('运输管理-删除')
                         <td class="td-operation">
                             <button type="button" class="btn btn-outline-danger btn-sm" @click="waybillDestroy(waybill.id,waybill.waybill_number)">删</button>
@@ -478,7 +480,7 @@
                         mileage:'{{$waybill->mileage}}',amount:'{{$waybill->amount}}',
                         @if($waybill->carType)carType:{!! $waybill->carType !!},car_owner_info:'{{$waybill->car_owner_info}}',@endif @can('运输管理-可见费用项') fee:'{{$waybill->fee}}',
                         pick_up_fee:'{{$waybill->pick_up_fee}}',other_fee:'{{$waybill->other_fee}}',
-                        collect_fee:'{{$waybill->collect_fee}}', @endcan dispatch_remark:'{{ $waybill->dispatch_remark }}',isBtn:false,
+                        collect_fee:'{{$waybill->collect_fee}}', @endcan deliver_at:'{{$waybill->deliver_at}}',dispatch_remark:'{{$waybill->dispatch_remark}}',isBtn:false,
                         waybillAuditLogs:{!! $waybill->waybillAuditLogs !!},
                         @if($waybill->remark)remark:'{{$waybill->remark}}', @else remark:'', @endif
                     },