hant/allocatr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #226: (feature/hant -> develop)

Browse Source 
Merge Request: 地区问题

Created By: @todayswind
Accepted By: @todayswind
URL: https://g-bcrc3009.coding.net/p/allocatr/d/allocatr/git/merge/226?initial=true
This commit is contained in:
todayswind 2025-07-15 12:43:02 +08:00 committed by Coding
commit 16efd441ca
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/controller/orders/Dispatch.php
View File

@ -110,6 +110,7 @@ class Dispatch extends Backend
$formattedTree = $this->formatTree($tree); $formattedTree = $this->formatTree($tree);
$area_name = model('area')->getNameByCode($order->area_id); $area_name = model('area')->getNameByCode($order->area_id);
// dd($area_name);
$order->area_name = str_replace(',', '/', $area_name); $order->area_name = str_replace(',', '/', $area_name);
$this->view->assign('items', $formattedTree); $this->view->assign('items', $formattedTree);
$this->view->assign('row', $order); $this->view->assign('row', $order);

2
application/admin/model/Area.php
View File

@ -10,7 +10,7 @@ class Area extends Model
{ {
// 表名 // 表名
protected $name = 'area'; protected $name = 'areas';
public function getNameByCode($code){ public function getNameByCode($code){

2
application/common/command/ImportArea.php
View File

@ -69,7 +69,7 @@ class ImportArea extends Command
} }
Db::table('fa_area')->insertAll($out); Db::table('fa_areas')->insertAll($out);
Db::commit(); Db::commit();
$output->writeln("<info>港澳台区域数据导入成功！</info>"); $output->writeln("<info>港澳台区域数据导入成功！</info>");
} catch (\Throwable $e) { } catch (\Throwable $e) {