更新细节

app/adminapi/lists/finance/FinanceReturnedMoneyLists.php

@@ -41,7 +41,7 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['frd.customer_id', 'frd.contract_id'],
+            '=' => ['frm.customer_id', 'frm.contract_id'],
         ];
     }
 
@@ -57,20 +57,16 @@ class FinanceReturnedMoneyLists extends BaseAdminDataLists implements ListsSearc
      */
     public function lists(): array
     {
-        return Db::name('FinanceReturnedMoney')->alias('frd')
+        return Db::name('FinanceReturnedMoney')->alias('frm')
             ->where($this->searchWhere)
-            ->leftJoin('contract c','c.id = frd.contract_id')
+            ->leftJoin('contract c','c.id = frm.contract_id')
             ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
             ->leftJoin('project p','p.id = bbbd.project_id')
             ->leftJoin('custom ct','ct.id = c.customer_id')
-            ->field('frd.*, bbbd.project_id, c.contract_code, c.contract_name, c.contract_type, p.name as project_name, p.project_code, ct.name as customer_name')
+            ->field('frm.*, bbbd.project_id, c.contract_code, c.contract_name, c.contract_type, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['frd.id' => 'desc'])
+            ->order(['frm.id' => 'desc'])
             ->select()->each(function($item, $key){
-                //关联数据后续添加               
-                $item['approve_no'] = '付款单号';
-                $item['approve_step'] = '流程步骤';
-                $item['approve_settle_status'] = 1;
                 return $item;
             })
             ->toArray();

app/adminapi/lists/finance/FinanceReturnedRecordLists.php

@@ -18,7 +18,7 @@ namespace app\adminapi\lists\finance;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\finance\FinanceReturnedRecord;
 use app\common\lists\ListsSearchInterface;
-
+use think\facade\Db;
 
 /**
  * FinanceReturnedRecord列表
@@ -38,7 +38,7 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
     public function setSearch(): array
     {
         return [
-            '=' => ['customer_id', 'contract_id', 'finance_returned_money_id'],
+            '=' => ['frr.customer_id', 'frr.contract_id', 'frr.finance_returned_money_id'],
         ];
     }
 
@@ -54,11 +54,18 @@ class FinanceReturnedRecordLists extends BaseAdminDataLists implements ListsSear
      */
     public function lists(): array
     {
-        return FinanceReturnedRecord::where($this->searchWhere)
+        return Db::name('FinanceReturnedRecord')->alias('frr')
-            ->field(['*'])
+            ->where($this->searchWhere)
+            ->leftJoin('contract c','c.id = frr.contract_id')
+            ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id')
+            ->leftJoin('project p','p.id = bbbd.project_id')
+            ->leftJoin('custom ct','ct.id = c.customer_id')
+            ->field('frr.*, bbbd.project_id, c.contract_code, c.contract_name, c.contract_type, p.name as project_name, p.project_code, ct.name as customer_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
+            ->order(['frr.id' => 'desc'])
-            ->select()
+            ->select()->each(function($item, $key){
+                return $item;
+            })
             ->toArray();
     }
 

app/adminapi/logic/finance/FinanceReturnedRecordLogic.php

@@ -137,7 +137,9 @@ class FinanceReturnedRecordLogic extends BaseLogic
         $financeReturnedRecord->contract;
         $financeReturnedRecord->custom;
         $financeReturnedRecord->plan = $financeReturnedRecord->returnedPlan;
-        unset($financeReturnedRecord->returnedPlan);
+        $financeReturnedRecord->document =  $financeReturnedRecord->contract->document;
+        $financeReturnedRecord->project = $financeReturnedRecord->document->project;
+        unset($financeReturnedRecord->returnedPlan, $financeReturnedRecord->contract->document, $financeReturnedRecord->document->project);
         return $financeReturnedRecord->toArray();
     }
 }