From 157d4e9512c95050dfc293178b651023b1ff0627 Mon Sep 17 00:00:00 2001
From: "1213317725@qq.com" <1213317725@qq.com>
Date: Wed, 21 May 2025 18:02:29 +0800
Subject: [PATCH] 1

---
 admin/src/app/views/auth/components/edit-role.vue | 12 ++++++++++++
 admin/src/app/views/auth/role.vue                 |  9 +++++++++
 niucloud/app/adminapi/controller/sys/Role.php     |  2 ++
 niucloud/app/service/admin/sys/RoleService.php    |  4 ++--
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/admin/src/app/views/auth/components/edit-role.vue b/admin/src/app/views/auth/components/edit-role.vue
index 63fc0285..ff85f573 100644
--- a/admin/src/app/views/auth/components/edit-role.vue
+++ b/admin/src/app/views/auth/components/edit-role.vue
@@ -24,6 +24,17 @@
           :show-word-limit="true"
         />
       </el-form-item>
+	  
+	  
+	  
+	  <el-form-item label="类型">
+	    <el-radio-group v-model="formData.role_key">
+	      <el-radio label="market">销售</el-radio>
+		  <el-radio label="teacher">老师</el-radio>
+		  <el-radio label="manager">主管</el-radio>
+	    </el-radio-group>
+	  </el-form-item>
+	  
 
       <el-form-item :label="t('status')">
         <el-radio-group v-model="formData.status">
@@ -142,6 +153,7 @@ const initialFormData = {
   role_id: 0,
   role_name: '',
   status: 1,
+  role_key:'',
   rules: [],
 }
 const formData: Record<string, any> = reactive({ ...initialFormData })
diff --git a/admin/src/app/views/auth/role.vue b/admin/src/app/views/auth/role.vue
index 6193b95d..69a5b9ba 100644
--- a/admin/src/app/views/auth/role.vue
+++ b/admin/src/app/views/auth/role.vue
@@ -56,6 +56,15 @@
               }}</el-tag>
             </template>
           </el-table-column>
+		  
+		  <el-table-column label="类型">
+		    <template #default="{ row }">
+				<el-tag type="success" v-if="row.role_key == 'market'">销售</el-tag>
+				<el-tag type="success" v-if="row.role_key == 'teacher'">老师</el-tag>
+				<el-tag type="success" v-if="row.role_key == 'manager'">主管</el-tag>
+		    </template>
+		  </el-table-column>
+		  
           <el-table-column
             prop="create_time"
             :label="t('createTime')"
diff --git a/niucloud/app/adminapi/controller/sys/Role.php b/niucloud/app/adminapi/controller/sys/Role.php
index 11b66c29..a584847f 100644
--- a/niucloud/app/adminapi/controller/sys/Role.php
+++ b/niucloud/app/adminapi/controller/sys/Role.php
@@ -57,6 +57,7 @@ class Role extends BaseAdminController
         $data = $this->request->params([
             ['role_name', ''],
             ['rules', []],
+            ['role_key',''],
             ['status', RoleStatusDict::ON],
         ]);
         $this->validate($data, 'app\validate\sys\Role.add');
@@ -73,6 +74,7 @@ class Role extends BaseAdminController
         $data = $this->request->params([
             ['role_name', ''],
             ['rules', []],
+            ['role_key',''],
             ['status', RoleStatusDict::ON],
         ]);
         $this->validate($data, 'app\validate\sys\Role.edit');
diff --git a/niucloud/app/service/admin/sys/RoleService.php b/niucloud/app/service/admin/sys/RoleService.php
index 8474b493..b4c11dc5 100644
--- a/niucloud/app/service/admin/sys/RoleService.php
+++ b/niucloud/app/service/admin/sys/RoleService.php
@@ -46,7 +46,7 @@ class RoleService extends BaseAdminService
         if(isset($data['role_name']) && $data['role_name'] !== '') {
             $where[] = ['role_name', 'like', "%".$this->model->handelSpecialCharacter($data['role_name'])."%"];
         }
-        $field = 'role_id,role_name,status,create_time';
+        $field = 'role_id,role_name,role_key,status,create_time';
         $search_model = $this->model->where($where)->field($field)->order('create_time desc')->append(['status_name']);
         return $this->pageQuery($search_model);
     }
@@ -71,7 +71,7 @@ class RoleService extends BaseAdminService
         $where = array(
             ['status', '=', 1]
         );
-        return $this->model->where($where)->field('role_id,role_name,status,create_time')->select()->toArray();
+        return $this->model->where($where)->field('role_id,role_name,role_key,status,create_time')->select()->toArray();
     }
 
     /**