修改bug,店铺管理新增、查询

“dzb”

2022-10-09 2bb0e066fdc522beb51dd13f6a72cd67bd5d6a58

 src/views/systemSetting/baseSetting/user/components/createUser/index.vue

@@ -1,36 +1,28 @@
<template>
    <div class="createUser">
        <!-- <header>
            <div class="headerTitle">新增账户</div>
            <div class="headerTip">
                <span>*</span>
                <label>为必填项</label>
            </div>
        </header> -->
        <main>
            <!-- <div class="mainTitle">基础信息</div> -->
            <div class="mainContent">
                <el-form ref="user" label-width="140px" autoComplete="on" :model="user" :rules="createUserRules"
                    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="username">
                        <el-input v-model="user.username" 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 class="optionItem" label="所属用户姓名:" prop="nickName">
                        <el-input v-model="user.nickName" placeholder="请填写用户姓名"></el-input>
                    </el-form-item>
                    <!-- 性别 -->
                    <!-- <el-form-item class="optionItem" label="性别:" prop="gender">
                        <el-radio-group v-model="user.gender">
                    <el-form-item class="optionItem" label="性别:" prop="sex">
                        <el-radio-group v-model="user.sex">
                            <el-radio :label="1">男</el-radio>
                            <el-radio :label="2">女</el-radio>
                            <el-radio :label="0">女</el-radio>
                        </el-radio-group>
                    </el-form-item> -->
                    </el-form-item>
                    <!-- 是否党员 -->
                    <el-form-item class="optionItem" label="是否党员:" prop="isDy">
                        <el-radio-group v-model="user.isDy">
@@ -40,63 +32,71 @@
                    </el-form-item>
                    <!-- 所属手机号码 -->
                    <el-form-item class="optionItem" label="所属手机号码:" prop="mobile">
                        <el-input v-model="user.mobile" placeholder="请填写手机号码"></el-input>
                        <el-input v-model="user.mobile" maxlength="11" 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-form-item class="optionItem" label="选择角色:" prop="role">
                        <el-select v-model="user.role" placeholder="请选择所属角色" multiple collapse-tags>
                            <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id">
                            </el-option>
                        </el-select>
                    </el-form-item> -->
                        <!-- <el-select v-model="user.role" placeholder="请选择所属角色">
                            <el-option v-for="item in roleList" :key="item.id" :label="item.name" :value="item.id"
                                :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-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"
                                :disabled="item.disabled">
                            <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
                            </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="电话区号">
                    <div class="user-item">
                        <el-form-item label="座机/分机:" prop="zjarea">
                            <el-input v-model="user.zjarea" placeholder="电话区号">
                            </el-input>
                            <el-input class="telNumber" v-model="user.zj.phoneNumber" placeholder="电话号码">
                        </el-form-item>
                        <el-form-item prop="zjnumber" class="left-px">
                            <el-input v-model="user.zjnumber" placeholder="电话号码">
                            </el-input>
                            <el-input class="moreNumber" v-model="user.zj.moreNumber" placeholder="分机号码">
                        </el-form-item>
                        <el-form-item prop="zjother" class="left-px">
                            <el-input v-model="user.zjother" placeholder="分机号码">
                            </el-input>
                        </div>
                    </el-form-item>
                        </el-form-item>
                    </div>
                    <!-- 所属部门 -->
                    <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"
                        <el-select v-model="user.departmentId" placeholder="请选择所属部门" @change="getDepartName">
                            <el-option v-for="item in departList" :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-input v-model="user.work" placeholder="请输入当前职务" ></el-input>
                        <el-input v-model="user.jobTitle" placeholder="请输入当前职务"></el-input>
                    </el-form-item>
                    <!-- 填写所属mac地址 -->
                    <!-- <el-form-item class="optionItem" label="填写所属mac地址:" prop="mac">
                    <el-form-item class="optionItem" label="填写所属mac地址:" prop="mac">
                        <el-input v-model="user.mac" placeholder="请填写所属mac地址"></el-input>
                    </el-form-item> -->
                    </el-form-item>
                    <!-- 填写所属ip地址 -->
                    <!-- <el-form-item class="optionItem" label="填写所属ip地址:" prop="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>
                    <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>
                            <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">提交
                            </el-button>
                            <el-button class="btn reset" @click.native.prevent="resetForm">重置</el-button>
                        </div>
                    </el-form-item>
                </el-form>
@@ -110,36 +110,44 @@
    data() {
        const validateNickname = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写用户名称"));
                callback(new Error("用户名称不能为空"));
            } else {
                callback();
            }
        };
        const validatePass = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
                callback(new Error("用户密码不能为空"));
            } else {
                const rep = /^\w+$/;
                if (!rep.test(value)) {
                    callback(new Error("密码只能是以数字、26个英文字母或者下划线组成的字符串"));
                } else {
                    callback();
                }
            }
        };
        const validateTruename = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写用户姓名"));
                callback(new Error("用户姓名不能为空"));
            } else {
                const rep = /^[\u4E00-\u9FA5]{2,4}$/;
                if (!rep.test(value)) {
                    callback("请输入正确的用户姓名");
                } else {
                    callback();
                }
            }
        };
        const validatePhone = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写手机号码"));
                callback(new Error("手机号码不能为空"));
            } else {
                const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
                if (!rep.test(value)) {
                    callback("请输入正确的手机号码");
                } else {
                    callback();
                }
            }
        };
@@ -148,49 +156,53 @@
                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("请输入正确的邮箱"))
                }else{
                    callback();
                }
            }else{
                callback();
            }
        };
        const validateRole = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
                callback(new Error("所属角色不能为空"));
            } else {
                callback();
                callback()
            }
        };
        const validateType = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
                callback(new Error("用户类型不能为空"));
            } else {
                callback();
                callback()
            }
        };
        const validateDepartment = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
                callback(new Error("请选择用户部门"));
            } else {
                callback();
                callback()
            }
        };
        const validateWork = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
                callback(new Error("用户当前职务不能为空"));
            } else {
                callback();
            }
        };
        const validateMac = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
            if (value) {
                callback();
            }else{
                callback()
            }
        };
        const validateIp = (rule, value, callback) => {
            if (!value) {
                callback(new Error("请填写登录密码"));
            } else {
            if (value) {
                callback();
            }else{
                callback()
            }
        };
        return {
@@ -198,21 +210,19 @@
                nickName: '',
                password: '',
                username: '',
                // gender: 1,
                sex: 1,
                isDy: 0,
                mobile: '',
                email: '',
                // role: null,
                role: null,
                userType: null,
                zj: {
                    areaNumber: '',
                    phoneNumber: "",
                    moreNumber: "",
                },
                zjarea: '',
                zjnumber: '',
                zjother: '',
                departmentId: null,
                jobTitle: null,
                // mac: '',
                // ip: '',
                mac: '',
                ip: '',
            },
            createUserRules: {
                nickName: [
@@ -224,9 +234,9 @@
                username: [
                    { required: true, trigger: "blur", validator: validateTruename },
                ],
                // gender: [
                //     { required: true, trigger: "blur" },
                // ],
                sex: [
                    { required: true, trigger: "blur" },
                ],
                isDy: [
                    { required: true, trigger: "blur" },
                ],
@@ -236,67 +246,130 @@
                email: [
                    { required: false, trigger: "blur", validator: validateMail },
                ],
                // role: [
                //     { required: true, trigger: "blur", validator: validateRole },
                // ],
                role: [
                    { required: true, trigger: "change", validator: validateRole },
                ],
                userType: [
                    { required: true, trigger: "blur", validator: validateType },
                    { required: true, trigger: "change", validator: validateType },
                ],
                zj: [
                    { required: false, trigger: "blur" },
                ],
                departmentId: [
                    { required: true, trigger: "blur", validator: validateDepartment },
                    { required: true, trigger: "change", validator: validateDepartment },
                ],
                jobTitle: [
                    { required: true, trigger: "blur", validator: validateWork },
                ],
                // mac: [
                //     { required: false, trigger: "blur", validator: validateMac },
                // ],
                // ip: [
                //     { required: false, trigger: "blur", validator: validateIp },
                // ],
                mac: [
                    { required: false, trigger: "blur", validator: validateMac },
                ],
                ip: [
                    { required: false, trigger: "blur", validator: validateIp },
                ],
            },
            roleList: [
                { name: '角色1', value: 1 }, { name: '角色2', value: 2 }
                
            ],
            typeList: []
            typeList: [
                
            ],
            departList: []
        }
    },
    created() {
        const that = this;
        // 获取角色列表
        // this.$axios.get('')
        // 获取用户类型列表
        // this.$axios.get('sccg/admin/list',{userType:0}).then(res=>{
        //     console.log(res);
        // })
        this.getRoleList();
        // 获取全部部门列表
        this.$axios.get('sccg/depart/page').then(res => {
            that.typeList = res.data.records;
            that.departList = res.data.records;
        })
        // 获取用户类型
        this.getUserTypeList();
    },
    methods: {
        // 提交注册
        handleUser() {
            const { user } = this;
            this.$axios.post('sccg/admin/register', {
                departmentId: user.departmentId,
                email: user.email,
                jsDy: user.isDy,
                jobTitle: user.jobTitle,
                mobile: user.mobile,
                nickName: user.nickName,
                password: user.password,
                userType: user.userType,
                username: user.username,
            }).then(res => {
                if (res.code === 200) {
                    console.log(1);
                    this.$emit('sendDialog',{flag:false});
            this.$refs['user'].validate((valid) => {
                console.log(valid);
                if (valid) {
                    const { user } = this;
                    console.log(user);
                    this.$axios.post('sccg/admin/register', {
                        departmentId: user.departmentId,
                        email: user.email,
                        icon:'',
                        isDy: `${user.isDy}`,
                        jobTitle: user.jobTitle,
                        mobile: user.mobile,
                        note:'',
                        roleIds:user.role,
                        // nickName: user.nickName,
                        sex:`${user.sex}`,
                        password: user.password,
                        userType: `${user.userType}`,
                        username: user.username,
                        zj:user.zjarea+`${user.zjnumber}`+user.zjother,
                        // departName:user.departName,
                    }).then(res => {
                        if (res.code === 200) {
                            console.log(1);
                            this.$message({
                                type:'success',
                                message:res.message,
                            })
                            this.$emit('sendDialog', { flag: false });
                        }else if(res.code === 500 && res.message === "操作失败"){
                            this.$message({
                                type:'warning',
                                message:'该用户已注册'
                            })
                        }else{
                            this.$message({
                                type:'warning',
                                message:res.message
                            })
                        }
                    })
                } else {
                    return false
                }
            })
        },
        // 获取角色列表
        getRoleList() {
            this.$axios({
                method: 'get',
                url: 'sccg/role/listAll',
            })
                .then(res => {
                    this.roleList = res.data;
                })
        },
        // 重置表单
        resetForm() {
            this.$refs['user'].resetFields();
        },
        // 获得部门名称
        getDepartName(data) {
            this.departList.forEach(item => {
                if (item.id === data) {
                    this.user.departName = item.departName
                }
            })
        },
        // 获取用户类型
        getUserTypeList(){
            this.$axios({
                method:'get',
                url:'sccg/dict/query_user_type'
            })
            .then(res=>{
                console.log(res);
                this.typeList = res.data;
            })
        }
    },
    props: ['sendDialog']
}
@@ -306,46 +379,18 @@
    border-radius: 1px;
    background-color: #09152f;

    // header {
    //     display: flex;
    //     justify-content: space-between;
    //     height: 60px;
    //     line-height: 60px;
    //     padding: 0 20px;
    //     border: 1px solid #fff;

    //     .headerTitle {
    //         color: #4b9bb7;
    //         font-weight: 600;
    //     }

    //     .headerTip span {
    //         color: #ff3b6c;
    //     }

    //     .headerTip label {
    //         color: #4b9bb7;
    //     }
    // }

    main {
        // border: 1px solid #fff;
        text-align: left;
        padding: 0 55px;
        background-color: #09152f;
        padding-bottom: 50px;
        padding-top: 20px;
        // .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;
            }
@@ -363,29 +408,23 @@
                }
            }

            .optionHandleSp {
            .user-item {
                display: flex;

                .areaNumber,
                .moreNumber {
                    flex: 1;
                }

                .telNumber {
                    flex: 2;
                .left-px :deep(.el-form-item__content) {
                    margin-left: 0px !important;
                }
            }
                .optionBtn {
                    display: flex;
                    margin-top: 20px;

            .optionBtn {
                display: flex;
                margin-top: 20px;

                .btn {
                    padding: 12px 50px;
                    .btn {
                        padding: 12px 50px;
                    }
                }
            }

            }
        }
    }
}
</style>