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/user/components/updateUser/index.vue | 289 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 190 insertions(+), 99 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
index eabcd01..bcad673 100644
--- a/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/user/components/updateUser/index.vue
@@ -1,10 +1,6 @@
<template>
<div class="updateUser">
- <!-- <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">
@@ -14,7 +10,7 @@
</el-form-item>
<!-- 鐢ㄦ埛瀵嗙爜 -->
<el-form-item class="optionItems" label="鐢ㄦ埛瀵嗙爜:" prop="password">
- <el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" :disabled="true">
+ <el-input v-model="user.password" type="password" placeholder="璇疯緭鍏ョ敤鎴峰瘑鐮�" disabled>
</el-input>
</el-form-item>
<!-- 鎵�灞炵敤鎴峰鍚� -->
@@ -22,12 +18,12 @@
<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-form-item class="optionItem" label="鎬у埆:" prop="sex">
+ <el-radio-group v-model="user.sex" :disabled="!flag.role">
<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" disabled>
@@ -44,17 +40,22 @@
<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-form-item class="optionItem" label="閫夋嫨瑙掕壊:" prop="role">
+ <el-select v-model="user.role" placeholder="璇烽�夋嫨鎵�灞炶鑹�" multiple collapse-tags
+ @change="handleChangeRole" :disabled="!flag.role">
+ <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="璇烽�夋嫨鎵�灞炶鑹�" :disabled="!flag.role">
+ <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="璇烽�夋嫨鐢ㄦ埛绫诲瀷" disabled>
- <el-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
+ <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id">
</el-option>
</el-select>
</el-form-item>
@@ -71,27 +72,25 @@
</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-select v-model="user.departmentId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" :disabled="!flag.depart"
+ @change="changeDepart">
+ <el-option v-for="item in departList" :key="item.id" :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-option v-for="item in typeList" :key="item.name" :label="item.name" :value="item.value">
- </el-option>
- </el-select>
+ <el-input v-model="user.jobTitle" placeholder="璇疯緭鍏ュ綋鍓嶈亴鍔�" :disabled="true"></el-input>
</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> -->
+ <el-form-item class="optionItem" label="濉啓鎵�灞瀖ac鍦板潃:" prop="mac">
+ <el-input v-model="user.mac" placeholder="璇峰～鍐欐墍灞瀖ac鍦板潃" disabled></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="濉啓鎵�灞瀒p鍦板潃:" prop="ip">
+ <el-input v-model="user.ip" placeholder="璇峰～鍐欐墍灞瀒p鍦板潃" disabled></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">鎻愪氦
@@ -110,26 +109,34 @@
const validateNickname = (rule, value, callback) => {
if (!value) {
callback(new Error("璇峰～鍐欑敤鎴峰悕绉�"));
+ } else {
+ callback();
}
};
const validatePass = (rule, value, callback) => {
if (!value) {
callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
} else {
- const rep = /^\w+$/;
- if (!rep.test(value)) {
- callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
- }
+ callback();
+ // const rep = /^\w+$/;
+ // if (!rep.test(value)) {
+ // callback(new Error("瀵嗙爜鍙兘鏄互鏁板瓧銆�26涓嫳鏂囧瓧姣嶆垨鑰呬笅鍒掔嚎缁勬垚鐨勫瓧绗︿覆"));
+ // } else {
+ // callback();
+ // }
}
};
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 = /^[\u4E00-\u9FA5]{2,4}$/;
+ // if (!rep.test(value)) {
+ // callback("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
+ // } else {
+ // callback();
+ // }
}
};
const validatePhone = (rule, value, callback) => {
@@ -139,6 +146,8 @@
const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
if (!rep.test(value)) {
callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
+ } else {
+ callback();
}
}
};
@@ -147,47 +156,52 @@
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();
}
- }
- };
- const validateRole = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
} else {
callback();
}
};
+ // const validateRole = (rule, value, callback) => {
+ // console.log(value);
+ // if (!value) {
+ // callback(new Error("璇烽�夋嫨鐢ㄦ埛瑙掕壊"));
+ // } else {
+ // callback();
+ // }
+ // };
const validateType = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
+ if (!value && value !== 0) {
+ callback(new Error("璇烽�夋嫨鐢ㄦ埛绫诲瀷"));
} else {
callback();
}
};
const validateDepartment = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
+ if (!value && value !== 0) {
+ callback(new Error("璇烽�夋嫨鎵�灞為儴闂�"));
} else {
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("璇峰～鍐欑櫥褰曞瘑鐮�"));
+ callback();
} else {
callback();
}
};
const validateIp = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
+ callback();
} else {
callback();
}
@@ -197,7 +211,7 @@
nickName: '',
password: '',
username: '',
- // gender: 1,
+ sex: 1,
isDy: 1,
mobile: '',
email: '',
@@ -208,10 +222,10 @@
phoneNumber: "",
moreNumber: "",
},
- departmentId: null,
- jobTitle: null,
- // mac: '',
- // ip: '',
+ // departmentId: null,
+ // jobTitle: null,
+ mac: '',
+ ip: '',
},
createUserRules: {
nickName: [
@@ -223,9 +237,9 @@
username: [
{ required: true, trigger: "blur", validator: validateTruename },
],
- // gender: [
- // { required: true, trigger: "blur" },
- // ],
+ sex: [
+ { required: true, trigger: "blur" },
+ ],
isDy: [
{ required: true, trigger: "blur" },
],
@@ -236,16 +250,16 @@
{ required: false, trigger: "blur", validator: validateMail },
],
// role: [
- // { required: true, trigger: "blur", validator: validateRole },
+ // { 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 },
@@ -260,35 +274,126 @@
roleList: [
{ name: '瑙掕壊1', value: 1 }, { name: '瑙掕壊2', value: 2 }
],
- typeList: []
+ typeList: [],
+ departList: []
}
},
created() {
const that = this;
this.user = JSON.parse(JSON.stringify(that.userInfo));
- // 鑾峰彇瑙掕壊鍒楄〃
- // this.$axios.get('')
- // 鑾峰彇鐢ㄦ埛绫诲瀷鍒楄〃
- // this.$axios.get('sccg/admin/list',{userType:0}).then(res=>{
- // console.log(res);
- // })
+ console.log(this.user);
+ // 鑾峰彇鎵�鏈夎鑹插垪琛�
+ this.getRoleList();
+ // 鑾峰彇褰撳墠鐢ㄦ埛瑙掕壊鍒楄〃
+ this.getUserRole(this.user.id)
// 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
this.$axios.get('sccg/depart/page').then(res => {
- that.typeList = res.data.records;
+ that.departList = res.data.records;
})
},
methods: {
- handleUser() {
- const { user } = this;
- this.$axios.post('sccg/depart/status', {
- id: user.departmentId,
- status: user.status ? 1 : 0,
- }).then(res => {
- console.log(res);
+ changeDepart(data) {
+ console.log(data);
+ this.departList.forEach(item => {
+ if (item.id === data) {
+ this.user.departName = item.departName;
+ }
})
+ },
+ // 淇敼鐢ㄦ埛淇℃伅
+ handleUser() {
+ const { depart, role } = this.flag;
+ this.$refs.user.validate((valid) => {
+ if (valid) {
+ const { user } = this;
+ user.isDy = `${user.isDy}`;
+ if (depart) {
+ console.log(this.user);
+ this.$axios({
+ method: 'post',
+ url: `sccg/admin/update/${user.id}`,
+ data: {
+ "id": user.id,
+ "username": user.username,
+ "password": user.password,
+ "icon": user.icon,
+ "email": user.email,
+ "nickName": user.nickName,
+ "note": user.note,
+ "createTime": user.createTime,
+ "loginTime": user.loginTime,
+ "status": user.status ? 1 : 0,
+ "macAddress": user.macAddress,
+ "ipAddress": user.ipAddress,
+ "isDy": `${user.isDy}`,
+ "sex": `${user.sex}`,
+ "jobTitle": user.jobTitle,
+ "departmentId": user.departmentId,
+ "departName": user.departName,
+ "userType": user.userType,
+ "zj": user.zj,
+ "mobile": user.mobile,
+ }
+ })
+ .then(res => {
+ this.$message({
+ type: res.code === 200 ? 'success' : 'warning',
+ message: res.message,
+ })
+ this.getUserList();
+ this.$emit('closeDialog', { flag: false });
+ })
+ } else {
+ this.$axios({
+ method: 'post',
+ url: 'sccg/admin/role/update?adminId=' + user.id + '&roleIds=' + user.role,
+ })
+ .then(res => {
+ this.$message({
+ type: res.code === 200 ? 'success' : 'warning',
+ message: res.message,
+ })
+ this.getUserList();
+ this.$emit('closeDialog', { flag: false });
+ })
+ }
+ } else {
+ return false;
+ }
+ })
+ },
+ // 鑾峰彇瑙掕壊鍒楄〃
+ getRoleList() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/role/listAll',
+ })
+ .then(res => {
+ this.roleList = res.data;
+ })
+ },
+ // 鏀瑰彉鐢ㄦ埛瑙掕壊
+ handleChangeRole(data) {
+ console.log(this.user.role);
+ // console.log(data);
+ },
+ // 鑾峰彇鐢ㄦ埛鐨勮鑹插垪琛�
+ getUserRole(id) {
+ this.$axios({
+ method: 'get',
+ url: `sccg/admin/role/${id}`
+ })
+ .then(res => {
+ console.log(res);
+ const arr = [];
+ res.data.forEach(item => {
+ arr.push(item.id);
+ })
+ this.user.role = arr;
+ })
}
},
- props: ['userInfo', 'updateFlag']
+ props: ['userInfo', 'updateFlag', 'flag', 'closeDialog', 'getUserList']
}
</script>
<style lang="scss" scoped>
@@ -296,44 +401,30 @@
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;
- // }
+ :deep(.el-tag) {
+ background-color: #09152f;
+ }
- // .headerTip span {
- // color: #ff3b6c;
- // }
+ .el-select-dropdown.is-multiple .el-select-dropdown__item.selected {
+ background-color: #09152f;
+ color: #4b9bb7;
+ }
- // .headerTip label {
- // color: #4b9bb7;
- // }
+ // .el-select-dropdown__item :deep(.selected){
+ // background-color: #09152f;
+ // color: #4b9bb7;
// }
-
main {
- // 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;
- // }
.mainContent {
display: flex;
justify-content: center;
padding-top: 50px;
+
.el-form-item__content {
width: 400px;
--
Gitblit v1.8.0