用户管理

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>