From 0d7d6fc9a5c40ccc90190b0f24039ec1362f120f Mon Sep 17 00:00:00 2001
From: “dzb” <2632970487@qq.com>
Date: 星期一, 17 十月 2022 11:33:10 +0800
Subject: [PATCH] 新增设备管理、完善消息新增,修改bug
---
src/views/systemSetting/baseSetting/department/createUser/index.vue | 364 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 263 insertions(+), 101 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/department/createUser/index.vue b/src/views/systemSetting/baseSetting/department/createUser/index.vue
index c1f8a44..f07eccf 100644
--- a/src/views/systemSetting/baseSetting/department/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/createUser/index.vue
@@ -1,11 +1,5 @@
<template>
<div class="createUser">
- <header>
- <div class="headerTitle">鏂板閮ㄩ棬淇℃伅</div>
- <div class="headerTip">
- <label>x</label>
- </div>
- </header>
<main>
<div class="mainContent">
<el-form ref="user" label-width="140px" autoComplete="on" :model="depart" :rules="createDepartRules"
@@ -17,79 +11,89 @@
<!-- 涓婄骇閮ㄩ棬 -->
<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 :value="mylabel">
+ <el-tree ref="tree" :check-strictly="true" :data="departList" :props="defaultProps"
+ show-checkbox @check-change="handleCheck" default-expand-all node-key="id">
+ </el-tree>
</el-option>
</el-select>
</el-form-item>
<!-- 閮ㄩ棬绫诲瀷 -->
<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 v-for="item in departTypeList" :key="item.id" :label="item.name"
+ :value="item.id">
</el-option>
</el-select>
</el-form-item>
<!--娣诲姞浜哄憳 -->
- <el-form-item class="optionItem" label="娣诲姞浜哄憳:">
+ <el-form-item class="optionItem add" 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>
+ <li v-for="(item,index) in cehckedList" :key="index" @click="setLeader(index)">
+ <div class="li-item">
+ <div class="li-icon">
+ <i :class="['el-icon-user-solid',item.checked ? 'leader': '']"></i>
+ </div>
+ <label style="font-size: 12px;" :class="[item.checked ? 'leader': '']">{{item.username}}</label>
+ </div>
+ </li>
+ <li class="li-btn"><i class="el-icon-plus" @click="openUser = true"></i></li>
</ul>
+ <div class="card" v-if="openUser">
+ <el-card class="box-card">
+ <div slot="header" class="myclear">
+ <span>宸ヤ綔浜哄憳</span>
+ <div @click="addUser">娣诲姞</div>
+ </div>
+ <div class="scrollWrap">
+ <el-checkbox-group v-model="checkedUser">
+ <el-checkbox v-for="user in userList" :label="user.id" :key="user.id">
+ {{user.username}}
+ </el-checkbox>
+ </el-checkbox-group>
+ </div>
+ <div class="hidebar"></div>
+ </el-card>
+ </div>
</el-form-item>
<!-- 閮ㄩ棬鎻忚堪 -->
<el-form-item class="optionItem" label="閮ㄩ棬鎻忚堪:" prop="departDes">
- <el-input v-model="depart.departDes" placeholder="璇疯緭鍏ラ儴闂ㄦ弿杩�"></el-input>
+ <el-input type="textarea" 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>
+ <el-button @click="handleClose">鍙栨秷</el-button>
+ <el-button type="primary" class="btn submit" @click="handleUser">纭畾</el-button>
+ </div>
</footer>
</div>
</template>
<script>
+import { getTypeList } from '@/utils/helper'
export default {
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();
} 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 validatePhone = (rule, value, callback) => {
if (!value) {
- callback(new Error("璇峰～鍐欐墜鏈哄彿鐮�"));
+ callback();
} else {
- const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- if (!rep.test(value)) {
- callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- }
+ callback();
}
};
return {
@@ -104,56 +108,163 @@
{ required: true, trigger: "blur", validator: validateNickname },
],
parentId: [
- { required: true, trigger: "blur", validator: validatePass },
+ { required: false, trigger: "blur", validator: validatePass },
],
departType: [
- { required: true, trigger: "blur", validator: validateTruename },
+ { required: false, trigger: "blur", validator: validatePhone },
],
departDes: [
- { required: true, trigger: "blur" },
+ { required: false, trigger: "blur" },
],
},
- roleList: [
- { name: '瑙掕壊1', value: 1 }, { name: '瑙掕壊2', value: 2 }
- ],
- typeList: []
+ userList: [],
+ departList: [],
+ checkedUser: [],
+ cehckedList: [],
+ openUser: false,
+ departTypeList: [],
+ selectOrg: {
+ orgsid: []
+ },
+ mylabel: '',
+ defaultProps: {
+ children: 'children',
+ label: 'departName',
+ },
}
},
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;
- // })
+ // 鑾峰彇閮ㄩ棬鏍戝舰缁撴瀯鍥�
+ this.getDepartTree();
+ // 鑾峰彇鐢ㄦ埛鍒楄〃
+ this.getUserList();
+ // 鑾峰彇閮ㄩ棬绫诲瀷鍒楄〃
+ this.getDepartTypeList();
},
methods: {
handleUser() {
- const { user } = this;
- console.log(user);
- 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 => {
+ this.$refs.user.validate((valid) => {
+ if (valid) {
+ const { depart,cehckedList,selectOrg } = this;
+ const arr = [];
+ cehckedList.forEach(item => {
+ arr.push({ isLeader: item.isLeader, userId: item.id, });
+ })
+ console.log(arr);
+ this.$axios({
+ method: 'post',
+ url: '/sccg/depart/create',
+ data: {
+ departName: depart.departName,
+ parentId: selectOrg.orgsid[0], departType: depart.departType, departDes: depart.departDes,
+ departManagerList: arr
+ }
+ }).then(res => {
+ if (res.code === 200) {
+ this.$message({
+ message: res.message,
+ type: 'success'
+ })
+ this.refresh();
+ } else if (res.code === 2001) {
+ this.$message({
+ message: res.message,
+ type: 'error'
+ })
+ this.refresh();
+ }
+ })
+ } else {
+ return false;
+ }
+ })
+ },
+ // 鑾峰彇閮ㄩ棬鏍戝舰缁撴瀯鍥�
+ getDepartTree() {
+ this.$axios({
+ method: 'get',
+ url: 'sccg/depart/tree',
+ })
+ .then(res => {
+ console.log(res);
+ res.data.unshift({ id: 0, departName: '椤剁骇鑿滃崟' })
+ this.departList = res.data;
+ })
+ },
+ // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�
+ getUserList() {
+ // 鑾峰彇鎵�鏈夌敤鎴蜂俊鎭�佺敤鎴锋煡璇�(鏆傛椂鏀寔鐢佃瘽鍙风爜)
+ this.$axios.get(`sccg/admin/list`).then(res => {
if (res.code === 200) {
- this.refresh();
+ this.userList = res.data.records;
+ }
+ })
+ },
+ addUser() {
+ console.log(this.checkedUser);
+ console.log(this.userList);
+ this.cehckedList = [];
+ this.userList.forEach(item => {
+ this.checkedUser.forEach(child => {
+ if (item.id == child) {
+ this.cehckedList.push({ id: item.id, username: item.username, isLeader: 0, checked: false });
+ }
+ })
+ })
+ this.cehckedList[0].isLeader = 1;
+ this.cehckedList[0].checked = true;
+ this.openUser = false;
+ },
+ handleClose() {
+ this.$emit('changMyDialog', { flag: false });
+ },
+ // 鑾峰彇閮ㄩ棬绫诲瀷
+ async getDepartTypeList() {
+ this.departTypeList = await getTypeList(1, '08')
+ },
+ handleCheck(data, checked) {
+ this.depart.parentId = data.departName;
+ // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮�
+ const indexs = this.selectOrg.orgsid.indexOf(data.id)
+ // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
+ if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) {
+ this.$message({
+ message: '鍙兘閫夋嫨涓�涓儴闂紒',
+ type: 'warning',
+ showClose: true
+ })
+ // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕�
+ this.$refs.tree.setChecked(data, false)
+ } else if (this.selectOrg.orgsid.length === 0 && checked) {
+ // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨
+ // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push
+ this.selectOrg.orgsid = []
+ this.selectOrg.orgsid.push(data.id)
+ } else if (
+ indexs >= 0 &&
+ this.selectOrg.orgsid.length === 1 &&
+ !checked
+ ) {
+ // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣�
+ this.selectOrg.orgsid = []
+ this.depart.parentId = '';
+ }
+ },
+ // 璁剧疆棰嗗
+ setLeader(idx){
+ this.cehckedList.forEach((item,index)=>{
+ if(index === idx){
+ item.checked = true;
+ item.isLeader = 1;
+ }else{
+ item.checked = false;
+ item.isLeader = 0;
}
})
}
},
- props: ['refresh']
+ props: ['refresh', 'changMyDialog']
}
</script>
<style lang="scss" scoped>
@@ -161,30 +272,7 @@
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;
@@ -193,7 +281,8 @@
.mainContent {
display: flex;
justify-content: center;
- margin-top: 50px;
+ padding-top: 50px;
+
&::v-deep .el-form-item__label {
color: #4b9bb7;
}
@@ -202,11 +291,18 @@
background-color: #09152f;
border: 1px solid #17324c;
}
- .addPerson{
+
+ &::v-deep .el-textarea__inner {
+ background-color: #09152f;
+ border: 1px solid #17324c;
+ }
+
+ .addPerson {
display: flex;
list-style: none;
- padding:0;
- li{
+ padding: 0;
+
+ li {
background-color: #cccccc;
width: 36px;
height: 36px;
@@ -217,6 +313,7 @@
margin-left: 10px;
}
}
+
.el-form-item__content {
width: 400px;
@@ -239,9 +336,74 @@
}
}
+
+ .add {
+ position: relative;
+
+ .card {
+ position: absolute;
+ z-index: 2000;
+ right: 0;
+
+ .box-card {
+ max-height: 200px;
+ overflow: hidden;
+ background-color: #09152f;
+ position: relative;
+ max-width: 220px;
+
+ .scrollWrap {
+ overflow: scroll;
+ height: 160px;
+ position: relative;
+ color: #4b9bb7;
+
+ .el-checkbox-group {
+ display: flex;
+ flex-direction: column;
+
+ .el-checkbox {
+ line-height: 20px;
+ }
+ }
+ }
+
+ .myclear {
+ width: 100%;
+ line-height: 20px;
+ color: #4b9bb7;
+ display: flex;
+ justify-content: space-between;
+ }
+
+ .hidebar {
+ position: absolute;
+ top: 77px;
+ right: 20px;
+ width: 20px;
+ height: 160px;
+ background-color: #09152f;
+ }
+
+ .item {
+ line-height: 40px;
+ }
+ }
+ }
+ }
}
- footer{
- border: 1px solid #fff;
+
+ .li-item {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .leader {
+ color: red;
+ }
+
+ footer {
+ border-top: 1px solid #fff;
height: 80px;
display: flex;
align-items: center;
--
Gitblit v1.8.0