用户管理

frontend/src/views/authority/role/components/rolePopup.vue

@@ -1,40 +1,28 @@
 <template>
     <!-- 基础信息弹出框 -->
-  <el-dialog :model-value="dialogVisible" :title="title" v-bind="dialogSmall" @close="handleCancel" width="500" draggable>
+  <el-dialog :model-value="dialogVisible" :title="dialogTitle" v-bind="dialogSmall" @close="close" >
     <div>
 
-        <el-form :model="data" 
+        <el-form :model="formContent" 
                   ref='formRuleRef'
                   :rules='rules'
                   >
         <el-form-item label="名称" prop='name' :label-width="100">
-          <el-input v-model="data.name" placeholder="请输入名称" autocomplete="off" />
+          <el-input v-model="formContent.name" placeholder="请输入名称" autocomplete="off" />
         </el-form-item>
 
         <el-form-item label="编码" prop='code' :label-width="100">
-          <el-input v-model="data.code" placeholder="请输入编码" autocomplete="off" />
+          <el-input v-model="formContent.code" placeholder="请输入编码" autocomplete="off" />
         </el-form-item>
-
-        <el-form-item label="类型" prop='type' :label-width="100">
-          <el-select v-model="data.type" placeholder="请选择类型" autocomplete="off">
-          <el-option
-            v-for="item in dictStore.getDictData('roleType')"
-            :key="item.id"
-            :label="item.label"
-            :value="item.code"
-          />
-          </el-select>
-        </el-form-item>
-
         <el-form-item label="描述" prop='remark' :label-width="100">
-          <el-input v-model="data.remark" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" />
+          <el-input v-model="formContent.remark" :rows="2" type="textarea" placeholder="请输入备注" autocomplete="off" />
         </el-form-item>
       </el-form>
       </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="handleCancel">取消</el-button>
-        <el-button type="primary" @click="handleOK">
+        <el-button @click="close()">取消</el-button>
+        <el-button type="primary" @click="save()">
           保存
         </el-button>
       </div>
@@ -44,32 +32,52 @@
   </template>
   
   <script lang="ts" setup>
-  import { FormInstance,FormItemRule } from 'element-plus'
-  import { ProTableInstance } from '@/components/ProTable/interface'
-  import { ref,computed  } from 'vue'
-  import { Role } from '@/api/role/interface'
+  import{  ElMessage, type FormInstance,type FormItemRule } from 'element-plus'
+  import type { ProTableInstance } from '@/components/ProTable/interface'
+  import { ref,computed, Ref  } from 'vue'
+  import { type Role } from '@/api/role/interface'
   import {dialogSmall} from '@/utils/elementBind'
   import { useDictStore } from '@/stores/modules/dict'
-  import {
-    addRole,
-    editRole,
-  } from '@/api/role/role'
+  import {addRole,editRole,} from '@/api/role/role'
 
   const dictStore = useDictStore()
+ // 定义弹出组件元信息
+ const dialogFormRef = ref()
 
-  const {dialogVisible,title,data,openType,getTableList}  = defineProps<{
-    dialogVisible:boolean;
-    title:string;
-    openType:string;
-    getTableList:Function;
-    data:{
-      id?: string;     //角色类型ID
-      name: string;   //角色类型名称
-      code: string;   //角色代码
-      type: number;
-      remark:string;   //角色描述
+ function useMetaInfo() {
+    const dialogVisible = ref(false)
+    const titleType = ref('add')
+    const formContent = ref<Role.RoleBO>({
+      id: '',    //角色类型ID
+      name: '',   //角色类型名称
+      code: '',  //角色代码
+      type: 2, //角色类型
+      remark:'',  //角色描述
+      state:1,
+    })
+    return { dialogVisible, titleType, formContent }
+  }
+  
+  const { dialogVisible, titleType, formContent } = useMetaInfo()
+
+
+// 清空formContent
+const resetFormContent = () => {
+    formContent.value = {
+      id: '',    //角色类型ID
+      name: '',   //角色类型名称
+      code: '',  //角色代码
+      type: 2, //角色类型
+      remark:'',  //角色描述
+      state:1,
     }
-  }>();
+  }
+  
+  let dialogTitle = computed(() => {
+    return titleType.value === 'add' ? '新增角色' : '编辑角色'
+  })
+
+
 
 
   //定义规则
@@ -80,59 +88,61 @@
     code: [{ required: true, message: '编码必填！', trigger: 'blur' }],
   })
 
-  const emit = defineEmits<{
-  (e:'update:visible',value:boolean):void;
-  }>();
-
-  const handleCancel = () => {
-    emit('update:visible',false)
+  
+// 关闭弹窗
+const close = () => {
+    dialogVisible.value = false
+    // 清空dialogForm中的值
+    resetFormContent()
+    // 重置表单
+    dialogFormRef.value?.resetFields()
   }
   
-  const handleOK = () => {
-
-    ElMessage.info('角色数据提交')
+  // 保存数据
+  const save = () => {
     try {
-      formRuleRef.value?.validate((valid: boolean) => {
-      if (valid) {
-        // 将表单数据转为json,发送到后端
-        // let confirmFormData = JSON.parse(JSON.stringify(form.value))
-        // console.log(confirmFormData)
-        if(openType === "add")
-        {
-          addRole(data).then(res => {
-            // if(res.code === "200")
-            // {
-              ElMessage.success(res.message)
-              getTableList()
-            // }
-            // else
-            //   ElMessage.error(res.message)
-          })
+        dialogFormRef.value?.validate(async (valid: boolean) => {
+        if (valid) {
+          if (formContent.value.id) {
+                const result = await editRole(formContent.value);
+                if(result.code != 'A0000'){
+                  ElMessage.error({ message: result.message})
+                }else{
+                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                }
+            } else {
+                const result = await addRole(formContent.value);
+               if(result.code != 'A0000'){
+                  ElMessage.error({ message: result.message})
+                }else{
+                  ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                }
+          }
+          close()
+          // 刷新表格
+          await props.refreshTable!()
         }
-          
-        if(openType === "edit")
-        {
-          editRole(data).then(res => {
-            // if(res.code === "200")
-            // {
-              ElMessage.success(res.message)
-              getTableList()
-            // }
-            // else
-            //   ElMessage.error(res.message)
-          })
-        }
-        
-        emit('update:visible',false)
-      } else {
-        ElMessage.error('表单验证失败！')
-        
-      }
-
-    })
-  } catch (error) {
-    console.error('验证过程中发生错误', error)
+      })
+    } catch (err) {
+      console.error('验证过程中出现错误', err)
+    }
   }
-}
+  
+  // 打开弹窗，可能是新增，也可能是编辑
+  const open = async (sign: string, data: Role.RoleBO) => {
+    titleType.value = sign
+    dialogVisible.value = true
+    if (data.id) {
+      formContent.value = { ...data }
+    } else {
+      resetFormContent()
+    }
+  }
+  
+  // 对外映射
+  defineExpose({ open })
+  const props = defineProps<{
+    refreshTable: (() => Promise<void>) | undefined;
+  }>()
   
   </script>

frontend/src/views/authority/role/index.vue

@@ -4,14 +4,12 @@
       ref='proTable'
       :columns='columns'
       :request-api="getTableList"
-      :data-callback="dataCallback"
     >
       <!-- :requestApi="getRoleList" -->
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
         <el-button type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
-        <el-button type='primary' :icon='Download' plain>导出数据</el-button>
-        <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+                <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           批量删除
         </el-button>
@@ -25,41 +23,20 @@
 
     </ProTable>
   </div>
-  <rolePopup
-    :dialogVisible=rolePopupVisible
-    :title=rolePopupTitle
-    :data=rolePopupData
-    :openType=openType
-    :getTableList="proTable?.getTableList || (() => {})"
-    @update:visible='rolePopupVisible = $event'
-  />
-  <!-- :proTable="proTable || {} as ProTableInstance" -->
-  <permissionUnit
-    :dialogVisible=permissionUnitVisible
-    :title=permissionUnitTitle
-    :data=permissionUnitData
-    @update:visible='permissionUnitVisible = $event'
-  />
+  <RolePopup :refresh-table='proTable?.getTableList' ref='rolePopup' />
+
 </template>
 
 <script setup lang='tsx' name='useRole'>
-import { Role } from '@/api/role/interface'
+import { type Role } from '@/api/role/interface'
 import { useHandleData } from '@/hooks/useHandleData'
-import { useDownload } from '@/hooks/useDownload'
-import { useAuthButtons } from '@/hooks/useAuthButtons'
 import ProTable from '@/components/ProTable/index.vue'
-import rolePopup from './components/rolePopup.vue'
-import permissionUnit from './components/permissionUnit.vue'
-import ImportExcel from '@/components/ImportExcel/index.vue'
-import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
-
+import type{  ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
 import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
 import { useDictStore } from '@/stores/modules/dict'
-import {
-  getRoleList,
-  deleteRole,
-} from '@/api/role/role'
-import { deleteUser } from '@/api/user/user'
+import {getRoleList,deleteRole} from '@/api/role/role'
+import RolePopup from './components/rolePopup.vue'
+import { reactive, ref } from 'vue'
 
 
 const { rolePopupVisible, permissionUnitVisible, rolePopupTitle, permissionUnitTitle, rolePopupData, permissionUnitData } = useCount()
@@ -77,24 +54,11 @@ function useCount() {
 
 const dictStore = useDictStore()
 let openType = ''
-
+const rolePopup = ref()
 
 // ProTable 实例
 const proTable = ref<ProTableInstance>()
 
-
-
-// dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
-// 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
-const dataCallback = (data: any) => {
-  return {
-    records: data.list,
-    total: data.total,
-    current: data.pageNum,
-    size: data.pageSize,
-  }
-}
-
 // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
 // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
 const getTableList = (params: any) => {
@@ -105,9 +69,6 @@ const getTableList = (params: any) => {
   return getRoleList(newParams)
 }
 
-// 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
-const { BUTTONS } = useAuthButtons()
-
 // 表格配置项
 const columns = reactive<ColumnProps<Role.RoleBO>[]>([
   { type: 'selection', fixed: 'left', width: 70 },
@@ -124,19 +85,16 @@ const columns = reactive<ColumnProps<Role.RoleBO>[]>([
     search: { el: 'input' },
     minWidth: 180,
   },
-  {
-    prop: 'type',
-    label: '类型',
-    enum: dictStore.getDictData('roleType'),
-    fieldNames: { label: 'label', value: 'code' },
-    search: { el: 'select' },
-    minWidth: 180,
-  },
   {
     prop: 'remark',
     label: '描述',
     minWidth: 380,
   },
+  {
+    prop: 'state',
+    label: '状态',
+    minWidth: 100,
+  },
   { prop: 'operation', label: '操作', fixed: 'right', width: 330 },
 ])
 
@@ -156,74 +114,10 @@ const batchDelete = async (id: string[]) => {
   proTable.value?.getTableList()
 }
 
-// 切换角色状态
-const changeStatus = async (row: Role.RoleBO) => {
-  // await useHandleData(changeRoleStatus, {
-  //   id: row.id,
-  //   status: row.status == 1 ? 0 : 1,
-  // }, `切换【${row.rolename}】角色状态`)
-  // proTable.value?.getTableList()
-}
-
-// 导出角色列表
-//const downloadFile = async () => {
-// ElMessageBox.confirm('确认导出角色数据?', '温馨提示', { dictType: 'warning' }).then(() =>
-//   useDownload(exportRoleInfo, '角色列表', proTable.value?.searchParam),
-// )
-//}
-
-// 批量添加角色
-const dialogRef = ref<InstanceType<typeof ImportExcel> | null>(null)
-const batchAdd = () => {
-  // const params = {
-  //   title: '角色',
-  //   tempApi: exportRoleInfo,
-  //   importApi: BatchAddRole,
-  //   getTableList: proTable.value?.getTableList,
-  // }
-  // dialogRef.value?.acceptParams(params)
-}
 
 // 打开 drawer(新增、查看、编辑)
-const openDrawer = (title: string, row: Partial<Role.RoleBO> = {}) => {
-  if (title === '新增角色' || title === '编辑角色') {
-    if (title === '新增角色')
-      openType = 'add'
-    else if (title === '编辑角色')
-      openType = 'edit'
-   
-    rolePopupVisible.value = true
-    rolePopupTitle.value = title
-
-    const safeRow: Role.RoleBO = {
-      id: row.id || '',
-      name: row.name || '',
-      code: row.code || '',
-      type: row.type || 0,
-      remark: row.remark || '',
-    }
-
-    rolePopupData.value = safeRow
-    
-  } else if (title === '设置权限') {
-    permissionUnitVisible.value = true
-    permissionUnitTitle.value = title
-
-    const safeRow: Role.RoleBO = {
-      id: row.id || '',
-      name: row.name || '',
-      code: row.code || '',
-      type: row.type || 0,
-      remark: row.remark || '',
-    }
-
-    permissionUnitData.value = safeRow
-
-    // if (row.permissionList)
-    // {
-    //   permissionUnitData.value = row.permissionList;
-    // }
-  }
+const openDrawer = (titleType: string, row: Partial<Role.RoleBO> = {}) => {
+  rolePopup.value?.open(titleType, row)
 }
 </script>