From 3d46ec1ee044f019495c3e399598198fb8d8814e Mon Sep 17 00:00:00 2001 From: hant Date: Tue, 17 Jun 2025 21:50:04 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/controller/Orderplan.php | 1 + application/admin/controller/statistics/Aftersale.php | 1 + application/admin/controller/statistics/Dispatcher.php | 2 +- application/admin/controller/statistics/Item.php | 2 ++ application/admin/controller/workers/Worker.php | 5 ++--- public/assets/js/backend/orderplan.js | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/application/admin/controller/Orderplan.php b/application/admin/controller/Orderplan.php index 456c342..5249a90 100644 --- a/application/admin/controller/Orderplan.php +++ b/application/admin/controller/Orderplan.php @@ -34,6 +34,7 @@ use function Symfony\Component\Clock\now; class Orderplan extends Backend { + protected $noNeedRight = ['data']; /** * Order模型对象 * @var \app\admin\model\Order diff --git a/application/admin/controller/statistics/Aftersale.php b/application/admin/controller/statistics/Aftersale.php index 54a46aa..6fe008a 100644 --- a/application/admin/controller/statistics/Aftersale.php +++ b/application/admin/controller/statistics/Aftersale.php @@ -18,6 +18,7 @@ use function Symfony\Component\Clock\now; class Aftersale extends Backend { + protected $noNeedRight = ['*']; protected $relationSearch = true,$items,$itemsformattedTree; public function _initialize() diff --git a/application/admin/controller/statistics/Dispatcher.php b/application/admin/controller/statistics/Dispatcher.php index 44dd440..6f6630c 100644 --- a/application/admin/controller/statistics/Dispatcher.php +++ b/application/admin/controller/statistics/Dispatcher.php @@ -16,7 +16,7 @@ use function Symfony\Component\Clock\now; */ class Dispatcher extends Backend { - + protected $noNeedRight = ['chart','chartData']; /** * Staorder模型对象 * @var Order diff --git a/application/admin/controller/statistics/Item.php b/application/admin/controller/statistics/Item.php index 9510946..5cc77c4 100644 --- a/application/admin/controller/statistics/Item.php +++ b/application/admin/controller/statistics/Item.php @@ -26,6 +26,8 @@ class Item extends Backend { + protected $noNeedRight = ['list','chartData']; + protected $relationSearch = true; public function _initialize() diff --git a/application/admin/controller/workers/Worker.php b/application/admin/controller/workers/Worker.php index 619a9a4..094a54c 100644 --- a/application/admin/controller/workers/Worker.php +++ b/application/admin/controller/workers/Worker.php @@ -88,7 +88,7 @@ class Worker extends Backend $q->withField(['id','username']); }]) ->where($where) - ->field('worker.id,admin_id,type,name,tel,area_id,create_time,deposit_amount,update_time,status,star,rate,rate_remark,remark,images') + ->field('worker.id,admin_id,type,name,tel,area_id,create_time,deposit_amount,update_time,status,star,rate,rate_remark,remark,images,address') ->order($sort, $order); if ($keyword) { $build->where(function ($q) use ($keyword) { @@ -249,14 +249,13 @@ class Worker extends Backend } } unset($params['rules']); - unset($params['address']); $worker->save($params); // 返回成功信息 $this->success('更新成功', 'index'); } $area_name = model('area')->getNameByCode($worker->area_id); - $worker->area_name = str_replace(',', '/', $area_name); + $worker->area_name = str_replace(',', '/', $area_name ?? ''); $select_ids = model('WorkerItem')->where('worker_id', $ids)->field('item_id') diff --git a/public/assets/js/backend/orderplan.js b/public/assets/js/backend/orderplan.js index c835190..cbb2878 100644 --- a/public/assets/js/backend/orderplan.js +++ b/public/assets/js/backend/orderplan.js @@ -41,7 +41,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'echarts','echarts-th Controller.echarts.item_pie(data.pie.item); Controller.echarts.area_pie(data.pie.area); Controller.echarts.source_pie(data.pie.source); - return; + return false; }); } },