组织机构配置权限功能完善

@@ -161,6 +161,7 @@
 				   :close-on-click-modal="false"
 				   :close-on-click-modal="false"
 				   top="5vh" width="75%"
 				   top="5vh" width="75%"
 		>
 		>
+			<div v-loading.lock="isLoading">
 				<template>
 				<template>
 					<el-tabs style="border: 0px;background-color: rgba(0,0,0,0)" v-model="activeName" @tab-click="handleClick">
 					<el-tabs style="border: 0px;background-color: rgba(0,0,0,0)" v-model="activeName" @tab-click="handleClick">
 						<el-tab-pane  style="border: 0px;background-color: rgba(0,0,0,0)" label="权限管理" name="first">
 						<el-tab-pane  style="border: 0px;background-color: rgba(0,0,0,0)" label="权限管理" name="first">
@@ -203,6 +204,8 @@
 						</el-tab-pane>
 						</el-tab-pane>
 					</el-tabs>
 					</el-tabs>
 				</template>
 				</template>
+
+			</div>
 		</el-dialog>
 		</el-dialog>
 	</section>
 	</section>
 </template>
 </template>
@@ -268,6 +271,8 @@
                 pageNum: 1,
                 pageNum: 1,
                 pageSize: 5,
                 pageSize: 5,
 				listLoading: false,
 				listLoading: false,
+				loading:{},
+				isLoading: false,
 				sels: [],//列表选中列
 				sels: [],//列表选中列
 				dialogMap: {
 				dialogMap: {
 					update: '编辑',
 					update: '编辑',
@@ -486,6 +491,14 @@
 			},
 			},
 			// 配置权限管理
 			// 配置权限管理
             setPerm: function (index, row) {
             setPerm: function (index, row) {
+				// this.loading = this.$loading({
+				// 	lock: true,
+				// 	text: '加载中',
+				// 	spinner: 'el-icon-loading',
+				// 	background: 'rgba(0, 0, 0, 0.7)',
+				// 	fullscreen: true
+				// });
+				this.isLoading = true;
                 this.PermFormVisible = true;
                 this.PermFormVisible = true;
 				this.activeName= 'first';
 				this.activeName= 'first';
                 //获取接口权限
                 //获取接口权限
@@ -530,6 +543,8 @@
 				}).catch(error => {
 				}).catch(error => {
 					// 关闭加载
 					// 关闭加载
 					_this.$message.error(error.toString())
 					_this.$message.error(error.toString())
+				}).finally(()=>{
+					this.isLoading = false;
 				})
 				})
 			},
 			},
 			// 配置数据权限
 			// 配置数据权限
@@ -548,30 +563,6 @@
 					this.$refs.trees.setCheckedKeys(this.permForms.permissionIds);
 					this.$refs.trees.setCheckedKeys(this.permForms.permissionIds);
 				});
 				});
 			},
 			},
-			//提交数据权限
-			setDataPerm(){
-				let _this = this;
-
-				if (this.currentRolePermList && this.currentRolePermList.length>0){
-					this.currentRolePermList.forEach((v,i) =>{
-						_this.permForms.permissionIds[i]=v.data_perm_id;
-					})
-				}
-				dataPermSet(this.permForms).then((response) => {
-					const res = response.data
-					// 添加失败
-					if (res.code !== '200') {
-						// 关闭加载
-						return this.$message.error(res.msg)
-					}
-					// 添加，成功
-					this.$message.success(res.msg)
-					// 隐藏对话框
-					this.PermFormVisible = false;
-				}).catch(error => {
-					this.$message.error(error.toString())
-				})
-			},
 			//显示新增界面，每次点开初始化数据
 			//显示新增界面，每次点开初始化数据
 			handleAdd: function (index,row) {
 			handleAdd: function (index,row) {
 				this.addFormVisible = true;
 				this.addFormVisible = true;
@@ -789,8 +780,37 @@
 					// }
 					// }
 				}
 				}
 			},
 			},
-			dataPermTreeClickDeal: function (currentObj, treeStatus) {
-				this.permForms.permissionIds.push(currentObj.data_perm_id);
+			dataPermTreeClickDeal: function (currentObj, tree) {
+				// alert(JSON.stringify(tree.checkedKeys))
+				// alert("选择前的数组="+this.permForms.permissionIds)
+				this.permForms.permissionIds = tree.checkedKeys
+				// alert("选择后的数组="+this.permForms.permissionIds)
+			},
+			//提交数据权限
+			setDataPerm(){
+				this.loading = this.$loading({
+					lock: true,
+					text: '正在提交',
+					spinner: 'el-icon-loading',
+					background: 'rgba(0, 0, 0, 0.7)'
+				});
+				let _this = this;
+				dataPermSet(this.permForms).then((response) => {
+					const res = response.data
+					// 添加失败
+					if (res.code !== '200') {
+						// 关闭加载
+						return this.$message.error(res.msg)
+					}
+					// 添加，成功
+					this.$message.success(res.msg)
+					// 隐藏对话框
+					this.PermFormVisible = false;
+				}).catch(error => {
+					this.$message.error(error.toString())
+				}).finally(()=>{
+					this.loading.close()
+				})
 			},
 			},
 
 
 		},
 		},
@@ -805,6 +825,7 @@
 				}
 				}
 			};
 			};
 			this.isExpansion=true;
 			this.isExpansion=true;
+
 		}
 		}
 	}
 	}