账户管理接口

src/views/system/user.vue

@@ -234,10 +234,12 @@ const formModel = ref({
     deptList: [{isLader: 0}], status: 1
 })
 const formRules = {
+    account: [{required: true, message: '请输入登录账号', trigger: 'blur'}],
+    password: [{required: true, message: '请输入密码', trigger: 'blur'}],
+    password1: [{required: true, message: '请输入确认密码', trigger: 'blur'}],
     deptId: [{required: true, message: '请选择选择部门', trigger: 'change'}],
     postId: [{required: true, message: '请选择选择岗位', trigger: 'change'}],
     isLader: [{required: true, message: '请选择是否为部门负责人', trigger: 'change'}],
-    account: [{required: true, message: '请输入登录账号', trigger: 'blur'}],
     oneMoney: [{required: true, message: '请输入日单价', trigger: 'blur'}],
     status: [{required: true, message: '请选择启用状态', trigger: 'change'}],
     phone: {
@@ -253,28 +255,6 @@ const formRules = {
         },
         trigger: "blur"
     },
-    password: {
-        required: true,
-        validator: (rule, value, callback) => {
-            if (!value) {
-                callback(new Error('请输入新密码'))
-            } else {
-                callback()
-            }
-        },
-        trigger: "blur"
-    },
-    password1: {
-        required: true,
-        validator: (rule, value, callback) => {
-            if (!value) {
-                callback(new Error('请确认新密码'))
-            } else {
-                callback()
-            }
-        },
-        trigger: "blur"
-    },
 }
 
 //添加用户
@@ -375,6 +355,19 @@ const formModalSave = async () => {
             return
         }
     }
+    //判断密码是否一致
+    if (form.password && !form.password1) {
+        window.$message?.error('请输入确认密码')
+        return
+    }
+    if (!form.password && form.password1) {
+        window.$message?.error('请输入登录密码')
+        return
+    }
+    if ((form.password && form.password1) && (form.password !== form.password1)) {
+        window.$message?.error('密码不一致')
+        return
+    }
     //发起请求
     if (form.id) {
         formUpdateApi(form).then()