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 | 121 ++++++++++++++++++++++++++++++----------
1 files changed, 91 insertions(+), 30 deletions(-)
diff --git a/src/views/systemSetting/baseSetting/department/createUser/index.vue b/src/views/systemSetting/baseSetting/department/createUser/index.vue
index d0e0582..f07eccf 100644
--- a/src/views/systemSetting/baseSetting/department/createUser/index.vue
+++ b/src/views/systemSetting/baseSetting/department/createUser/index.vue
@@ -11,8 +11,10 @@
<!-- 涓婄骇閮ㄩ棬 -->
<el-form-item class="optionItems" label="涓婄骇閮ㄩ棬:" prop="parentId">
<el-select v-model="depart.parentId" placeholder="璇疯緭鍏ヤ笂绾ч儴闂�">
- <el-option v-for="item in departList" :key="item.departName" :label="item.departName"
- :value="item.id" :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>
@@ -23,15 +25,19 @@
:value="item.id">
</el-option>
</el-select>
- <!-- <el-input v-model="depart.departType" placeholder="璇烽�夋嫨閮ㄩ棬绫诲瀷"></el-input> -->
</el-form-item>
<!--娣诲姞浜哄憳 -->
<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" @click="openUser = true"></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">
@@ -66,6 +72,7 @@
</div>
</template>
<script>
+import { getTypeList } from '@/utils/helper'
export default {
data() {
const validateNickname = (rule, value, callback) => {
@@ -86,10 +93,6 @@
if (!value) {
callback();
} else {
- // const rep = /(^1[3|4|5|7|8|9]\d{9}$)|(^09\d{8}$)/
- // if (!rep.test(value)) {
- // callback("璇疯緭鍏ユ纭殑鎵嬫満鍙风爜");
- // }
callback();
}
};
@@ -117,8 +120,17 @@
userList: [],
departList: [],
checkedUser: [],
+ cehckedList: [],
openUser: false,
departTypeList: [],
+ selectOrg: {
+ orgsid: []
+ },
+ mylabel: '',
+ defaultProps: {
+ children: 'children',
+ label: 'departName',
+ },
}
},
created() {
@@ -134,23 +146,18 @@
handleUser() {
this.$refs.user.validate((valid) => {
if (valid) {
- const { depart, checkedUser, userList } = this;
- console.log(depart);
- console.log(checkedUser);
+ const { depart,cehckedList,selectOrg } = this;
const arr = [];
- checkedUser.forEach(item => {
- userList.forEach(child => {
- if (item === child.id) {
- arr.push({ isLeader: 0, userId: item,});
- }
- })
+ cehckedList.forEach(item => {
+ arr.push({ isLeader: item.isLeader, userId: item.id, });
})
+ console.log(arr);
this.$axios({
method: 'post',
- url:'/sccg/depart/create',
+ url: '/sccg/depart/create',
data: {
departName: depart.departName,
- parentId: depart.parentId, departType: depart.departType, departDes: depart.departDes,
+ parentId: selectOrg.orgsid[0], departType: depart.departType, departDes: depart.departDes,
departManagerList: arr
}
}).then(res => {
@@ -180,6 +187,7 @@
url: 'sccg/depart/tree',
})
.then(res => {
+ console.log(res);
res.data.unshift({ id: 0, departName: '椤剁骇鑿滃崟' })
this.departList = res.data;
})
@@ -195,21 +203,65 @@
},
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 });
},
// 鑾峰彇閮ㄩ棬绫诲瀷
- getDepartTypeList() {
- this.$axios({
- method: 'get',
- url: 'sccg/dict/query_depart_type',
- })
- .then(res => {
- console.log(res);
- this.departTypeList = res.data;
+ 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', 'changMyDialog']
@@ -341,6 +393,15 @@
}
}
+ .li-item {
+ display: flex;
+ flex-direction: column;
+ }
+
+ .leader {
+ color: red;
+ }
+
footer {
border-top: 1px solid #fff;
height: 80px;
--
Gitblit v1.8.0