页面BUG修复

app/RejectedBill.php

@@ -8,6 +8,7 @@ use App\Jobs\SyncOrderRejectingStatusJob;
 use App\Jobs\SyncRejectedBillRejectingStatusJob;
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\Auth;
 use Overtrue\LaravelPinyin\Facades\Pinyin;
@@ -74,6 +75,11 @@ class RejectedBill extends Model
     function orderIssueRejectedBill(){
         return $this->hasOne(OrderIssueRejectedBill::class,'logistic_number_return','logistic_number_return')->whereNotNull('order_issue_id');
     }
+    function record(): BelongsTo
+    {
+        return $this->belongsTo(ReceiveRecord::class,"logistic_number_return","logistic_number");
+    }
+
 
     function setIsLoaded_toWaitConfirm(){
         if(config('api.jianshang_rejecteds_log_switch'))Controller::logS(__METHOD__,__FUNCTION__,"将待推单修改为待确认! 退单号：".$this['logistic_number_return'],Auth::user()['id']);

app/Services/RejectedService.php

@@ -33,7 +33,7 @@ class RejectedService
         if (count($owners)==0){
             $owners[] = [''];
         }
-        $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality',
+        $rejectedBills = RejectedBill::query()->with('user','owner', 'logistic', 'items.quality','record:logistic_number,record_at',
             'items.packageImages','items.commodityImages','items.uploadFiles','orderIssueRejectedBill:logistic_number_return')
             ->orderBy('rejected_bills.id', 'desc')
             ->where(function ($query)use ($owners){

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

@@ -77,6 +77,7 @@
                             </span>
                         </td>
                         <td class="text-muted"><span>@{{rejectedBill.created_at}}</span></td>
+                        <td class="text-muted"><span>@{{rejectedBill.record ? rejectedBill.record.record_at : ''}}</span></td>
                         <td><span v-if="rejectedBill.owner"><span>@{{rejectedBill.owner.name}}</span></span></td>
                         <td><span>@{{rejectedBill.logistic_number_return}}</span></td>
                         <td class="text-muted"><span v-if="rejectedBill.logistic"><span>@{{rejectedBill.logistic.name}}</span></span></td>
@@ -262,6 +263,7 @@
                     {name: 'is_finished', value: '是否完结',neglect: true},
                     {name: 'is_loaded', value: '是否入库', neglect: true},
                     {name:'created_at',value: '创建时间'},
+                    {name:'record_at',value: '退回记录时间'},
                     {name: 'owner_name', value: '客户名称', neglect: true},
                     {name: 'logistic_number_return', value: '退回单号'},
                     {name: 'logistic_name', value: '退回公司', neglect: true},