From 0af43b7bd18bdac3f44498ae322214bcb1ed3bef Mon Sep 17 00:00:00 2001
From: Romesum <zhiyuewu@foxmail.com>
Date: Sat, 9 May 2020 15:14:04 +0800
Subject: [PATCH] =?UTF-8?q?[feat][V]=EF=BC=9A=E5=8A=A0=E5=85=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E9=AA=8C=E8=AF=81=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/supManager/userEditForm.vue    | 107 +++++++++++-------
 1 file changed, 63 insertions(+), 44 deletions(-)

diff --git a/element-vue/src/components/supManager/userEditForm.vue b/element-vue/src/components/supManager/userEditForm.vue
index 4bb3077..64a02ed 100644
--- a/element-vue/src/components/supManager/userEditForm.vue
+++ b/element-vue/src/components/supManager/userEditForm.vue
@@ -2,29 +2,39 @@
     <!--        弹出层-->
     <el-dialog :title="edit ? '编辑用户' : '新增用户'" :visible.sync="dialogVisible" width="40rem" @close="cancel"
                style="text-align: left" :close-on-click-modal="false">
-        <el-form :model="userForm">
-            <el-form-item label="职位" label-width="80px">
+        <el-form :model="userForm" ref="userForm">
+            <el-form-item prop="position" label="职位" label-width="80px"
+                          :rules="[{ required: true, message: '请选择职位', trigger: 'blur' }]">
                 <el-select v-model="userForm.position" placeholder="请选择职位">
                     <el-option label="教师" :value="1"></el-option>
                     <el-option label="实验室管理员" :value="2"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="工号" label-width="80px">
-                <el-input v-model="userForm.username" autocomplete="off" :disabled="edit"></el-input>
+            <el-form-item prop="username" label="工号" label-width="80px"
+                          :rules="[{ required: true, message: '请输入工号', trigger: 'blur' }]">
+                <el-input v-model="userForm.username" autocomplete="off" :disabled="edit">
+                </el-input>
             </el-form-item>
-            <el-form-item label="密码" label-width="80px" v-if="!edit">
-                <el-input v-model="password" type="password" autocomplete="off" :disabled="edit"></el-input>
+            <el-form-item prop="password" label="密码" label-width="80px" v-if="!edit"
+                          :rules="[{ required: true, message: '请输入密码', trigger: 'blur' }]"
+            >
+                <el-input v-model="userForm.password" type="userForm.password" autocomplete="off" :disabled="edit"></el-input>
             </el-form-item>
-            <el-form-item label="姓名" label-width="80px">
+            <el-form-item prop="nickname" label="姓名" label-width="80px"
+                          :rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
                 <el-input v-model="userForm.nickname" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="联系电话" label-width="80px">
+            <el-form-item prop="tel" label="联系电话" label-width="80px"
+                          :rules="[{ required: true, message: '请输入联系电话', trigger: 'blur' }]">
                 <el-input v-model="userForm.tel" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="办公室" label-width="80px">
+            <el-form-item prop="office" label="办公室" label-width="80px"
+                          :rules="[{ required: true, message: '请输入办公室', trigger: 'blur' }]">
                 <el-input v-model="userForm.office" autocomplete="off"></el-input>
             </el-form-item>
-            <el-form-item label="邮箱" label-width="80px">
+            <el-form-item prop="email" label="邮箱" label-width="80px"
+                          :rules="[{ required: true, message: '请输入邮箱地址', trigger: 'blur' },
+                          { type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }]">
                 <el-input v-model="userForm.email" autocomplete="off"></el-input>
             </el-form-item>
         </el-form>
@@ -36,7 +46,7 @@
 </template>
 
 <script>
-    import {get, post,stop} from "~/utils";
+    import {get, post, stop} from "~/utils";
     import {showDialog, showFail, showSuccess} from "~/utils/dialog";
 
     export default {
@@ -47,45 +57,54 @@
         },
         data() {
             return {
-                dialogVisible: false,
-                password: ''
+                dialogVisible: false
             }
         },
         methods: {
             async confirm() {
-                await showDialog("确定要" + (this.edit ? '编辑' : '新增') + '吗？', this)
-                if (this.edit) {
-                    await post('lb/user/updateUser', {
-                        nickname: this.userForm.nickname,
-                        tel: this.userForm.tel,
-                        email: this.userForm.email,
-                        username: this.userForm.username,
-                        office: this.userForm.office,
-                        position: parseInt(this.userForm.position),
-                        uId: this.userForm.uid
-                    }).catch(async e => {
-                        await showFail(e.msg,this)
-                        await stop()
-                    })
-                    showSuccess('编辑完成', this)
-                } else {
-                    await post('lb/user/addUser', {
-                        nickname: this.userForm.nickname,
-                        tel: this.userForm.tel,
-                        email: this.userForm.email,
-                        username: this.userForm.username,
-                        office: this.userForm.office,
-                        position: parseInt(this.userForm.position),
-                        password: this.password
-                    }).catch(async e => {
-                        await showFail(e.msg,this)
-                        await stop()
-                    })
-                    showSuccess('新增完成', this)
-                }
-                this.$emit('confirm')
+                //验证
+                this.$refs['userForm'].validate(async (valid) => {
+                    if (valid) {
+                        //提交
+                        await showDialog("确定要" + (this.edit ? '编辑' : '新增') + '吗？', this)
+                        //编辑提交
+                        if (this.edit) {
+                            await post('lb/user/updateUser', {
+                                nickname: this.userForm.nickname,
+                                tel: this.userForm.tel,
+                                email: this.userForm.email,
+                                username: this.userForm.username,
+                                office: this.userForm.office,
+                                position: parseInt(this.userForm.position),
+                                uId: this.userForm.uid
+                            }).catch(async e => {
+                                await showFail(e.msg, this)
+                                await stop()
+                            })
+                            showSuccess('编辑完成', this)
+                        } else {
+                            // 新增提交
+                            await post('lb/user/addUser', {
+                                nickname: this.userForm.nickname,
+                                tel: this.userForm.tel,
+                                email: this.userForm.email,
+                                username: this.userForm.username,
+                                office: this.userForm.office,
+                                position: parseInt(this.userForm.position),
+                                password: this.userForm.password
+                            }).catch(async e => {
+                                await showFail(e.msg, this)
+                                await stop()
+                            })
+                            showSuccess('新增完成', this)
+                        }
+                        this.$emit('confirm')
+                    }
+                });
+
             },
             cancel() {
+                this.$refs['userForm'].resetFields()
                 this.$emit('cancel')
             }
         },