From 2bb0e066fdc522beb51dd13f6a72cd67bd5d6a58 Mon Sep 17 00:00:00 2001 From: “dzb” <2632970487@qq.com> Date: 星期日, 09 十月 2022 18:06:46 +0800 Subject: [PATCH] 修改bug,店铺管理新增、查询 --- src/views/systemSetting/baseSetting/department/updateUser/index.vue | 339 +++++++++++++++++--------------------------------------- 1 files changed, 105 insertions(+), 234 deletions(-) diff --git a/src/views/systemSetting/baseSetting/department/updateUser/index.vue b/src/views/systemSetting/baseSetting/department/updateUser/index.vue index 270ee8c..6f1c887 100644 --- a/src/views/systemSetting/baseSetting/department/updateUser/index.vue +++ b/src/views/systemSetting/baseSetting/department/updateUser/index.vue @@ -1,97 +1,39 @@ <template> <div class="updateUser"> - <header> - <div class="headerTitle">{{updateFlag ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅' :'鏌ョ湅鐢ㄦ埛淇℃伅'}}</div> - </header> + <!-- <header> + <div class="headerTitle">{{updateFlag ? '淇敼鐢ㄦ埛閮ㄩ棬淇℃伅' :'鏌ョ湅鐢ㄦ埛淇℃伅'}}</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="username"> - <el-input v-model="user.username" placeholder="濉啓鐢ㄦ埛鍚嶇О" :disabled="true"></el-input> + <!-- 閮ㄩ棬id --> + <el-form-item class="optionItem" label="閮ㄩ棬id:" prop="id"> + <el-input v-model="user.id" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input> </el-form-item> - <!-- 鐢ㄦ埛瀵嗙爜 --> - <el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password"> - <el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" :disabled="true"> - </el-input> + <!-- 閮ㄩ棬鍚嶇О --> + <el-form-item class="optionItem" label="閮ㄩ棬鍚嶇О:" prop="departName"> + <el-input v-model="user.departName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" :disabled="!updateFlag"></el-input> </el-form-item> - <!-- 鎵�灞炵敤鎴峰鍚� --> - <!-- <el-form-item class="optionItem" label="鎵�灞炵敤鎴峰鍚�:" prop="true_name"> - <el-input v-model="user.true_name" 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" disabled> - <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="璇峰~鍐欐墜鏈哄彿鐮�" :disabled="true"></el-input> - </el-form-item> - <!-- 閭鍦板潃 --> - <el-form-item class="optionItem" label="閭鍦板潃:" prop="email"> - <el-input v-model="user.email" placeholder="璇峰~鍐欓偖绠卞湴鍧�" :disabled="true"></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="璇烽�夋嫨鐢ㄦ埛绫诲瀷" disabled> - <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"> - </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.department" placeholder="璇烽�夋嫨鎵�灞為儴闂�" :disabled="!updateFlag"> - <el-option v-for="item in typeList" :key="item.name" :label="item.departName" + <!-- 涓婄骇閮ㄩ棬 --> + <el-form-item class="optionItems" label="涓婄骇閮ㄩ棬:" prop="parentId"> + <el-select v-model="user.parentId" placeholder="璇烽�夋嫨涓婄骇閮ㄩ棬" :disabled="!updateFlag"> + <el-option v-for="item in typeList" :key="item.departName" :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="璇烽�夋嫨褰撳墠鑱屽姟" disabled> + <!-- 閮ㄩ棬绫诲瀷 --> + <el-form-item class="optionItem" label="閮ㄩ棬绫诲瀷:" prop="departType"> + <el-select v-model="user.departType" placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷" :disabled="!updateFlag"> <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value"> </el-option> </el-select> </el-form-item> - <!-- 濉啓鎵�灞瀖ac鍦板潃 --> - <!-- <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac"> - <el-input v-model="user.mac" placeholder="璇峰~鍐欐墍灞瀖ac鍦板潃"></el-input> - </el-form-item> --> - <!-- 濉啓鎵�灞瀒p鍦板潃 --> - <!-- <el-form-item class="optionItem" label="濉啓鎵�灞瀒p鍦板潃:" prop="ip"> - <el-input v-model="user.ip" placeholder="璇峰~鍐欐墍灞瀒p鍦板潃"></el-input> - </el-form-item> --> + <!-- 閮ㄩ棬鎻忚堪 --> + <el-form-item class="optionItem" label="閮ㄩ棬鎻忚堪:" prop="departDes"> + <el-input v-model="user.departDes" placeholder="璇疯緭鍏ラ儴闂ㄦ弿杩�" :disabled="!updateFlag"></el-input> + </el-form-item> <el-form-item v-if="updateFlag"> <div class="optionBtn"> <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦 @@ -109,153 +51,64 @@ data() { const validateNickname = (rule, value, callback) => { if (!value) { - callback(new Error("璇峰~鍐欑敤鎴峰悕绉�")); + callback(new Error("璇峰~鍐欓儴闂ㄥ悕绉�")); + } else { + callback(); } }; + const validateId = (rule, value, callback) => { + if (!value) { + callback(new Error("璇峰~鍐欓儴闂╥d")); + } else { + callback(); + } + } const validatePass = (rule, value, callback) => { if (!value) { - callback(new Error("璇峰~鍐欑櫥褰曞瘑鐮�")); + callback(); } else { - const rep = /^\w+$/; - if (!rep.test(value)) { - callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆")); - } - } - }; - const validateTruename = (rule, value, callback) => { - if (!value) { - callback(new Error("璇峰~鍐欑敤鎴峰鍚�")); - } else { - const rep = /^[\u4E00-\u9FA5]{2,4}$/; - if (!rep.test(value)) { - callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕"); - } + callback(); + // const rep = /^\w+$/; + // if (!rep.test(value)) { + // callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆")); + // } } }; const validatePhone = (rule, value, callback) => { if (!value) { - callback(new Error("璇峰~鍐欐墜鏈哄彿鐮�")); - } else { - const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/ - if (!rep.test(value)) { - callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜"); - } - } - }; - 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("璇峰~鍐欑櫥褰曞瘑鐮�")); + callback(); } 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(); + // const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/ + // if (!rep.test(value)) { + // callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜"); + // } } }; return { user: { - nickName: '', - password: '', - username: '', - // gender: 1, - isDy: 1, - mobile: '', - email: '', - // role: null, - userType: null, - zj: { - areaNumber: '', - phoneNumber: "", - moreNumber: "", - }, - departmentId: null, - jobTitle: null, - // mac: '', - // ip: '', + id: '', + departName: '', + parentId: '', + departDes: '', + departType: '', }, createUserRules: { - nickName: [ + id: [ + { required: true, trigger: "blur", validator: validateId }, + ], + departName: [ { required: true, trigger: "blur", validator: validateNickname }, ], - password: [ - { required: true, trigger: "blur", validator: validatePass }, + parentId: [ + { required: false, trigger: "blur", validator: validatePass }, ], - username: [ - { required: true, trigger: "blur", validator: validateTruename }, - ], - // gender: [ - // { required: true, trigger: "blur" }, - // ], - isDy: [ - { 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: [ + departDes: [ { required: false, trigger: "blur" }, ], - departmentId: [ - { required: true, trigger: "blur", validator: validateDepartment }, + departType: [ + { required: false, trigger: "blur" }, ], - 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 } @@ -279,16 +132,31 @@ }, methods: { handleUser() { - const { user } = this; - this.$axios.post('sccg/depart/status', { - id: user.departmentId, - status: user.status ? 1 : 0, - }).then(res => { - console.log(res); + this.$refs['user'].validate((valid) => { + if (valid) { + const { user } = this; + console.log(user) + this.$axios.post('sccg/depart/update', { + id: user.id, + departName: user.departName, + parentId: user.parentId, + departDes: user.departDes + }).then(res => { + console.log(res); + this.$message({ + message:res.message, + type:res.code === 200 ? 'success' : 'warning', + }) + this.$emit('changeDialog', { flag: false }); + this.getUserList(); + }) + } else { + return false; + } }) } }, - props: ['userInfo', 'updateFlag'] + props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog'] } </script> <style lang="scss" scoped> @@ -296,43 +164,46 @@ border-radius: 1px; background-color: #09152f; - header { - display: flex; - justify-content: center; - height: 60px; - line-height: 60px; - padding: 0 20px; - border: 1px solid #fff; - .headerTitle { - color: #4b9bb7; - font-weight: 600; - } + // header { + // display: flex; + // justify-content: center; + // height: 60px; + // line-height: 60px; + // padding: 0 20px; + // border: 1px solid #fff; - .headerTip span { - color: #ff3b6c; - } + // .headerTitle { + // color: #4b9bb7; + // font-weight: 600; + // } - .headerTip label { - color: #4b9bb7; - } - } + // .headerTip span { + // color: #ff3b6c; + // } + + // .headerTip label { + // color: #4b9bb7; + // } + // } main { - border: 1px solid #fff; + // border: 1px solid #fff; text-align: left; padding: 0 55px; background-color: #09152f; padding-bottom: 50px; - .mainTitle { - color: #4b9bb7; - font-weight: 600; - line-height: 100px; - font-size: 14px; - } + + // .mainTitle { + // color: #4b9bb7; + // font-weight: 600; + // line-height: 100px; + // font-size: 14px; + // } .mainContent { display: flex; justify-content: center; + padding-top: 50px; .el-form-item__content { width: 400px; -- Gitblit v1.8.0