Merge branch 'refs/heads/lihui/feature-20250728114233-金币前端三期' into milestone-20250728-金币前端三期

src/views/permissions/rolePermission.vue

@@ -191,20 +191,11 @@ const getStore = async function () {
 const openPermissionAddVisible = function () {
 
   permissionAddVisible.value = true
-  Ref.value.resetFields();
-
   getRoles()
   getLists()
 }
 
 const closePermissionAddVisible = function () {
-  addRole.value = {
-    roleName: '',
-    parentId: null,
-    checkedKeys: [],
-    grade: '',
-    market: ''
-  }
   permissionAddVisible.value = false
   Ref.value.resetFields();
   getRoleList()
@@ -214,7 +205,10 @@ const closePermissionAddVisible = function () {
 const permissionAddInit = function () {
   openPermissionAddVisible()
 }
-
+const handleDialogClose = function(){
+  closePermissionAddVisible()
+  console.log('hhh');
+}
 // 表单验证ref
 const Ref = ref(null)
 
@@ -392,6 +386,7 @@ const filterGoldenBeanMenus = (tree) => {
 };
 
 
+
 const treeRef = ref(null)
 // 处理编辑角色权限时的勾选事件
 const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
@@ -759,7 +754,7 @@ onMounted(async function () {
   </el-dialog>
 
   <!-- 新增角色 -->
-  <el-dialog v-model="permissionAddVisible" title="新增角色" width="800px" :close-on-click-modal="false">
+  <el-dialog v-model="permissionAddVisible" title="新增角色" width="800px" :close-on-click-modal="false" @close="handleDialogClose ">
     <template #footer>
       <el-form ref="Ref" :rules="Rolerules" :model="addRole" label-width="auto"
                style="max-width: 600px; align-items: center">

src/views/permissions/userPermission.vue

@@ -8,7 +8,10 @@ import API from '@/util/http'
 // 表格数据
 const tableData = ref([])
 const total = ref(100)
-
+const handleDialogClose = function(){
+  closeUserAddVisible()
+  console.log('hhh');
+}
 const propsAdduser = {
   multiple: true, // 多选
 }
@@ -246,30 +249,10 @@ const getStore = async function () {
 // 打开新增用户权限弹窗
 const openUserAddVisible = function () {
   userAddVisible.value = true
-  addAdmin.value = {
-    account: '',
-    name: '',
-    market: '',
-    permission: '',
-    postiton: '',
-    machineId: '',
-    machineIds: [''],
-    remark: ''
-  };
 
 }
 // 关闭新增用户权限弹窗，并刷新表单
 const closeUserAddVisible = function () {
-  addAdmin.value = {
-    account: '',
-    name: '',
-    market: '',
-    permission: '',
-    postiton: '',
-    machineId: '',
-    machineIds: [''],
-    remark: ''
-  };
   userAddVisible.value = false;
   // 清除表单验证状态
   Ref.value.resetFields();
@@ -1009,7 +992,7 @@ onMounted(async function () {
   </div>
 
   <!-- 新增用户权限 -->
-  <el-dialog v-model="userAddVisible" title="新增用户权限" width="800px" :close-on-click-modal="false">
+  <el-dialog v-model="userAddVisible" title="新增用户权限" width="800px" :close-on-click-modal="false"  @close="handleDialogClose">
     <template #footer>
       <!-- 居中显示 -->