From 517709254a5fb86759b90ef9644b56f607febb85 Mon Sep 17 00:00:00 2001 From: wh <382379437@qq.com> Date: Tue, 25 Mar 2025 16:13:53 +0800 Subject: [PATCH] fixed --- admin/application/admin/controller/Firm.php | 15 ++++++++++++++- .../application/admin/controller/Firmcustomer.php | 4 ++-- admin/application/admin/controller/auth/Admin.php | 1 + admin/application/admin/lang/zh-cn/firm.php | 13 ++++++------- admin/application/admin/view/auth/admin/edit.html | 4 ++-- admin/application/admin/view/firm/add.html | 7 ++++++- admin/application/admin/view/firm/edit.html | 7 ++++++- .../application/admin/view/firmcustomer/add.html | 11 +++++++++-- .../application/admin/view/firmcustomer/edit.html | 11 +++++++++-- admin/public/assets/js/backend/firm.js | 1 + 10 files changed, 56 insertions(+), 18 deletions(-) diff --git a/admin/application/admin/controller/Firm.php b/admin/application/admin/controller/Firm.php index 1d97f3e..c2fb215 100644 --- a/admin/application/admin/controller/Firm.php +++ b/admin/application/admin/controller/Firm.php @@ -3,6 +3,7 @@ namespace app\admin\controller; use app\common\controller\Backend; +use think\Db; /** * 合作企业 @@ -11,7 +12,7 @@ use app\common\controller\Backend; */ class Firm extends Backend { - protected $noNeedRight = ['index']; + protected $noNeedRight = ['index','getAiService']; /** * Firm模型对象 @@ -35,4 +36,16 @@ class Firm extends Backend */ + + //查询企业的AI客服 + function getAiService(){ + //查询当前企业已经配置的AI客服 + $aicustomerservice_ids = Db::table('fa_firm') + ->where('id',session_admin_firm_id()) + ->value('aicustomerservice_ids'); + $info = Db::table('fa_aicustomerservice') + ->whereIn('id',explode(',',$aicustomerservice_ids)) + ->select(); + return json(['list'=>$info,'total'=>$info]); + } } diff --git a/admin/application/admin/controller/Firmcustomer.php b/admin/application/admin/controller/Firmcustomer.php index 7f2d6d9..1cfcd49 100644 --- a/admin/application/admin/controller/Firmcustomer.php +++ b/admin/application/admin/controller/Firmcustomer.php @@ -28,8 +28,6 @@ class Firmcustomer extends Backend parent::_initialize(); $this->model = new \app\admin\model\Firmcustomer; $this->view->assign("statusList", $this->model->getStatusList()); - $this->model->where('firmcustomer.firm_id',session_admin_firm_id()); - $this->model->where('firmcustomer.firmstore_id',session_admin_firmstore_id()); } @@ -57,6 +55,8 @@ class Firmcustomer extends Backend } list($where, $sort, $order, $offset, $limit) = $this->buildparams(); + $this->model->where('firmcustomer.firm_id',session_admin_firm_id()); + $this->model->where('firmcustomer.firmstore_id',session_admin_firmstore_id()); $list = $this->model ->with(['firmstoreprojectstwo','firmcustomerorigin']) ->where($where) diff --git a/admin/application/admin/controller/auth/Admin.php b/admin/application/admin/controller/auth/Admin.php index b869ee1..54a1c42 100644 --- a/admin/application/admin/controller/auth/Admin.php +++ b/admin/application/admin/controller/auth/Admin.php @@ -28,6 +28,7 @@ class Admin extends Backend protected $searchFields = 'id,username,nickname'; protected $childrenGroupIds = []; protected $childrenAdminIds = []; + protected $noNeedRight = ['index']; public function _initialize() { diff --git a/admin/application/admin/lang/zh-cn/firm.php b/admin/application/admin/lang/zh-cn/firm.php index bed91d6..92fb918 100644 --- a/admin/application/admin/lang/zh-cn/firm.php +++ b/admin/application/admin/lang/zh-cn/firm.php @@ -1,11 +1,10 @@ 'ID', - 'Name' => '企业简称', - 'Full_name' => '企业名称', - 'Address' => '地址', - 'Phone' => '电话', - 'Person' => '联系人', - 'Create_time' => '创建时间' + 'Id' => 'ID', + 'Name' => '企业简称', + 'Full_name' => '企业名称', + 'Address' => '地址', + 'Aicustomerservice_ids' => 'AI客服（可多选）', + 'Create_time' => '创建时间' ]; diff --git a/admin/application/admin/view/auth/admin/edit.html b/admin/application/admin/view/auth/admin/edit.html index 7573180..7332cee 100644 --- a/admin/application/admin/view/auth/admin/edit.html +++ b/admin/application/admin/view/auth/admin/edit.html @@ -51,7 +51,7 @@
- +
{:build_radios('row[role]', ['admin'=>'系统管理员', 'firm'=>'企业管理员'],$row.role)}
@@ -79,7 +79,7 @@
+ name="row[firmduty_id]" type="text" value="{$row.firmduty_id}">
diff --git a/admin/application/admin/view/firm/add.html b/admin/application/admin/view/firm/add.html index 9b8f3fb..c4c7805 100644 --- a/admin/application/admin/view/firm/add.html +++ b/admin/application/admin/view/firm/add.html @@ -18,7 +18,12 @@ - +
+ +
+ +
+
diff --git a/admin/application/admin/view/firm/edit.html b/admin/application/admin/view/firm/edit.html index f93b85e..471a0bd 100644 --- a/admin/application/admin/view/firm/edit.html +++ b/admin/application/admin/view/firm/edit.html @@ -18,7 +18,12 @@
- +
+ +
+ +
+
diff --git a/admin/application/admin/view/firmcustomer/add.html b/admin/application/admin/view/firmcustomer/add.html index 1ba39d4..fa380a6 100644 --- a/admin/application/admin/view/firmcustomer/add.html +++ b/admin/application/admin/view/firmcustomer/add.html @@ -18,6 +18,13 @@
+
+ +
+ +
+
@@ -74,11 +81,11 @@
- +
+ class="form-control selectpage" name="row[admin_id]" type="text" value="">
diff --git a/admin/application/admin/view/firmcustomer/edit.html b/admin/application/admin/view/firmcustomer/edit.html index e1ecbc5..7ae56c1 100644 --- a/admin/application/admin/view/firmcustomer/edit.html +++ b/admin/application/admin/view/firmcustomer/edit.html @@ -18,6 +18,13 @@
+
+ +
+ +
+
@@ -64,12 +71,12 @@
- +
+ name="row[admin_id]" type="text" value="{$row.admin_id|htmlentities}">
diff --git a/admin/public/assets/js/backend/firm.js b/admin/public/assets/js/backend/firm.js index 7be2059..ad6ed27 100644 --- a/admin/public/assets/js/backend/firm.js +++ b/admin/public/assets/js/backend/firm.js @@ -29,6 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'name', title: __('Name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'full_name', title: __('Full_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'address', title: __('Address'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, + {field: 'aicustomerservice_ids', title: __('Aicustomerservice_ids'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content}, {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime}, {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} ]