From 1be2be64e28a2879cc0f64e3143879cdd4836529 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 14 Aug 2025 16:50:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(permissions):=20=E9=87=8D=E5=A4=8D=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/rolePermission.vue | 19 +++++++------------
 src/views/permissions/userPermission.vue | 27 +++++----------------------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/src/views/permissions/rolePermission.vue b/src/views/permissions/rolePermission.vue
index b2204ed..c39ffc3 100644
--- a/src/views/permissions/rolePermission.vue
+++ b/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">
@@ -774,7 +769,7 @@ onMounted(async function () {
           </el-select>
         </el-form-item>
         <el-form-item prop="market" label="所属地区:" required>
-          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 220px" clearable  >
+          <el-select v-model="addRole.market" placeholder="请选择所属地区" style="width: 220px" clearable >
             <el-option v-for="item in addRoleMarket" :key="item" :label="item" :value="item"/>
           </el-select>
         </el-form-item>
diff --git a/src/views/permissions/userPermission.vue b/src/views/permissions/userPermission.vue
index 3551991..82fe215 100644
--- a/src/views/permissions/userPermission.vue
+++ b/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>
       <!-- 居中显示 -->