From d6a2bf972964244e607904125557081f3aa1f021 Mon Sep 17 00:00:00 2001
From: ggb <1223416496@qq.com>
Date: Fri, 9 Jun 2023 23:55:26 +0800
Subject: [PATCH] Modify form validation in Add Transactions and Personal
 Profiles

---
 .../affairs/ApplicantsAddAffairs.vue          | 118 +++++++++---------
 ui/src/pages/profile/PersonalProfile.vue      |  20 +--
 2 files changed, 70 insertions(+), 68 deletions(-)

diff --git a/ui/src/components/affairs/ApplicantsAddAffairs.vue b/ui/src/components/affairs/ApplicantsAddAffairs.vue
index 663b8ff..1befc7b 100644
--- a/ui/src/components/affairs/ApplicantsAddAffairs.vue
+++ b/ui/src/components/affairs/ApplicantsAddAffairs.vue
@@ -1,6 +1,6 @@
 <template>
-    <el-form :model="form" label-width="120px">
-        <el-form-item label="事务标题:">
+    <el-form :model="form" :rules="rules" ref="formRules" label-width="120px">
+        <el-form-item label="事务标题:" prop="title">
             <el-col :span="4">
                 <el-input
                     v-model.trim="form.title"
@@ -10,7 +10,7 @@
             </el-col>
         </el-form-item>
 
-        <el-form-item label="申请者:" v-if="grant">
+        <el-form-item label="申请者:" v-if="grant" prop="applicantId">
             <el-col :span="4">
                 <el-input
                     v-model="form.applicantId"
@@ -21,7 +21,7 @@
             </el-col>
         </el-form-item>
 
-        <el-form-item label="申请者:" v-if="!grant">
+        <el-form-item label="申请者:" v-if="!grant" prop="applicantId">
             <el-col :span="4">
                 <el-select
                     v-model="form.applicantId"
@@ -40,7 +40,7 @@
             </el-col>
         </el-form-item>
 
-        <el-form-item label="审批者:">
+        <el-form-item label="审批者:" prop="inspectorId">
             <el-col :span="4">
                 <el-select
                     v-model="form.inspectorId"
@@ -59,7 +59,7 @@
             </el-col>
         </el-form-item>
 
-        <el-form-item label="事务类型:">
+        <el-form-item label="事务类型:" prop="typeId">
             <el-col :span="8">
                 <el-radio-group v-model="form.typeId">
                     <el-radio label="1" name="type1">事假</el-radio>
@@ -70,7 +70,7 @@
             </el-col>
         </el-form-item>
 
-        <el-form-item v-model="form.createTime" label="创建时间:">
+        <el-form-item v-model="form.createTime" label="创建时间:" prop="createTime">
             <el-col :span="5">
                 <el-date-picker
                     v-model="form.createTime"
@@ -81,7 +81,7 @@
             </el-col>
         </el-form-item>
 
-        <el-form-item label="具体内容:">
+        <el-form-item label="具体内容:" prop="content">
             <el-input
                 v-model.trim="form.content"
                 type="textarea"
@@ -103,7 +103,6 @@
 import 'element-plus/theme-chalk/index.css'
 import request from '@/services/index.js'
 import _ from 'lodash'
-import { ElMessage } from 'element-plus'
 
 export default {
     data() {
@@ -131,6 +130,38 @@ export default {
                 username: '',
                 department_id: ''
             },
+            rules: {
+                title: [
+                    {
+                        required: true,
+                        message: '错误！事务标题不能为空！'
+                    }
+                ],
+                content: [
+                    {
+                        required: true,
+                        message: '错误！事务内容不能为空！'
+                    }
+                ],
+                typeId: [
+                    {
+                        required: true,
+                        message: '错误！请选择事务类型!'
+                    }
+                ],
+                applicantId: [
+                    {
+                        required: true,
+                        message: '错误！请输入申请者id!'
+                    }
+                ],
+                inspectorId: [
+                    {
+                        required: true,
+                        message: '错误！请选择审批者!'
+                    }
+                ]
+            },
             sameDepartmentUsers: [],
             grant: true,
             formView: false
@@ -140,58 +171,25 @@ export default {
         onSubmit: function (form) {
             this.form.applicantId = this.currentUser.id
             console.log(form)
-            if (
-                !_.isEmpty(form.title) &&
-                !_.isEmpty(form.content) &&
-                !_.isEmpty(form.typeId) &&
-                !_.isEmpty(form.applicantId) &&
-                !_.isEmpty(form.inspectorId)
-            ) {
-                request
-                    .post('/affair/add', form)
-                    .then((response) => {
-                        console.log(response.data)
-                        this.getPersonalAffair()
-                        this.resetForm()
-                    })
-                    .catch((reportError) => {
-                        this.resetForm()
-                        console.log(reportError)
-                    })
-                this.getPersonalAffair()
-                this.$router.go(-1)
-            } else {
-                if (_.isEmpty(form.title)) {
-                    ElMessage({
-                        message: '错误！事务标题不能为空！',
-                        type: 'error'
-                    })
+            this.$refs.formRules.validate((value) => {
+                if (value) {
+                    request
+                        .post('/affair/add', form)
+                        .then((response) => {
+                            console.log(response.data)
+                            this.getPersonalAffair()
+                            this.resetForm()
+                        })
+                        .catch((reportError) => {
+                            this.resetForm()
+                            console.log(reportError)
+                        })
+                    this.getPersonalAffair()
+                    this.$router.go(-1)
+                } else {
+                    console.log('fault!')
                 }
-                if (_.isEmpty(form.content)) {
-                    ElMessage({
-                        message: '错误！事务内容不能为空!',
-                        type: 'error'
-                    })
-                }
-                if (_.isEmpty(form.typeId)) {
-                    ElMessage({
-                        message: '错误！请选择事务类型!',
-                        type: 'error'
-                    })
-                }
-                if (_.isEmpty(form.applicantId)) {
-                    ElMessage({
-                        message: '错误！请输入申请者id!',
-                        type: 'error'
-                    })
-                }
-                if (_.isEmpty(form.inspectorId)) {
-                    ElMessage({
-                        message: '错误！请选择审批者!',
-                        type: 'error'
-                    })
-                }
-            }
+            })
         }, // 表单提交及验证
         resetForm() {
             this.$nextTick(() => {
diff --git a/ui/src/pages/profile/PersonalProfile.vue b/ui/src/pages/profile/PersonalProfile.vue
index a66974e..db04e91 100644
--- a/ui/src/pages/profile/PersonalProfile.vue
+++ b/ui/src/pages/profile/PersonalProfile.vue
@@ -241,19 +241,23 @@ export default {
         },
         checkEmail(rule, value, callback) {
             const mailReg = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/
-            if (mailReg.test(value)) {
-                callback()
-            } else {
-                return callback(new Error('邮箱格式错误！'))
+            if (value != null) {
+                if (mailReg.test(value)) {
+                    callback()
+                } else {
+                    return callback(new Error('邮箱格式错误！'))
+                }
             }
         },
         checkTel(rule, value, callback) {
             const telReg =
                 /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/
-            if (telReg.test(value)) {
-                callback()
-            } else {
-                return callback(new Error('手机号格式错误！'))
+            if (value != null) {
+                if (telReg.test(value)) {
+                    callback()
+                } else {
+                    return callback(new Error('手机号格式错误！'))
+                }
             }
         }
     },