From e38da5941faf1f9120fe089cc884e0b48091452c Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 09 二月 2023 11:56:34 +0800 Subject: [PATCH] Merge branch 'dev1.0' of http://42.193.1.25:9521/r/sccg_ui into dev1.0 --- src/views/systemSetting/baseSetting/department/createUser/index.vue | 91 +++++++++++++++------- package-lock.json | 18 +--- src/views/systemSetting/baseSetting/user/components/main/index.vue | 1 src/views/operate/baseSetting/violation/createUser/index.vue | 77 +++++++++++------- 4 files changed, 113 insertions(+), 74 deletions(-) diff --git a/package-lock.json b/package-lock.json index c3b75ad..7a61506 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,8 +18,6 @@ "file-saver": "^2.0.5", "jszip": "^3.10.1", "jszip-utils": "^0.1.0", - "leaflet": "^1.9.3", - "leaflet.chinatmsproviders": "^3.0.6", "leaflet.pm": "^2.2.0", "normalize.css": "^8.0.1", "pizzip": "^3.1.3", @@ -6741,12 +6739,8 @@ "node_modules/leaflet": { "version": "1.9.3", "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.3.tgz", - "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==" - }, - "node_modules/leaflet.chinatmsproviders": { - "version": "3.0.6", - "resolved": "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz", - "integrity": "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g==" + "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==", + "peer": true }, "node_modules/leaflet.pm": { "version": "2.2.0", @@ -17570,12 +17564,8 @@ "leaflet": { "version": "1.9.3", "resolved": "https://registry.npmmirror.com/leaflet/-/leaflet-1.9.3.tgz", - "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==" - }, - "leaflet.chinatmsproviders": { - "version": "3.0.6", - "resolved": "https://registry.npmmirror.com/leaflet.chinatmsproviders/-/leaflet.chinatmsproviders-3.0.6.tgz", - "integrity": "sha512-B4UPSn2MT//RkFoyrVjwqQyfKuf4tSmMjJDKQ6nqwCCGgirYKRWHafSH9JmA88WoG5pkuMXBcKQhY32FobxU/g==" + "integrity": "sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==", + "peer": true }, "leaflet.pm": { "version": "2.2.0", diff --git a/src/views/operate/baseSetting/violation/createUser/index.vue b/src/views/operate/baseSetting/violation/createUser/index.vue index ac29bfb..218a29d 100644 --- a/src/views/operate/baseSetting/violation/createUser/index.vue +++ b/src/views/operate/baseSetting/violation/createUser/index.vue @@ -18,10 +18,16 @@ </el-form-item> <!-- 鐖剁骇id --> <el-form-item class="optionItem" label="鐖剁骇:" prop="parentId"> - <el-select v-model="things.parentId" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" :disabled="things.level===1"> + <el-select ref="projectApplicant" v-model="things.parentId" placeholder="璇烽�夋嫨鎵�灞炵被鍨�" :disabled="things.level===1"> <el-option :value="mylabel"> - <el-tree ref="tree" :check-strictly="true" :data="parentList" :props="defaultProps" show-checkbox - @check-change="handleCheck" default-expand-all node-key="id"> + <el-tree ref="tree" + :check-strictly="true" + :data="parentList" + :props="defaultProps" + @node-click="handleCheck" + @check-change="handleCheck" + default-expand-all + node-key="id"> </el-tree> </el-option> </el-select> @@ -221,7 +227,7 @@ item.children = []; }) } else if (index === 3) { - + this.parentList = this.addChildren(await this.getTypeThird(), await this.getTypeSecond()); console.log(this.parentList); } else { @@ -243,32 +249,43 @@ return parentArr; }, handleCheck(data, checked) { + console.log(this.selectOrg.orgsid,data,checked); + //鍙兘鐐瑰嚮鏈�鍚庝竴绾� + if(checked.childNodes.length == 0){ this.things.parentId = data.name; - console.log(this.selectOrg.orgsid); - // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮� - const indexs = this.selectOrg.orgsid.indexOf(data.id) - // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠h〃涓嶈兘鍐嶆閫夋嫨銆� - if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) { - this.$message({ - message: '鍙兘閫夋嫨涓�涓尯鍩燂紒', - type: 'error', - 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 = [] - } + let _this = this; + _this.$refs.projectApplicant.blur(); + this.selectOrg.orgsid = [] + this.selectOrg.orgsid.push(data.id) + }else { + return + } + // // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮� + // const indexs = this.selectOrg.orgsid.indexOf(data.id) + // // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠h〃涓嶈兘鍐嶆閫夋嫨銆� + // if (indexs < 0 && this.selectOrg.orgsid.length === 1 && checked) { + // this.$message({ + // message: '鍙兘閫夋嫨涓�涓尯鍩燂紒', + // type: 'error', + // showClose: true + // }) + // // 璁剧疆宸查�夋嫨鐨勮妭鐐逛负false 寰堥噸瑕� + // this.$refs.tree.setChecked(data, false) + // } else if (this.selectOrg.orgsid.length === 0 && checked) { + // // 鍙戠幇鏁扮粍涓虹┖ 骞朵笖鏄凡閫夋嫨 + // // 闃叉鏁扮粍鏈夊�硷紝棣栧厛娓呯┖锛屽啀push + // let _this = this; + // _this.$refs.projectApplicant.blur(); + // this.selectOrg.orgsid = [] + // this.selectOrg.orgsid.push(data.id) + // } else if ( + // indexs >= 0 && + // this.selectOrg.orgsid.length === 1 && + // !checked + // ) { + // // 鍐嶆鐩存帴杩涜璧嬪�间负绌烘搷浣� + // this.selectOrg.orgsid = [] + // } }, }, props: ['changeDialog'] @@ -340,4 +357,4 @@ // font-size: 10px; // } } -</style> \ No newline at end of file +</style> diff --git a/src/views/systemSetting/baseSetting/department/createUser/index.vue b/src/views/systemSetting/baseSetting/department/createUser/index.vue index 9756121..bd9769c 100644 --- a/src/views/systemSetting/baseSetting/department/createUser/index.vue +++ b/src/views/systemSetting/baseSetting/department/createUser/index.vue @@ -19,14 +19,14 @@ </el-form-item> <!-- 涓婄骇閮ㄩ棬 --> <el-form-item class="optionItems" label="涓婄骇閮ㄩ棬:" prop="parentId"> - <el-select v-model="depart.parentId" placeholder="璇疯緭鍏ヤ笂绾ч儴闂�"> - <el-option :value="mylabel"> + <el-select ref="projectApplicant" v-model="depart.parentId" placeholder="璇疯緭鍏ヤ笂绾ч儴闂�"> + <el-option :value="mylabel"> <el-tree ref="tree" :check-strictly="true" :data="departList" :props="defaultProps" - show-checkbox + @node-click="handleCheck" @check-change="handleCheck" default-expand-all node-key="id" @@ -74,12 +74,18 @@ <li class="li-btn"> <i class="el-icon-plus" @click="openUser = true"></i> </li> + <li class="li-btn"> + <el-tooltip class="item" effect="light" content="娓呴櫎閫変腑浜哄憳" placement="top" :enterable="false"> + <i class="el-icon-minus" @click="clrarUser"></i> + </el-tooltip> + + </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 class="box-card-sub" @click="addUser">纭</div> </div> <div class="scrollWrap"> <el-checkbox-group v-model="checkedUser"> @@ -270,6 +276,10 @@ if (this.checkedList.length > 0) this.checkedList[0].leader = true; this.openUser = false; }, + // 娓呴櫎閫変腑鐢ㄦ埛 + clrarUser(){ + this.checkedUser=[] + }, handleClose() { this.$emit("changMyDialog", { flag: false }); }, @@ -278,32 +288,42 @@ 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鐨勬椂鍊欙紝浠h〃涓嶈兘鍐嶆閫夋嫨銆� - 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 = ""; + if(checked.childNodes.length == 0){ + this.depart.parentId = data.departName; + let _this = this; + _this.$refs.projectApplicant.blur(); + this.selectOrg.orgsid = [] + this.selectOrg.orgsid.push(data.id) + }else { + return } + + // this.depart.parentId = data.departName; + // // 鑾峰彇褰撳墠閫夋嫨鐨刬d鍦ㄦ暟缁勪腑鐨勭储寮� + // const indexs = this.selectOrg.orgsid.indexOf(data.id); + // // 濡傛灉涓嶅瓨鍦ㄦ暟缁勪腑锛屽苟涓旀暟缁勪腑宸茬粡鏈変竴涓猧d骞朵笖checked涓簍rue鐨勬椂鍊欙紝浠h〃涓嶈兘鍐嶆閫夋嫨銆� + // 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) { @@ -370,6 +390,12 @@ width: 36px; height: 36px; border-radius: 50%; + .el-icon-plus{ + cursor: pointer; + } + .el-icon-minus{ + cursor: pointer; + } } .el-form-item__content { width: 400px; @@ -431,6 +457,11 @@ // color: #4b9bb7; display: flex; justify-content: space-between; + .box-card-sub{ + color: #2f54eb; + margin-left: 5px; + cursor: pointer; + } } .hidebar { @@ -470,4 +501,4 @@ padding-right: 20px; } } -</style> \ No newline at end of file +</style> diff --git a/src/views/systemSetting/baseSetting/user/components/main/index.vue b/src/views/systemSetting/baseSetting/user/components/main/index.vue index 26e0685..3cb07b3 100644 --- a/src/views/systemSetting/baseSetting/user/components/main/index.vue +++ b/src/views/systemSetting/baseSetting/user/components/main/index.vue @@ -261,6 +261,7 @@ url: "sccg/admin/deleteBatch?ids=" + idArr, }).then((res) => { if (res.code === 200) { + this.$message({ type: "success", message: "鍒犻櫎鐢ㄦ埛淇℃伅鎴愬姛", -- Gitblit v1.8.0