From eafd90c248a7e0560f98c957eaf05cb6e71e2f3b Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期四, 09 二月 2023 10:40:47 +0800
Subject: [PATCH] 2022/2/9 肖辉 部门管理处理
---
package-lock.json | 18 ++-------
src/views/systemSetting/baseSetting/user/components/main/index.vue | 1
src/views/operate/baseSetting/violation/createUser/index.vue | 70 ++++++++++++++++++++--------------
3 files changed, 46 insertions(+), 43 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..5cb676d 100644
--- a/src/views/operate/baseSetting/violation/createUser/index.vue
+++ b/src/views/operate/baseSetting/violation/createUser/index.vue
@@ -18,9 +18,10 @@
</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
+ <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>
@@ -221,7 +222,7 @@
item.children = [];
})
} else if (index === 3) {
-
+
this.parentList = this.addChildren(await this.getTypeThird(), await this.getTypeSecond());
console.log(this.parentList);
} else {
@@ -243,32 +244,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鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
- 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鐨勬椂鍊欙紝浠ｈ〃涓嶈兘鍐嶆閫夋嫨銆�
+ // 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 +352,4 @@
// font-size: 10px;
// }
}
-</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 b7cfaa8..d34337e 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