合并问题

src/views/permissions/permission.vue

@@ -487,6 +487,7 @@ const permissionEdit = async function () {
         remark: permissionEditObj.value.remark//备注
       }
     });
+    console.log('编辑最后提交数据', permissionEditObj.value);
     if (result.code == 200) {
       await ElMessageBox.alert(
         `用户${userName}的权限角色已更改为【${newRole}】`,
@@ -500,8 +501,6 @@ const permissionEdit = async function () {
     }else{
       ElMessage.error(result.msg)
     }
-    console.log('编辑最后提交数据', permissionEditObj.value);
-
 
   } catch (error) {
     console.log('编辑用户权限失败', error)
@@ -604,47 +603,9 @@ const editStatus = async function (row) {
     get()
   } catch (error) {
     console.log('修改用户权限失败', error)
-    // 在这里可以处理错误逻辑，比如显示错误提示等
-  }
-}
-
-// 重置密码弹窗状态
-const resetConfirmVisible = ref(false)
-// 当前选中的行数据
-const currentRow = ref(null)
-
-// 确认重置密码
-const confirmResetPassword = async function () {
-  const params = {
-    account: currentRow.value.account,
-  }
-  console.log(params)
-  // 发送请求
-  try {
-    const result = await request({
-      url: '/admin/reset',
-      method: 'post',
-      data: params // 直接传递params对象
-    })
-    if (result.code === 200) { // 使用严格相等运算符
-      ElMessage.success('重置密码成功')
-      resetConfirmVisible.value = false // 关闭弹窗
-    } else {
-      ElMessage.error(result.message || '重置密码失败')
-    }
-  } catch (error) {
-    ElMessage.error('重置密码失败')
-    console.error('请求错误:', error)
   }
 }
 
-// 取消重置密码
-const cancelResetPassword = function () {
-  resetConfirmVisible.value = false
-}
-
-
-
 // 挂载
 onMounted(async function () {
   await get()
@@ -934,29 +895,27 @@ const resetPassword = async function (row) {
       <!-- 居中显示 -->
 
       <el-form ref="Ref" :model="addAdmin" label-width="auto" style="max-width: 600px; align-items: center">
-        <el-form-item prop="account" label="OA号:" required>
+        <el-form-item prop="account" label="OA号:" required clearable>
           <el-input v-model="addAdmin.account" placeholder="请输入OA号" style="width: 220px" />
         </el-form-item>
 
-        <el-form-item prop="name" label="用户名:" required>
+        <el-form-item prop="name" label="用户名:" required clearable>
           <el-input v-model="addAdmin.name" placeholder="请输入用户名" style="width: 220px" />
         </el-form-item>
 
-        <el-form-item prop="market" label="所属地区:" required>
-          <el-select v-model="addAdmin.market" placeholder="请选择所属地区" style="width: 220px"
-            @change="() => Ref.value.validateField('market')">
-            <el-option v-for="item in market" :key="item" :label="item" :value="item" />
+        <el-form-item prop="market" label="所属地区:" required clearable>
+          <el-select multiple v-model="addAdmin.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="permission" label="权限类别:" required>
-          <el-select v-model="addAdmin.permission" placeholder="请选择权限" style="width: 220px"
-            @change="() => Ref.value.validateField('permission')">
+        <el-form-item prop="permission" label="角色名称:" required>
+          <el-select v-model="addAdmin.permission" placeholder="请选择角色名称" style="width: 220px" clearable>
             <el-option v-for="item in permissionList" :key="item.value" :label="item.label"
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="postiton" label="职位:" required>
-          <el-input v-model="addAdmin.postiton" placeholder="请输入职称" style="width: 220px" />
+          <el-input v-model="addAdmin.postiton" placeholder="请输入职位" style="width: 220px" clearable />
         </el-form-item>
         <el-form-item prop="machineIds" label="机器码:" required>
           <div style="display: flex; align-items: center; flex-wrap: wrap; gap: 10px;">
@@ -1083,7 +1042,6 @@ const resetPassword = async function (row) {
   </el-dialog>
 </template>
 
-
 <style scoped>
 .pagination {
   display: flex;
@@ -1105,7 +1063,6 @@ const resetPassword = async function (row) {
   margin-left: auto;
 }
 
-/* ceshi */
 /* 新增样式让弹窗内容居中 */
 .el-dialog__body {
   display: flex;