Merge branch 'zhangyong/feature-20250716164232-金币前端' into milestone-20250711-金币前端二期

src/views/permissions/permission.vue

@@ -255,6 +255,13 @@ const closeUserAddVisible = function () {
   Ref.value.resetFields();
 }
 const closePermissionAddVisible = function () {
+  addRole.value = {
+  roleName: '',
+  parentId: null,
+  checkedKeys: [],
+  grade: '',
+  market: ''
+}
   permissionAddVisible.value = false
   Ref.value.resetFields();
   getRoleList()
@@ -649,6 +656,9 @@ const getLists = async function () {
       data: { id: roleId }
     })
     data.value = res.data
+    if(addRole.value.parentId!=2){
+      data.value = data.value.filter(item => item.id!== 9); 
+    }
     console.log('看看data', data.value)
     console.log('parentID:', addRole.value.parentId, 'roleId:', roleId)
   } catch (error) {
@@ -872,7 +882,7 @@ onMounted(async function () {
             <template #default="scope">
               <el-popconfirm title="确定将此角色删除吗？" @confirm="delRoleConfirm">
                 <template #reference>
-                  <el-button type="danger" text @click="delRole(scope.row)">
+                  <el-button type="danger" text @click="delRole(scope.row)" :disabled="scope.row.id === 1 || scope.row.id === 2">
                     删除
                   </el-button>
                 </template>