退货审核；海柔标记完成的顺序调整

app/LogisticNumberFeature.php

@@ -9,7 +9,7 @@ use App\Traits\ModelLogChanging;
 
 class LogisticNumberFeature extends Model
 {
-    use ModelLogChanging;
+//    use ModelLogChanging;
 
     use ModelTimeFormat;
     protected $fillable=['logistic_id','name','value','weight'];

app/OrderPackage.php

@@ -18,7 +18,7 @@ use App\Traits\ModelLogChanging;
 
 class OrderPackage extends Model
 {
-    use ModelLogChanging;
+//    use ModelLogChanging;
 
     use ModelTimeFormat;
 

app/Services/ForeignHaiRoboticsService.php

@@ -225,7 +225,6 @@ class ForeignHaiRoboticsService
             $this->stationTaskMaterialBoxService->set($stationTaskMaterialBox,[
                 'id' => $stationTaskMaterialBox['id'],
                 'status' => $stationTaskMaterialBox['status']='处理中',
-                'station_id' => 4,
             ]);
         }
         return $controlSuccess;

config/logging.php

@@ -9,7 +9,7 @@ return [
         'finishSave',
     ],
 
-    'expire_duration'=>'60', //天数，日志超过时长的就在服务中删除
+    'expire_duration'=>'20', //天数，日志超过时长的就在服务中删除
     /*
     |--------------------------------------------------------------------------
     | Default Log Channel

resources/views/rejected/search/general.blade.php

@@ -29,7 +29,7 @@
                     <span class="btn btn-sm btn-outline-dark" @click="finishAll" style="cursor: pointer">完结</span>
                 @endcan
                 @cannot('退货管理-客户不可见')
-                <span class="dropdown">
+                    <span class="dropdown">
                     <button class="btn btn-outline-dark btn-sm form-control-sm dropdown-toggle tooltipTarget"
                             data-toggle="dropdown" title="将勾选记录的入库状态设定为是或否，仅对未完结状态的记录有效">
                         修改入库
@@ -57,10 +57,12 @@
                             <span class="text-muted" style="opacity:0.7">@{{ i+1 }}</span> <span v-if="rejectedBill.order_issue_rejected_bill" class="badge badge-pill badge-danger">问题件</span>
                         </td>
                         <td class="text-muted">
-                            <span v-if="rejectedBill.is_checked==1" class="text-success">
-                                <span class="fa fa-check-square"></span> @{{ rejectedBill.checked_numbers }}
+                            <span>
+                                <span v-if="rejectedBill.is_checked==1" class="text-success">
+                                    <span class="fa fa-check-square"></span> @{{ rejectedBill.checked_numbers }}
+                                </span>
+                                <span v-else>未审核</span>
                             </span>
-                            <span v-else>未审核</span>
                         </td>
                         <td class="" :class="[rejectedBill.is_finished==1?'text-success':'text-muted']">@{{rejectedBill.is_finished | yesNo}}</td>
                         <td class="" :class="[rejectedBill.is_loaded==1?'text-success':'text-muted']">
@@ -146,7 +148,7 @@
         ];
         let logistics=[
             @foreach($logistics as $logistic)
-            {!! $logistic !!},
+                {!! $logistic !!},
             @endforeach
         ];
         let qualityLabels=[
@@ -154,9 +156,9 @@
             {id:'{{$qualityLabel->id}}',name:'{{$qualityLabel->name}}'},
             @endforeach
         ];
-            @if(isset($paginateParams))
+        @if(isset($paginateParams))
         let paginateParams={!! json_encode($paginateParams) !!};
-            @endif
+        @endif
         let total='{{$rejectedBills->total()}}';
         let editUrl = "{{url('rejectedBill')}}/";
         let destroyUrl = "{{url('rejectedBill')}}/";
@@ -252,7 +254,7 @@
                         ]},
                     {name:'remark',value: '退单备注'},
                     {name:'operator_name',value: '录入人'},
-                    @can('退货管理-编辑','退货管理-删除'){name:'remove',value: '操作', neglect: true},@endcan
+                        @can('退货管理-编辑','退货管理-删除'){name:'remove',value: '操作', neglect: true},@endcan
                 ];
                 new Header({
                     el: "table",