merge success

src/views/permissions/permission.vue

@@ -288,16 +288,11 @@ const permissionAddInit = function () {
 }
 //新增用户
 const permissionAdd = async function () {
-  try {
-    await new Promise((resolve, reject) => {
-      Ref.value.validate((valid) => {
+  Ref.value.validate(async (valid) => {
+    console.log('addRole', addRole.value)
+    console.log('valid', valid)
     if (valid) {
-          resolve(); // 验证通过，继续执行后续代码
-        } else {
-          reject(new Error('请检查并完善表单信息')); // 验证失败，抛出错误
-        }
-      });
-    });
+      try {
         addAdmin.value.adminFlag = 1
         addAdmin.value.status1 = 1
         if (addAdmin.value.postiton == '管理员') {
@@ -332,41 +327,16 @@ const permissionAdd = async function () {
         console.log('新增用户权限失败', error)
 
         ElMessage.error('新增用户权限失败')
+        closeUserAddVisible()
       }
-}
-const addUserRules = {
-  account: [
-    { required: true, message: '请输入OA号', trigger: 'blur' }
-  ],
-  name: [
-    { required: true, message: '请输入用户名', trigger: 'blur' }
-  ],
-  market: [
-    { required: true, message: '请选择所属地区', trigger: 'change' }
-  ],
-  permission: [
-    { required: true, message: '请选择角色名称', trigger: 'change' }
-  ],
-  postiton: [
-    { required: true, message: '请输入职位', trigger: 'blur' }
-  ],
-  machineIds: [
-    {
-      required: true,
-      message: '请至少输入一个机器码',
-      trigger: 'change',
-      validator: (rule, value, callback) => {
-        // 检查是否有非空的机器码
-        const hasValid = value.some(item => item.trim() !== '');
-        if (!hasValid) {
-          callback(new Error('请至少输入一个机器码'));
     } else {
-          callback();
-        }
-      }
+      ElMessage({
+        type: 'error',
+        message: '请检查输入内容'
+      })
     }
-  ]
-};
+  })
+}
 // 表单验证ref
 const Ref = ref(null)
 // 使用 _.throttle 并设置 trailing 为 false 实现严格节流，只执行一次
@@ -778,22 +748,17 @@ const EdithandleMarketChange = (values) => {
     // 如果选择了总部，只保留总部
     permissionEditObj.value.market = ['总部'];
   }
-<<<<<<< HEAD
-  console.log('看看现在的地区', permissionEditObj.value.market);
-=======
   console.log('看看现在的地区',permissionEditObj.value.market);
   
 };
-const handleCheckChange = (checkedNodes, { checkedKeys }) => {
-  addRole.value.checkedKeys = checkedKeys;
-}
+// const handleCheckChange = (checkedNodes, { checkedKeys }) => {
+//   addRole.value.checkedKeys = checkedKeys;
+// }
 // 处理编辑角色权限时的勾选事件
 const handleEditRolePermissionCheck = (checkedNodes, { checkedKeys }) => {
   permissionEditRoleObj.value.checkedKeys = checkedKeys;
 };
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 
-};
 const handleCheckChange = async (checkedNodes, checkedInfo) => {
   const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo;
 
@@ -921,12 +886,10 @@ const confirmResetPassword = async function () {
   }
 }
 
-<<<<<<< HEAD
 // 取消重置密码
 const cancelResetPassword = function () {
   resetConfirmVisible.value = false
 }
-=======
 
 // 编辑角色对象
 const permissionEditRoleObj = ref({
@@ -1014,7 +977,6 @@ onMounted(async function () {
   await getAdminData()
 })
 
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 const Rolerules = reactive({
   roleName: [
     { required: true, message: '请输入角色名称', trigger: 'blur' },
@@ -1258,8 +1220,7 @@ onMounted(async function () {
     <template #footer>
       <!-- 居中显示 -->
 
-      <el-form ref="Ref" :rules="addUserRules" :model="addAdmin" label-width="auto"
-        style="max-width: 600px; align-items: center">
+      <el-form ref="Ref" :model="addAdmin" label-width="auto" style="max-width: 600px; align-items: center">
         <el-form-item prop="account" label="OA号:" required clearable>
           <el-input v-model="addAdmin.account" placeholder="请输入OA号" style="width: 220px" />
         </el-form-item>
@@ -1412,7 +1373,6 @@ onMounted(async function () {
       </div>
     </template>
   </el-dialog>
-<<<<<<< HEAD
   <!-- 重置密码确认弹窗 -->
   <el-dialog v-model="resetConfirmVisible" width="500px" :close-on-click-modal="false"
     :before-close="cancelResetPassword">
@@ -1436,7 +1396,6 @@ onMounted(async function () {
     </template>
   </el-dialog>
 
-=======
 
   <!-- 編輯角色彈窗 -->
    <el-dialog v-model="permissionEditRoleVisible" title="编辑角色" width="800px" :close-on-click-modal="false">
@@ -1481,7 +1440,6 @@ onMounted(async function () {
       </div>
     </template>
   </el-dialog>
->>>>>>> zhangrenyuan/feature-20250714163943-金币前端二期
 </template>
 
 <style scoped>