From 261908caff193d0b97f9e87e4d600f9b500b74b2 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 19 Dec 2023 11:45:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8A=A5=E9=94=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expense/ExpenseReimbursementLists.php     | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/expense/ExpenseReimbursementLists.php b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
index 4867d1667..e9b340bee 100644
--- a/app/adminapi/lists/expense/ExpenseReimbursementLists.php
+++ b/app/adminapi/lists/expense/ExpenseReimbursementLists.php
@@ -15,10 +15,10 @@
 namespace app\adminapi\lists\expense;
 
 
-use app\adminapi\lists\BaseAdminDataLists;
+use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\expense\ExpenseReimbursement;
 use app\common\lists\ListsSearchInterface;
-
+use think\facade\Db;
 
 /**
  * ExpenseReimbursement列表
@@ -38,7 +38,7 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['reimburser', 'reimbursement_date', 'customer_id', 'payee_name', 'payee_account'],
+            '=' => ['reimburser', 'reimbursement_date', 'customer_id', 'payee_name', 'payee_account'],
         ];
     }
 
@@ -60,6 +60,23 @@ class ExpenseReimbursementLists extends BaseAdminDataLists implements ListsSearc
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
+        
+        return Db::name('ExpenseReimbursement')->alias('er')
+            ->where($this->searchWhere)
+            ->leftJoin('orgs o','o.id = er.org_id')
+            ->leftJoin('dept d','d.id = er.dept_id')
+            ->leftJoin('custom ct','ct.id = er.customer_id')
+            ->field('er.*, d.name as dept_name, o.name as org_name, ct.name as customer_name')
+            ->limit($this->limitOffset, $this->limitLength)
+            ->order(['er.id' => 'desc'])
+            ->select()->each(function($item, $key){
+                //关联数据后续添加               
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
+                return $item;
+            })
+            ->toArray();
     }