优化用户组件

src/views/mdp/sys/branch/BranchSelect.vue

@@ -52,7 +52,8 @@
 					pageSize:10,//每页数据
 					pageNum:1,//当前页码、从1开始计算
 					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+					orderDirs:[],//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+					count:false,
 				},
 				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				sels: [],//列表选中数据
@@ -109,7 +110,7 @@
 				let params = {
 					pageSize: this.pageInfo.pageSize,
 					pageNum: this.pageInfo.pageNum,
-					total: this.pageInfo.total,countSql:this.pageInfo.countSql
+					total: this.pageInfo.total,count:this.pageInfo.count
 				};
 				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
 					let orderBys=[];
@@ -119,9 +120,7 @@
 					params.orderBy= orderBys.join(",")
 				}
 				if(this.filters.key!==""){
-					//params.xxx=this.filters.key
-				}else{
-					//params.xxx=xxxxx
+					params.key=this.filters.key
 				} 
 				if( !this.userInfo.isSuperAdmin){
 					params.id=this.userInfo.branchId;
@@ -130,7 +129,7 @@
 				listBranch(params).then((res) => {
 					var tips=res.data.tips;
 					if(tips.isOk){ 
-						this.pageInfo.total = res.data.data.total;this.pageInfo.countSql=false;
+						this.pageInfo.total = res.data.total;this.pageInfo.count=false;
 						this.branchs = res.data.data;
 					}else{
 						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });

src/views/mdp/sys/dept/DeptTree.vue

@@ -118,6 +118,8 @@
 				  branchVisible: false,
 				  branch:null,
 				  expandRowKeys:[],
+				  root:null,
+				  resolve:null,
 			  }
 		  },
 		  methods: {
@@ -212,64 +214,8 @@
 			  },
 			  //获取分类树列表
 			  getDeptTreeData(refresh) { 
-
-				let params = {
-
-				};
- 				params.branchId=this.branchId
- 				if(this.userInfo.isSuperAdmin==true || this.userInfo.isPlatformAdmin==true){
- 					if(this.branch!=null){
- 						params.branchId=this.branch.id
- 					}else if(params.branchId==null || params.branchId==''){
- 						params.branchId=this.userInfo.branchId
- 					}
- 				}else{
- 					if(params.branchId==null || params.branchId==''){
- 						params.branchId=this.userInfo.branchId
-					 }
-					// params.autoDetectParentDeptid="1"
- 				}
-				this.listLoading = true;
-				listTreeDept(params).then((res) => {
-					var tips=res.data.tips;
-					var data=res.data.data;
-					if(tips.isOk==true){
-						if( this.showRoot===undefined || this.showRoot===false||this.showRoot==='false'){
-							if(data==null){
-								this.depts=[];
-							}else{
-								if(this.branch!=null){
-									res.data.data.branchId=this.branch.id
-									res.data.data.deptName=this.branch.branchName+'(机构)'
-									res.data.data.isBranch=true
-								}else {
-									res.data.data.branchId=this.userInfo.branchId
-									res.data.data.deptName=this.userInfo.branchName+'(机构)'
-									res.data.data.isBranch=true
-								}
-								this.depts=data
-							}
-
-						}else{
-							if(this.branch!=null){
-								res.data.data.branchId=this.branch.id
-								res.data.data.deptName=this.branch.branchName+'(机构)'
-								res.data.data.isBranch=true
-							}else {
-								res.data.data.branchId=this.userInfo.branchId
-								res.data.data.deptName=this.userInfo.branchName+'(机构)'
-								res.data.data.isBranch=true
-							}
-							this.depts=data;
-						}
-
-					}else{
-						this.$notify({ message: tips.msg, type: 'error'});
-					}
-					this.listLoading = false;
-				}).catch(() => {
-					this.listLoading = false;
-				});
+				  this.root.childNodes=[]
+				   this.loadNode(this.root,this.resolve)
 			  },
 			  filterDeptNode(value, data) {
 				  if (!value) return true;
@@ -305,6 +251,8 @@
 				},
 				loadNode(node, resolve) {
 					  if (node.level === 0) {
+						  this.root=node
+						  this.resolve=resolve
 						  let params = {
 							  levelTypes:['L1']
 						  };
@@ -392,3 +340,4 @@
 	  width:100%;
   }
   </style>
+  

src/views/mdp/sys/user/UserMng.vue

@@ -454,6 +454,10 @@ export default {
         if (params.deptid == null || params.deptid == "") {
           //params.deptid=this.userInfo.deptid;
         }
+      }else{
+        if(this.branch && this.branch.id){
+          params.branchId=this.branch.id
+        }
       }
       console.log("kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk");
       console.log(params);

src/views/mdp/sys/user/UsersSelectOnly.vue

@@ -184,6 +184,9 @@
 				if( deptids && deptids.length>0){
 					params.deptid=deptids[0]
 				}   
+				if(this.branch && this.branch.id){
+					params.branchId=this.branch.id
+				}
 				this.load.list = true;
 				listUser(params).then((res) => {
 					var tips=res.data.tips;