From 5b36a7e896276c4e468d6b0ef29b237eb6fc5663 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 27 十月 2022 18:26:27 +0800
Subject: [PATCH] 联调消息
---
src/views/systemSetting/baseSetting/role/updateUser/index.vue | 484 +++++++++++++++++------------------------------------
1 files changed, 155 insertions(+), 329 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/role/updateUser/index.vue b/src/views/systemSetting/baseSetting/role/updateUser/index.vue
index 72f9605..c7940b3 100644
--- a/src/views/systemSetting/baseSetting/role/updateUser/index.vue
+++ b/src/views/systemSetting/baseSetting/role/updateUser/index.vue
@@ -1,107 +1,20 @@
<template>
- <div class="createUser">
- <header>
- <div class="headerTitle">鏂板璐︽埛</div>
- <div class="headerTip">
- <span>*</span>
- <label>涓哄繀濉」</label>
- </div>
- </header>
+ <div class="updateUser">
<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.nick_name" 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="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.member">
- <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.phone" placeholder="璇峰～鍐欐墜鏈哄彿鐮�"></el-input>
- </el-form-item>
- <!-- 閭鍦板潃 -->
- <el-form-item class="optionItem" label="閭鍦板潃:" prop="email">
- <el-input v-model="user.mail" 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.type" 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.department" 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-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>
- <!-- 濉啓鎵�灞瀖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="optionBtn">
- <el-button type="primary" class="btn submit" @click.native.prevent="handleUser">鎻愪氦</el-button>
- <el-button class="btn reset">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
-
+ <div class="my-tree">
+ <div class="my-tree__wrap">
+ <el-tree ref="tree" :data="roleList" :props="defaultProps" show-checkbox @check="handleCheck"
+ :default-checked-keys="checkedIds" default-expand-all node-key="id">
+ </el-tree>
+ </div>
+ <!-- <div class="my-tree__bottom"></div> -->
+ <!-- <div class="my-tree__right"></div> -->
+ </div>
+ <div class="selection">
+ <el-button class="cancel" @click="resetRole">鍙栨秷</el-button>
+ <el-button class="save" @click="saveRole">淇濆瓨</el-button>
+ </div>
</div>
</main>
</div>
@@ -109,255 +22,168 @@
<script>
export default {
data() {
- const validateNickname = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑敤鎴峰悕绉�"));
- }
- };
- const validatePass = (rule, value, callback) => {
- if (!value) {
- callback(new Error("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } 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("璇疯緭鍏ユ纭殑鐢ㄦ埛濮撳悕");
- }
- }
- };
- 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("璇峰～鍐欑櫥褰曞瘑鐮�"));
- } 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: 1,
- mobile: '',
- email: '',
- // role: null,
- userType: null,
- zj: {
- areaNumber: '',
- phoneNumber: "",
- moreNumber: "",
- },
- departmentId: null,
- jobTitle: null,
- // mac: '',
- // ip: '',
+ role: {
+ name: '',
+ sort: '',
+ description: '',
},
- createUserRules: {
- nickName: [
- { required: true, trigger: "blur", validator: validateNickname },
- ],
- password: [
- { required: true, 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: [
- { 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: [],
+ defaultProps: {
+ children: 'children',
+ label: 'title'
},
- roleList: [
- { name: '瑙掕壊1', value: 1 }, { name: '瑙掕壊2', value: 2 }
- ],
- typeList: []
+ treeLabel: '',
+ treeId: 23,
+ checkedIds: [],
+ resCheckedIds: [],
}
},
- created() {
- const that = this ;
- // 鑾峰彇瑙掕壊鍒楄〃
- // this.$axios.get('')
- // 鑾峰彇鐢ㄦ埛绫诲瀷鍒楄〃
- // this.$axios.get('sccg/admin/list',{userType:0}).then(res=>{
- // console.log(res);
- // })
- // 鑾峰彇鍏ㄩ儴閮ㄩ棬鍒楄〃
- this.$axios.get('sccg/depart/page').then(res=>{
- that.typeList = res.data.records;
- })
+ created() {
+ const that = this;
+ this.getRoleMenus(this.userInfo.id);
+ this.getMenuList();
},
methods: {
- handleUser() {
- const that = this;
- console.log(this.user);
- // this.$axios.post('sccg/admin/register',that.user).then(res=>{
- // console.log(res);
- // })
+ // 鑾峰彇绯荤粺鑿滃崟
+ getMenuList() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/menu/treeList',
+ })
+ .then(res => {
+ this.roleList = res.data;
+ })
+ },
+ // 鏍戝舰鎺т欢澶嶉�夋鐐瑰嚮浜嬩欢
+ handleCheck(data, checked) {
+ console.log(checked.checkedKeys);
+ this.checkedIds = checked.checkedKeys;
+ console.log(this.checkedIds);
+ },
+ // 淇濆瓨role
+ saveRole() {
+ this.resCheckedIds = [];
+ const { userInfo } = this;
+ this.resCheckedIds = this.checkedIds;
+ this.$axios({
+ method: 'post',
+ url: 'sccg/role/allocMenu?roleId=' + userInfo.id + '&menuIds=' + this.checkedIds,
+ })
+ .then(res => {
+ if (res.code === 200) {
+ this.$message({
+ type: 'success',
+ message: '淇敼瑙掕壊鏉冮檺鎴愬姛',
+ })
+ this.getRoleMenus(userInfo.id);
+ this.$emit('changeDialog', { flag: false });
+ this.getUserList();
+ } else {
+ this.$message({
+ type: 'warning',
+ message: res.message
+ })
+ }
+ })
+ // this.$emit('changeDialog',{dialogUpdate:false});
+ },
+ // 娑堥櫎role
+ resetRole() {
+ this.resCheckedIds = [];
+ this.$emit('changeDialog', { dialogUpdate: false });
+ },
+ // 鑾峰彇瑙掕壊鑿滃崟
+ getRoleMenus(roleId) {
+ this.$axios({
+ method: 'get',
+ url: `sccg/role/listMenu/${roleId}`
+ })
+ .then(res => {
+ this.checkedIds = [];
+ res.data.forEach(item => {
+ this.checkedIds.push(item.id);
+ })
+ })
}
},
- props:[]
+ props: ['userInfo', 'updateFlag', 'getUserList', 'changeDialog']
}
</script>
-<style lang="scss" scpoed>
-.createUser {
+<style lang="scss" scoped>
+.updateUser {
border-radius: 1px;
- // min-width: 1024px;
- // min-height: 1450px;
- background-color: #fff;
+ background-color: #09152f;
- header {
- display: flex;
- justify-content: space-between;
- height: 60px;
- line-height: 60px;
- padding: 0 20px;
- .headerTitle {
- font-weight: 600;
- color: #666;
- }
+ main {
+ text-align: left;
+ padding: 50px 55px;
+ background-color: #09152f;
- .headerTip span {
- color: #ff3b6c;
- }
+ .mainContent {
+ .my-tree {
+ height: 200px;
+ overflow: hidden;
+ background-color: #17324c;
+ position: relative;
+ border-radius: 4px;
- .headerTip label {
- color: #999999;
+ .my-tree__wrap {
+ overflow-y: scroll;
+ height: 200px;
+ }
+
+ .my-tree__bottom {
+ position: absolute;
+ left: 0px;
+ bottom: 0px;
+ background-color: #09152f;
+ width: 100%;
+ height: 20px;
+ border-bottom-left-radius: 4px;
+ }
+
+ .my-tree__right {
+ position: absolute;
+ right: 0px;
+ top: 0px;
+ background-color: #09152f;
+ width: 20px;
+ height: 100%;
+ }
+ }
}
}
- main {
- border-top: 1px solid #f0f2f5;
- text-align: left;
- padding: 0 55px;
- .mainTitle {
- // margin-left: 60px;
- color: #666;
- font-weight: 600;
- line-height: 100px;
- font-size: 14px;
- }
+ &::v-deep .el-textarea__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
- .mainContent {
- display: flex;
- justify-content: center;
- .el-form-item__content {
- width: 400px;
+ ::v-deep .el-input__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+}
- .el-select {
- width: 100%;
- }
- }
- .optionHandleSp{
- display: flex;
- .areaNumber,.moreNumber{
- flex: 1;
- }
- .telNumber{
- flex: 2;
- }
- }
- .optionBtn{
- display: flex;
- justify-content: center;
- margin-top: 80px;
- .btn{
- padding: 12px 50px;
- }
- }
+.selection {
+ margin-top: 10px;
+ display: flex;
+ justify-content: space-between;
- }
+ .el-button {
+ padding: 10px 20px;
+ border-radius: 4px;
+ }
+
+ .save {
+ background-color: #409eff;
+ color: #fff;
+ }
+
+ .cancel {
+ background-color: #09152f;
+ color: #4b9bb7;
}
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0