From 35d4b2e02fd1533fbbaa9c3d108a1c2e433e0549 Mon Sep 17 00:00:00 2001
From: zhangyongQINGHU <15371817+zhangyongqinghu@user.noreply.gitee.com>
Date: Fri, 18 Jul 2025 19:18:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/permissions/permission.vue | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/views/permissions/permission.vue b/src/views/permissions/permission.vue
index ba6e50f..b57ed3d 100644
--- a/src/views/permissions/permission.vue
+++ b/src/views/permissions/permission.vue
@@ -236,7 +236,7 @@ const permissionAddInit = function () {
   permissionAddObj.value = {}
   openPermissionAddVisible()
 }
-
+//新增用户
 const permissionAdd = async function () {
   Ref.value.validate(async (valid) => {
     console.log('addRole', addRole.value)
@@ -327,8 +327,11 @@ const permissionEditInit = function (row) {
   permissionEditObj.value.name = row.name
   permissionEditObj.value.market = row.market
   permissionEditObj.value.postiton = row.postiton
+
+
   permissionEditObj.value.permission = row.permission
   permissionEditObj.value.roleId = row.roleId
+  permissionEditObj.value.roleName = row.roleName
   console.log('编辑用户权限', permissionEditObj.value)
   openUserEditVisible()
 }
@@ -721,9 +724,20 @@ const handleCheckChange = (checkedNodes, { checkedKeys }) => {
   <!-- 这是编辑用户权限弹窗 -->
   <el-dialog v-model="userEditVisible" title="编辑用户权限" width="800px" :close-on-click-modal="false">
     <el-form ref="Ref" :model="permissionEditObj" label-width="auto" style="max-width: 600px; align-items: center">
+       <el-form-item prop="account" label="用户账号:" required clearable>
+          <el-input v-model="permissionEditObj.account" placeholder="请输入OA号" style="width: 220px"  disabled  />
+        </el-form-item>
       <el-form-item prop="name" label="用户名称:" required>
-        <el-input v-model="permissionEditObj.userName" placeholder="请输入用户名" style="width: 220px" />
+        <el-input v-model="permissionEditObj.name" placeholder="请输入用户名" style="width: 220px"  disabled  />
       </el-form-item>
+      <el-form-item prop="market" label="所属地区:" required clearable>
+          <el-select multiple v-model="permissionEditObj.market" placeholder="请选择所属地区" style="width: 440px" clearable>
+            <el-option v-for="item in market" :key="item" :label="item" :value="item" :disabled="includeHq(item)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="postiton" label="职位:" required>
+          <el-input v-model="permissionEditObj.postiton" placeholder="请输入职位" style="width: 220px" clearable />
+        </el-form-item>
       <el-form-item prop="roleName" label="角色名称:" required>
         <el-input v-model="permissionEditObj.roleName" placeholder="请输入用户名" style="width: 220px" />
       </el-form-item>