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 @@ - + @@ -80,7 +80,7 @@ - +