From 0bf7ccb8fbf7fe9b6067c749d30a1e89fd6211eb Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 15 Jan 2024 10:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9B=E5=BA=94=E9=93=BE?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/supplier/SupplierContactsController.php       | 2 +-
 app/adminapi/lists/supplier/SupplierContactsLists.php        | 5 +++--
 app/common/model/supplier/SupplierContacts.php               | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/controller/supplier/SupplierContactsController.php b/app/adminapi/controller/supplier/SupplierContactsController.php
index 8d716cfb9..015f7f766 100644
--- a/app/adminapi/controller/supplier/SupplierContactsController.php
+++ b/app/adminapi/controller/supplier/SupplierContactsController.php
@@ -23,7 +23,7 @@ use app\adminapi\validate\supplier\SupplierContactsValidate;
 
 
 /**
- * SupplierContacts控制器
+ * 供应商联系人
  * Class SupplierContactsController
  * @package app\adminapi\controller\supplier
  */
diff --git a/app/adminapi/lists/supplier/SupplierContactsLists.php b/app/adminapi/lists/supplier/SupplierContactsLists.php
index 61e55f3cf..cc0ba26d0 100644
--- a/app/adminapi/lists/supplier/SupplierContactsLists.php
+++ b/app/adminapi/lists/supplier/SupplierContactsLists.php
@@ -22,7 +22,7 @@ use app\common\lists\ListsSearchInterface;
 use think\facade\Db;
 
 /**
- * SupplierContacts列表
+ * 供应商联系人
  * Class SupplierContactsLists
  * @package app\adminapi\listssupplier
  */
@@ -57,7 +57,8 @@ class SupplierContactsLists extends BaseAdminDataLists implements ListsSearchInt
     public function lists(): array
     {
         return SupplierContacts::where($this->searchWhere)
-            ->field('id,name,sex,birthday,contacts_type,responsible,contacts_cate,department,duties,work_phone,remark')
+            ->field('id,supplier_id,name,sex,birthday,contacts_type,responsible,contacts_cate,department,duties,work_phone,remark')
+            ->with(['supplier'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($data){
diff --git a/app/common/model/supplier/SupplierContacts.php b/app/common/model/supplier/SupplierContacts.php
index a38aa59ac..96b4d5315 100644
--- a/app/common/model/supplier/SupplierContacts.php
+++ b/app/common/model/supplier/SupplierContacts.php
@@ -65,4 +65,7 @@ class SupplierContacts extends BaseModel
 		return $dict[$data['id_type']];
 	}
 
+	public function supplier(){
+		return $this->hasOne(Supplier::class,'id','supplier_id')->bind(['supplier_name','supplier_code']);
+	}
 }
\ No newline at end of file