From 87b905da9a6e7bf7cbdb57c1b6ff3e37447e1650 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期五, 26 八月 2022 12:43:08 +0800
Subject: [PATCH] 用户

---
 src/views/system/user/component/userDialog.vue |  139 ++++++++++++++++++++++++++++-----------------
 1 files changed, 86 insertions(+), 53 deletions(-)

diff --git a/src/views/system/user/component/userDialog.vue b/src/views/system/user/component/userDialog.vue
index 2f63678..0eb4dd7 100644
--- a/src/views/system/user/component/userDialog.vue
+++ b/src/views/system/user/component/userDialog.vue
@@ -1,62 +1,64 @@
 <template>
     <div class="system-add-user-container">
         <el-dialog :title="title" v-model="isShowUserDialog" width="769px">
-            <el-form :model="userForm" size="default" label-width="90px">
+            <el-form :model="userForm" size="default" ref="userRef" :rules="userFormRules" label-width="90px">
                 <el-row :gutter="35">
-                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="账户名称">
-                            <el-input v-model="userForm.username" placeholder="请输入账户名称" clearable></el-input>
+                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="disabled">
+                        <el-form-item label="用户名">
+                            <el-input v-model.trim="userForm.username" :disabled="disabled" placeholder="" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="用户昵称">
-                            <el-input v-model="userForm.realName" placeholder="请输入用户昵称" clearable></el-input>
+                        <el-form-item label="真实姓名" prop="realName">
+                            <el-input v-model.trim="userForm.realName" placeholder="请输入真实姓名" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="关联角色">
+                        <el-form-item label="关联角色" prop="roleId">
                             <el-select v-model="userForm.roleId" placeholder="请选择" clearable class="w100">
                                 <el-option v-for="item in roleData" :key="item.roleId" :label="item.roleName" :value="item.roleId"> </el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="部门">
+                        <el-form-item label="部门" prop="depId">
                             <el-cascader :options="departmentData" :props="{ emitPath: false, checkStrictly: true, value: 'depId', label: 'depName' }" placeholder="请选择部门" clearable class="w100" v-model="userForm.depId"> </el-cascader>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="手机号">
-                            <el-input v-model="userForm.phone" placeholder="请输入手机号" clearable></el-input>
+                        <el-form-item label="手机号" prop="phone">
+                            <el-input v-model.trim="userForm.phone" placeholder="请输入手机号" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="身份证">
-                            <el-input v-model="userForm.identify" placeholder="请输入身份证" clearable></el-input>
+                        <el-form-item label="身份证" prop="identify">
+                            <el-input v-model.trim="userForm.identify" placeholder="请输入身份证" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="邮箱">
-                            <el-input v-model="userForm.email" placeholder="请输入" clearable></el-input>
+                        <el-form-item label="邮箱" prop="email">
+                            <el-input v-model.trim="userForm.email" placeholder="请输入" clearable></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="性别">
+                        <el-form-item label="性别" prop="gender">
                             <el-select v-model="userForm.gender" placeholder="请选择" clearable class="w100">
                                 <el-option v-for="item in sexList" :key="item.id" :value="item.id" :label="item.name"> </el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="账户密码">
-                            <el-input v-model="userForm.password" placeholder="请输入" type="password" clearable></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-                        <el-form-item label="账户过期">
+                        <el-form-item label="账户过期" prop="expireTime">
                             <el-date-picker v-model="userForm.expireTime" type="date" placeholder="请选择" class="w100"> </el-date-picker>
                         </el-form-item>
                     </el-col>
+                    <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="!disabled">
+                        <el-form-item label="账户密码" prop="password">
+                            <el-input v-model.trim="userForm.password" placeholder="请输入" type="password" show-password>
+                            </el-input>
+                        </el-form-item>
+                    </el-col>
+
                     <!--					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">-->
                     <!--						<el-form-item label="用户状态">-->
                     <!--							<el-switch v-model="userForm.status" inline-prompt active-value = 1 inactive-value= 0 active-text="启" inactive-text="禁"></el-switch>-->
@@ -75,7 +77,7 @@
 </template>
 
 <script lang="ts">
-import { reactive, toRefs, onMounted, defineComponent } from 'vue';
+import { reactive, toRefs, onMounted, defineComponent, ref } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { userApi } from '/@/api/systemManage/user';
 
@@ -85,6 +87,7 @@
 interface sexData {}
 interface UserState {
     title: string;
+    disabled: boolean;
     isShowUserDialog: boolean;
     userForm: {
         username: string;
@@ -100,6 +103,9 @@
         status: number;
         identify: string;
     };
+    userFormRules:{
+
+    },
     departmentData: Array<DeptData>;
     roleData: Array<roleData>;
     sexList: Array<sexData>;
@@ -108,8 +114,10 @@
 export default defineComponent({
     name: 'user',
     setup(props, context) {
+        const userRef = ref()
         const state = reactive<UserState>({
             title: '',
+            disabled: false,
             isShowUserDialog: false,
             userForm: {
                 username: '', // 账户名称
@@ -125,6 +133,18 @@
                 expireTime: '', // 账户过期
                 status: 1 // 用户状态
             },
+            userFormRules:{
+                username: [{ required: true, message: '请填写用户名', trigger: 'blur' }],
+                realName: [{ required: true, message: '请填写真实姓名', trigger: 'blur' }],
+                roleId: [{ required: true, message: '请选择用户角色', trigger: 'change' }],
+                depId: [{ required: true, message: '请选择部门', trigger: 'change' }],
+                phone: [{ required: true, message: '请填写手机号', trigger: 'blur' }],
+                email: [{ required: true, message: '请填写邮箱地址', trigger: 'blur' }],
+                identify: [{ required: true, message: '请填写身份证号', trigger: 'blur' }],
+                gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
+                expireTime: [{ required: true, message: '请输入账户过期时间', trigger: 'blur' }],
+                password: [{ required: true, message: '请输入账户密码', trigger: 'blur' }],
+            },
             departmentData: [], // 部门数据
             roleData: [], //角色数据
             sexList: [
@@ -138,6 +158,7 @@
             state.departmentData = departmentList;
             state.roleData = roleList;
             if (type === '新增') {
+                state.disabled = false
                 state.title = '新增用户';
                 state.userForm = {
                     username: '',
@@ -154,6 +175,7 @@
                     status: 1
                 };
             } else {
+                state.disabled = true
                 state.title = '修改用户';
                 state.userForm = JSON.parse(JSON.stringify(value));
             }
@@ -161,44 +183,55 @@
 
         // 新增修改
         const onSubmit = async () => {
-            if (state.title === '新增用户') {
-                let res = await userApi().addUser(state.userForm);
-                if (res.data.code === '200') {
+            userRef.value.validate(async (valid:Boolean) => {
+                if(valid){
+                    if (state.title === '新增用户') {
+                        let res = await userApi().addUser(state.userForm);
+                        if (res.data.code === '200') {
+                            ElMessage({
+                                type: 'success',
+                                message: '用户新增成功',
+                                duration: 2000
+                            });
+                            state.isShowUserDialog = false;
+                            context.emit('getUserList');
+                        } else {
+                            ElMessage({
+                                type: 'warning',
+                                message: res.data.msg
+                            });
+                        }
+                    } else {
+                        let res = await userApi().modUser(state.userForm);
+                        if (res.data.code === '200') {
+                            ElMessage({
+                                type: 'success',
+                                message: '用户修改成功',
+                                duration: 2000
+                            });
+                            state.isShowUserDialog = false;
+                            context.emit('getUserList');
+                        } else {
+                            ElMessage({
+                                type: 'warning',
+                                message: res.data.msg
+                            });
+                        }
+                    }
+                }else{
                     ElMessage({
-                        type: 'success',
-                        message: '用户新增成功',
-                        duration: 2000
-                    });
-                    state.isShowUserDialog = false;
-                    context.emit('getUserList');
-                } else {
-                    ElMessage({
-                        type: 'warning',
-                        message: res.data.msg
-                    });
+                        type:'warning',
+                        message:'请完善基本信息'
+                    })
                 }
-            } else {
-                let res = await userApi().modUser(state.userForm);
-                if (res.data.code === '200') {
-                    ElMessage({
-                        type: 'success',
-                        message: '用户修改成功',
-                        duration: 2000
-                    });
-                    state.isShowUserDialog = false;
-                    context.emit('getUserList');
-                } else {
-                    ElMessage({
-                        type: 'warning',
-                        message: res.data.msg
-                    });
-                }
-            }
+            })
+
         };
 
         // 页面加载时
         onMounted(() => {});
         return {
+            userRef,
             openDialog,
             onSubmit,
             ...toRefs(state)

--
Gitblit v1.9.2