From 8933493127cdfa6a0cc875de7652a8b3d9a9e68d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Mon, 12 Oct 2026 10:33:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=89=A9=E6=B5=81=E5=85=AC=E5=8F=B8):=20?=
=?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=A9=B1=E5=8A=A8=E5=88=97=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E9=A9=B1=E5=8A=A8=E4=B8=AD=E6=96=87=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../driver/express/ExpressCompanyServices.php | 6 ++++++
.../driver/express/ExpressDriverServices.php | 16 ++++++++++++++++
.../src/pages/driver/expressDriver/company.vue | 6 +++---
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/backend/app/services/driver/express/ExpressCompanyServices.php b/backend/app/services/driver/express/ExpressCompanyServices.php
index cfa5dfeeb..d804cb05e 100644
--- a/backend/app/services/driver/express/ExpressCompanyServices.php
+++ b/backend/app/services/driver/express/ExpressCompanyServices.php
@@ -38,6 +38,12 @@ class ExpressCompanyServices extends BaseService
[$page, $limit] = $this->getPageValue();
$list = $this->dao->getList($where, ['*'], $page, $limit);
$count = $this->dao->count($where);
+ // 绑定驱动补充中文名称
+ $driverNames = app()->make(ExpressDriverServices::class)->getExpressDriverNames();
+ foreach ($list as &$item) {
+ $item['driver_name'] = $driverNames[$item['driver_key']] ?? $item['driver_key'];
+ }
+ unset($item);
return compact('list', 'count');
}
diff --git a/backend/app/services/driver/express/ExpressDriverServices.php b/backend/app/services/driver/express/ExpressDriverServices.php
index ec9e05715..a29c7fd2b 100644
--- a/backend/app/services/driver/express/ExpressDriverServices.php
+++ b/backend/app/services/driver/express/ExpressDriverServices.php
@@ -58,6 +58,22 @@ class ExpressDriverServices extends BaseService
return $this->dao->getEnabledDrivers();
}
+ /**
+ * 获取电子面单类型驱动的中文名称映射（driver_key => driver_name）
+ * @return array
+ */
+ public function getExpressDriverNames(): array
+ {
+ $names = [];
+ $list = $this->getList([])['list'] ?? [];
+ foreach ($list as $driver) {
+ if (($driver['driver_type'] ?? '') === 'express') {
+ $names[$driver['driver_key']] = $driver['driver_name'] ?? '';
+ }
+ }
+ return $names;
+ }
+
/**
* 根据 driver_key 获取驱动信息
* @param string $driverKey
diff --git a/frontend/admin/src/pages/driver/expressDriver/company.vue b/frontend/admin/src/pages/driver/expressDriver/company.vue
index 1853a791e..a3537e8ba 100644
--- a/frontend/admin/src/pages/driver/expressDriver/company.vue
+++ b/frontend/admin/src/pages/driver/expressDriver/company.vue
@@ -33,9 +33,9 @@
-
+
- {{ scope.row.driver_key || '-' }}
+ {{ scope.row.driver_name || scope.row.driver_key || '-' }}
@@ -80,7 +80,7 @@
-
+
编辑