From 31d49064d89d1acf39d22b225ebf46a83584eeb3 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Fri, 15 Dec 2023 17:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../contract/ProcurementContractLists.php     | 20 ++++++++++++++-----
 .../contract/ProcurementContractLogic.php     |  1 +
 .../contract/SubcontractingContractLogic.php  |  1 +
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/adminapi/lists/contract/ProcurementContractLists.php b/app/adminapi/lists/contract/ProcurementContractLists.php
index e9d16ccc2..b058318c4 100644
--- a/app/adminapi/lists/contract/ProcurementContractLists.php
+++ b/app/adminapi/lists/contract/ProcurementContractLists.php
@@ -18,7 +18,7 @@ namespace app\adminapi\lists\contract;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\contract\ProcurementContract;
 use app\common\lists\ListsSearchInterface;
-
+use think\facade\Db;
 
 /**
  * 采购合同列表
@@ -63,11 +63,21 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
      */
     public function lists(): array
     {
-        return ProcurementContract::where($this->searchWhere)->where($this->querySearch())
-            ->field(['*'])
+        return Db::name('ProcurementContract')->alias('pc')
+            ->where($this->searchWhere)->where($this->querySearch())
+            ->leftJoin('project p','p.id = pc.project_id')
+            ->field('pc.*, p.name as project_name')
             ->limit($this->limitOffset, $this->limitLength)
-            ->order(['id' => 'desc'])
-            ->select()
+            ->order(['pc.id' => 'desc'])
+            ->select()->each(function($item, $key){
+                //关联数据 供应商后续添加
+                $item['supplier_name'] = '供应商名称';
+                $item['contract_type'] = '1';
+                $item['approve_no'] = '付款单号';
+                $item['approve_step'] = '流程步骤';
+                $item['approve_settle_status'] = 1;
+                return $item;
+            })
             ->toArray();
     }
 
diff --git a/app/adminapi/logic/contract/ProcurementContractLogic.php b/app/adminapi/logic/contract/ProcurementContractLogic.php
index 9dddf577e..6192c037e 100644
--- a/app/adminapi/logic/contract/ProcurementContractLogic.php
+++ b/app/adminapi/logic/contract/ProcurementContractLogic.php
@@ -162,6 +162,7 @@ class ProcurementContractLogic extends BaseLogic
     public static function detail($params): array
     {
         $procurementContract = ProcurementContract::findOrEmpty($params['id']);
+        $procurementContract->supplier = null;
         $procurementContract->custom = null;
         if (!empty($procurementContract->project->custom_id)) {
             $procurementContract->custom = Custom::findOrEmpty($procurementContract->project->custom_id);
diff --git a/app/adminapi/logic/contract/SubcontractingContractLogic.php b/app/adminapi/logic/contract/SubcontractingContractLogic.php
index bab84c974..68b7730b2 100644
--- a/app/adminapi/logic/contract/SubcontractingContractLogic.php
+++ b/app/adminapi/logic/contract/SubcontractingContractLogic.php
@@ -165,6 +165,7 @@ class SubcontractingContractLogic extends BaseLogic
     public static function detail($params): array
     {
         $subcontractingContract = ProcurementContract::findOrEmpty($params['id']);
+        $procurementContract->supplier = null;
         $subcontractingContract->custom = null;
         if (!empty($subcontractingContract->project->custom_id)) {
             $subcontractingContract->custom = Custom::findOrEmpty($subcontractingContract->project->custom_id);