“dzb”
2022-09-20 19868081a4c89d2a755b50cc7a2e9753a93bd4c6
新增新建部门管理界面
3个文件已修改
282 ■■■■ 已修改文件
src/views/systemSetting/baseSetting/department/createUser/index.vue 276 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/department/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/user/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/systemSetting/baseSetting/department/createUser/index.vue
@@ -1,112 +1,57 @@
<template>
    <div class="createUser">
        <header>
            <div class="headerTitle">新增账户</div>
            <div class="headerTitle">新增部门信息</div>
            <div class="headerTip">
                <span>*</span>
                <label>为必填项</label>
                <label>x</label>
            </div>
        </header>
        <main>
            <div class="mainTitle">基础信息</div>
            <div class="mainContent">
                <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
                <el-form ref="user" label-width="140px" autoComplete="on" :model="depart" :rules="createDepartRules"
                    label-position="right">
                    <!-- 用户名称 -->
                    <el-form-item class="optionItem" label="用户名称:" prop="nickName">
                        <el-input v-model="user.nickName" placeholder="填写用户名称"></el-input>
                    <!-- 部门名称 -->
                    <el-form-item class="optionItem" label="部门名称:" prop="departName">
                        <el-input v-model="depart.departName" placeholder="请输入部门名称"></el-input>
                    </el-form-item>
                    <!-- 用户密码 -->
                    <el-form-item class="optionItems" label="用户密码:" prop="password">
                        <el-input v-model="user.password" type="password" placeholder="请输入用户密码"></el-input>
                    </el-form-item>
                    <!-- 所属用户姓名 -->
                    <el-form-item class="optionItem" label="所属用户姓名:" prop="username">
                        <el-input v-model="user.username" placeholder="请填写用户姓名"></el-input>
                    </el-form-item>
                    <!-- 性别 -->
                    <!-- <el-form-item class="optionItem" label="性别:" prop="gender">
                        <el-radio-group v-model="user.gender">
                            <el-radio :label="1">男</el-radio>
                            <el-radio :label="2">女</el-radio>
                        </el-radio-group>
                    </el-form-item> -->
                    <!-- 是否党员 -->
                    <el-form-item class="optionItem" label="是否党员:" prop="isDy">
                        <el-radio-group v-model="user.isDy">
                            <el-radio :label="1">是</el-radio>
                            <el-radio :label="0">否</el-radio>
                        </el-radio-group>
                    </el-form-item>
                    <!-- 所属手机号码 -->
                    <el-form-item class="optionItem" label="所属手机号码:" prop="mobile">
                        <el-input v-model="user.mobile" placeholder="请填写手机号码"></el-input>
                    </el-form-item>
                    <!-- 邮箱地址 -->
                    <el-form-item class="optionItem" label="邮箱地址:" prop="email">
                        <el-input v-model="user.email" placeholder="请填写邮箱地址"></el-input>
                    </el-form-item>
                    <!-- 选择角色 -->
                    <!-- <el-form-item class="optionItem" label="选择角色:" prop="role">
                        <el-select v-model="user.role" placeholder="请选择所属角色">
                            <el-option v-for="item in roleList" :key="item.name" :label="item.name" :value="item.value"
                                :disabled="item.disabled">
                            </el-option>
                        </el-select>
                    </el-form-item> -->
                    <!-- 用户类型 -->
                    <el-form-item class="optionItem" label="用户类型:" prop="userType">
                        <el-select v-model="user.userType" placeholder="请选择用户类型">
                    <!-- 上级部门 -->
                    <el-form-item class="optionItems" label="上级部门:" prop="parentId">
                        <el-select v-model="depart.parentId" placeholder="请输入上级部门">
                            <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
                                :disabled="item.disabled">
                            </el-option>
                        </el-select>
                    </el-form-item>
                    <!-- 座机/分机 -->
                    <el-form-item class="optionItem" label="座机/分机:" prop="zj">
                        <div class="optionHandleSp">
                            <el-input class="areaNumber" v-model="user.zj.areaNumber" placeholder="电话区号">
                            </el-input>
                            <el-input class="telNumber" v-model="user.zj.phoneNumber" placeholder="电话号码">
                            </el-input>
                            <el-input class="moreNumber" v-model="user.zj.moreNumber" placeholder="分机号码">
                            </el-input>
                        </div>
                    </el-form-item>
                    <!-- 所属部门 -->
                    <el-form-item class="optionItem" label="所属部门:" prop="departmentId">
                        <el-select v-model="user.departmentId" placeholder="请选择所属部门">
                            <el-option v-for="item in typeList" :key="item.name" :label="item.departName"
                                :value="item.id">
                            </el-option>
                        </el-select>
                    </el-form-item>
                    <!-- 当前职务 -->
                    <el-form-item class="optionItem" label="当前职务:" prop="jobTitle">
                        <el-select v-model="user.work" placeholder="请选择当前职务">
                    <!-- 部门类型 -->
                    <el-form-item class="optionItem" label="部门类型:" prop="departType">
                        <el-select v-model="depart.departType" placeholder="请选择部门类型">
                            <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
                                :disabled="item.disabled">
                            </el-option>
                        </el-select>
                    </el-form-item>
                    <!-- 填写所属mac地址 -->
                    <!-- <el-form-item class="optionItem" label="填写所属mac地址:" prop="mac">
                        <el-input v-model="user.mac" placeholder="请填写所属mac地址"></el-input>
                    </el-form-item> -->
                    <!-- 填写所属ip地址 -->
                    <!-- <el-form-item class="optionItem" label="填写所属ip地址:" prop="ip">
                        <el-input v-model="user.ip" placeholder="请填写所属ip地址"></el-input>
                    </el-form-item> -->
                    <el-form-item>
                        <div class="optionBtn">
                            <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">提交</el-button>
                        <el-button class="btn reset">重置</el-button>
                        </div>
                    <!--添加人员  -->
                    <el-form-item class="optionItem" label="添加人员:">
                        <ul class="addPerson">
                            <li><i class="el-icon-user-solid"></i></li>
                            <li><i class="el-icon-user-solid"></i></li>
                            <li><i class="el-icon-user-solid"></i></li>
                            <li><i class="el-icon-plus"></i></li>
                        </ul>
                    </el-form-item>
                    <!-- 部门描述 -->
                    <el-form-item class="optionItem" label="部门描述:" prop="departDes">
                        <el-input v-model="depart.departDes" placeholder="请输入部门描述"></el-input>
                    </el-form-item>
                </el-form>
            </div>
        </main>
        <footer>
            <div class="optionBtn">
                    <el-button>取消</el-button>
                    <el-button type="primary"  class="btn submit" @click="handleUser">确定</el-button>
                </div>
        </footer>
    </div>
</template>
<script>
@@ -147,120 +92,26 @@
                }
            }
        };
        const validateMail = (rule, value, callback) => {
            if (value) {
                const rep = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
                if (!rep.test(value)) {
                    callback(new Error("请输入正确的邮箱"))
                }
            }
        };
        const validateRole = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
                callback();
            }
        };
        const validateType = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
                callback();
            }
        };
        const validateDepartment = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
                callback();
            }
        };
        const validateWork = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
                callback();
            }
        };
        const validateMac = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
                callback();
            }
        };
        const validateIp = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
                callback();
            }
        };
        return {
            user: {
                nickName: '',
                password: '',
                username: '',
                // gender: 1,
                isDy: 0,
                mobile: '',
                email: '',
                // role: null,
                userType: null,
                zj: {
                    areaNumber: '',
                    phoneNumber: "",
                    moreNumber: "",
            depart: {
                departName: '',
                parentId: '',
                departType: '',
                departDes: '',
                },
                departmentId: null,
                jobTitle: null,
                // mac: '',
                // ip: '',
            },
            createUserRules: {
                nickName: [
            createDepartRules: {
                departName: [
                    { required: true, trigger: "blur", validator: validateNickname },
                ],
                password: [
                parentId: [
                    { required: true, trigger: "blur", validator: validatePass },
                ],
                username: [
                departType: [
                    { required: true, trigger: "blur", validator: validateTruename },
                ],
                // gender: [
                //     { required: true, trigger: "blur" },
                // ],
                isDy: [
                departDes: [
                    { required: true, trigger: "blur" },
                ],
                mobile: [
                    { required: true, trigger: "blur", validator: validatePhone },
                ],
                email: [
                    { required: false, trigger: "blur", validator: validateMail },
                ],
                // role: [
                //     { required: true, trigger: "blur", validator: validateRole },
                // ],
                userType: [
                    { required: true, trigger: "blur", validator: validateType },
                ],
                zj: [
                    { required: false, trigger: "blur" },
                ],
                departmentId: [
                    { required: true, trigger: "blur", validator: validateDepartment },
                ],
                jobTitle: [
                    { required: true, trigger: "blur", validator: validateWork },
                ],
                // mac: [
                //     { required: false, trigger: "blur", validator: validateMac },
                // ],
                // ip: [
                //     { required: false, trigger: "blur", validator: validateIp },
                // ],
            },
            roleList: [
                { name: '角色1', value: 1 }, { name: '角色2', value: 2 }
@@ -277,9 +128,9 @@
        //     console.log(res);
        // })
        // 获取全部部门列表
        this.$axios.get('sccg/depart/page').then(res => {
            that.typeList = res.data.records;
        })
        // this.$axios.get('sccg/depart/page').then(res => {
        //     that.typeList = res.data.records;
        // })
    },
    methods: {
        handleUser() {
@@ -338,17 +189,11 @@
        padding: 0 55px;
        background-color: #09152f;
        padding-bottom: 50px;
        .mainTitle {
            color: #4b9bb7;
            font-weight: 600;
            line-height: 100px;
            font-size: 14px;
        }
        .mainContent {
            display: flex;
            justify-content: center;
            margin-top: 50px;
            &::v-deep .el-form-item__label {
                color: #4b9bb7;
            }
@@ -357,7 +202,21 @@
                background-color: #09152f;
                border: 1px solid #17324c;
            }
            .addPerson{
                display: flex;
                list-style: none;
                padding:0;
                li{
                    background-color: #cccccc;
                    width: 36px;
                    height: 36px;
                    border-radius: 50%;
                    color: #fff;
                    text-align: center;
                    font-size: 30px;
                    margin-left: 10px;
                }
            }
            .el-form-item__content {
                width: 400px;
@@ -379,16 +238,15 @@
                }
            }
            .optionBtn {
        }
    }
    footer{
        border: 1px solid #fff;
        height: 80px;
                display: flex;
                margin-top: 20px;
                .btn {
                    padding: 12px 50px;
                }
            }
        }
        align-items: center;
        justify-content: flex-end;
        padding-right: 20px;
    }
}
</style>
src/views/systemSetting/baseSetting/department/index.vue
@@ -10,7 +10,7 @@
                    </div>
                </div>
                <div class="addUser">
                    <el-button class="addBtn" type="primary" @click="dialogCreate = true">添加用户</el-button>
                    <el-button class="addBtn" type="primary" @click="dialogCreate = true">新增部门</el-button>
                    <el-dialog :visible.sync="dialogCreate" width="45%">
                        <createUser :refresh="getUserList" />
                    </el-dialog>
src/views/systemSetting/baseSetting/user/index.vue
@@ -11,7 +11,7 @@
                </div>
                <div class="addUser">
                    <el-button class="addBtn" type="primary" @click="dialogCreate = true">添加用户</el-button>
                    <el-dialog :visible.sync="dialogCreate" width="45%">
                    <el-dialog :visible.sync="dialogCreate" width="45%" destroy-on-close>
                        <createUser :refresh="getUserList" />
                    </el-dialog>
                </div>
@@ -63,7 +63,7 @@
                    </el-table-column>
                </el-table>
                <!-- 查看修改页面 -->
                <el-dialog :visible.sync="dialogUpdate" width="45%">
                <el-dialog :visible.sync="dialogUpdate" width="45%" destroy-on-close>
                    <updateUser :updateFlag="updateFlag" :userInfo=userInfo />
                </el-dialog>
                <!-- 分页 -->