调整退货录入校验条件

app/Http/Controllers/LaborReportController.php

@@ -56,13 +56,13 @@ class LaborReportController extends Controller
                 $tenMinutesLater=Carbon::parse($laborReport->created_at)->subHours(-2)->format('Y-m-d H:i:s');
                 if (Carbon::now()->format('Y-m-d H:i:s')>$tenMinutesLater){
                     $laborReport->delete();
-                    app('LogService')->log(__METHOD__,"组长未审核该条记录将在10分钟后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
+                    app('LogService')->log(__METHOD__,"组长未审核该条记录将在2小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
                 }
             }
             $addOneHourCheckedAt=Carbon::parse($laborReport->userDutyCheck['checked_at'])->subHours(-1)->format('Y-m-d H:i:s');
             if (!$laborReport->userDutyCheck['verify_user_id']&&Carbon::now()->format('Y-m-d H:i:s')>$addOneHourCheckedAt){
                 $laborReport->delete();
-                app('LogService')->log(__METHOD__,"进场门卫未审核该条记录将在一小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
+                app('LogService')->log(__METHOD__,"进场门卫未审核该条记录将在1小时后实行软删除__".__FUNCTION__,$laborReport->toJson(),Auth::user()['id']);
             }
         }
         $totalWorkingHours=$this->getTotalWorkingHours($request->input());

app/Http/Controllers/PersonnelController.php

@@ -139,7 +139,7 @@ class PersonnelController extends Controller
             $newReport=$userDutyCheck->makeEnteringRecord();
             $laborReportService->addOrUpdateRemark($remark,$newReport->id);
             app('LogService')->log(__METHOD__,"进场创建临时工报表记录__".__FUNCTION__,json_encode([$userDutyCheck]));
-            if ($newReport) event(new ImportEvent($newReport));
+//            if ($newReport) event(new ImportEvent($newReport));
         }
         else if(!$laborReport&&$userDutyCheck->type=='登出'){
             //退场时间跨天情况

resources/views/rejected/create.blade.php

@@ -694,9 +694,10 @@
                         _this.owners.forEach(function (owner){
                            if (owner.name==='宝时补发') baoShiBuFaOwnerId=owner.id;
                         });
-                        if(_this.commodityOwnerId!==_this.billInputting.id_owner && _this.billInputting.id_owner!==baoShiBuFaOwnerId){
-                            _this.isChangeOwner(_this.itemInputting.id_rejected_bill);
-                        }
+                        console.log(_this.billInputting.id_owner)
+                        // if(_this.commodityOwnerId!=_this.billInputting.id_owner && _this.billInputting.id_owner!=baoShiBuFaOwnerId){
+                        //     _this.isChangeOwner(_this.itemInputting.id_rejected_bill);
+                        // }
                     }
                     axios.post(url,_this.itemInputting).then(function (response) {
                         _this.cleanError();