Merge branch 'develop-2'

src/app/pages/system-management/department-management/department-management.component.html

@@ -8,7 +8,7 @@
 			<div class="operation-box">
 				<button (click)="addModify(1)" nz-button nzType="primary"><i nz-icon type="plus" theme="outline"></i>新增</button>
 				<button *ngIf="canEdit" (click)="addModify(2)" nz-button nzType="default"><i nz-icon type="edit" theme="outline"></i>修改</button>
-				<button *ngIf="canDel" (click)="delete" nz-button nzType="danger"><i nz-icon type="delete" theme="outline"></i>删除</button>
+				<button *ngIf="canDel" (click)="delete()" nz-button nzType="danger"><i nz-icon type="delete" theme="outline"></i>删除</button>
 			</div>
 			<nz-skeleton [nzActive]="true"  [nzParagraph]="{ rows: 16 }" *ngIf='modifyType==3&&!orgDetail'></nz-skeleton>
 			<!-- 详情 begin -->
@@ -53,9 +53,9 @@
 					<div nz-col nzSpan="24">
 						<nz-form-item>
 							<nz-form-label>机构类型</nz-form-label>
-							<span *ngIf='organization_type==1' class="detail-item-text">机构</span>
-							<span *ngIf='organization_type==2' class="detail-item-text">部门</span>
-							<span *ngIf='!organization_type' class="detail-item-text">无</span>
+							<span *ngIf="orgDetail.organization_type==1" class="detail-item-text">机构</span>
+							<span *ngIf="orgDetail.organization_type==2" class="detail-item-text">部门</span>
+							<span *ngIf='!orgDetail.organization_type' class="detail-item-text">无</span>
 						</nz-form-item>
 					</div>
 					<div nz-col nzSpan="24">
@@ -78,7 +78,7 @@
 						</nz-form-item>
 					</div>
 					<div class="user-table">
-						<nz-table [nzShowPagination]='false'  #dataSet [nzData]="userList">
+						<nz-table [nzShowPagination]='false'  #dataSetShow [nzData]="userList">
 							<thead>
 								<tr>
 									<th>姓名</th>
@@ -88,7 +88,7 @@
 								</tr>
 							</thead>
 							<tbody>
-								<tr *ngFor="let item of dataSet.data">
+								<tr *ngFor="let item of dataSetShow.data">
 									<td>{{item.real_name}}</td>
 									<td>{{item.login_name}}</td>
 									<td>{{item.mobile}}</td>
@@ -118,9 +118,10 @@
 				</nz-form-item>
 				<nz-form-item>
 					<nz-form-label [nzSm]="4" [nzXs]="24" nzFor="code" nzRequired>机构编码</nz-form-label>
-					<nz-form-control [nzSm]="18" [nzXs]="24">
-						<input nz-input id="code" formControlName="code" placeholder="请输入姓名">
+					<nz-form-control [nzSm]="18" [nzXs]="24" [nzValidateStatus]="checkNameStatus" nzHasFeedback>
+						<input nz-input id="code" formControlName="code" placeholder="请输入机构编码" (blur)='checkName()' (keydown)="checkNameStatus='';nameOnly=true" name="validating">
 						<nz-form-explain *ngIf="validateForm.get('code').dirty && validateForm.get('code').errors">请输入机构编码</nz-form-explain>
+						<nz-form-explain *ngIf="!nameOnly" class="danger">该编码已存在</nz-form-explain>
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
@@ -147,22 +148,55 @@
 					<nz-form-label [nzSm]="4" [nzXs]="24" nzFor="organization_type" >机构类型</nz-form-label>
 					<nz-form-control [nzSm]="18" [nzXs]="24">
 						<nz-radio-group formControlName="organization_type">
-						  <label nz-radio nzValue="1">机构</label>
-						  <label nz-radio nzValue="2">部门</label>
+						  <label nz-radio [nzValue]=1>机构</label>
+						  <label nz-radio [nzValue]=2>部门</label>
 						</nz-radio-group>
 					</nz-form-control>
 				</nz-form-item>
 				<nz-form-item>
-				<nz-form-label [nzSm]="4" [nzXs]="24">所属机构</nz-form-label>
-				<nz-form-control [nzSm]="18" [nzXs]="24">
-					<span *ngIf="orgSeleted">
-					<nz-tag nzMode="closeable"  (nzOnClose)="tagClose($event)" >{{orgSeleted.organization}}</nz-tag>
-					</span>
-					<a href="javascript:;"  (click)="open()"><span *ngIf="orgSeleted">修改</span><span *ngIf="!orgSeleted">选择</span></a>
-					<nz-form-explain *ngIf="!orgSeleted&&saveCheck" class="red">请选择所属机构</nz-form-explain>
-				</nz-form-control>
-			</nz-form-item>
+					<nz-form-label [nzSm]="4" [nzXs]="24">所属机构</nz-form-label>
+					<nz-form-control [nzSm]="18" [nzXs]="24">
+						<span *ngIf="orgSeleted">
+						<nz-tag nzMode="closeable"  (nzOnClose)="tagClose($event)" >{{orgSeleted.organization}}</nz-tag>
+						</span>
+						<a href="javascript:;"  (click)="open()"><span *ngIf="orgSeleted">修改</span><span *ngIf="!orgSeleted">选择</span></a>
+						<nz-form-explain *ngIf="!orgSeleted&&saveCheck" class="red">请选择所属机构</nz-form-explain>
+					</nz-form-control>
+				</nz-form-item>
+				<nz-form-item>
+					<nz-form-label [nzSm]="4" [nzXs]="24">机构负责人</nz-form-label>
+					<nz-form-control [nzSm]="18" [nzXs]="24">
+						<a href="javascript:;"  (click)="openUsers()">选择</a>
+					</nz-form-control>
+				</nz-form-item>
+				<div class="user-table table-box">
+					<nz-table [nzShowPagination]='false'  #dataSetSelect [nzData]="userSelecteds">
+						<thead>
+							<tr>
+								<th>姓名</th>
+								<th>用户名</th>
+								<th>电话</th>
+								<th>操作</th> 
+							</tr>
+						</thead>
+						<tbody>
+							<tr *ngFor="let item of dataSetSelect.data;let i=index">
+								<td>{{item.real_name}}</td>
+								<td>{{item.login_name}}</td>
+								<td>{{item.mobile}}</td>
+								<td>
+									<i nz-popconfirm nzTitle="确定删除该用户?" nzOkText="确定" nzCancelText="取消" (nzOnConfirm)="delectConfirm(item)" (nzOnCancel)="delectCancel()" class="table-operation-btn danger" nz-icon type="delete" theme="outline"></i>
+								</td>
+							</tr>
+						</tbody>
+					</nz-table>
+				</div>
+
 			</form>
+			<div class="user-footer" *ngIf="modifyType!=3">
+				<button (click)='submitForm()' [nzLoading]="isLoadingSave"  nz-button nzType="primary"  class="mr10" [disabled]='!validateForm.valid||!nameOnly'>保存</button>
+				<button (click)='cancel()' nz-button nzType="default">取消</button>
+			</div>
 			<!-- 新增、修改 end -->
 		</div>
 	</div>
@@ -175,11 +209,46 @@
 				<input nz-input style="width: 180px !important;margin-left: 8px;margin-right: 6px;" id="key" />
 				<button nz-button nzType="primary" nzShape="circle" (click)="searchNode()"><i nz-icon type="search"></i></button>
 			</div>
-			<ul id="treeDemoChild" class="ztree"></ul>
+			<ul id="treeDemoChild" class="ztree ztree-child"></ul>
 			<div class="drawer-footer">
 				<button (click)='treeSave()'  nz-button nzType="primary" class="mr10">保存</button>
 				<button (click)=close() nz-button nzType="default">取消</button>
 			</div>
 		</div>
 	</nz-drawer>
+</div>
+
+<!-- 机构负责人选择 -->
+<div class="org-selete-box">
+	<nz-drawer [nzBodyStyle]="{ height: 'calc(100% - 55px)', overflow: 'auto', 'padding-bottom':'53px' }" [nzMaskClosable]="false" [nzWidth]="auto" [nzVisible]="visibleUsers" nzTitle="机构负责人" (nzOnClose)="closeUser()">
+		<div class="users-box" [hidden]='statusParamsUsers.status!=3'>
+			<div class="user-table-box">
+				<nz-table [nzShowPagination]='false'  #dataSet [nzData]="userData">
+					<thead>
+						<tr>
+							<th></th>
+							<th>姓名</th>
+							<th>用户名</th>
+							<th>电话</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr *ngFor="let item of dataSet.data">
+							<td nzShowCheckbox [(nzChecked)]="item.checked" [nzDisabled]="item.disabled"></td>
+							<td>{{item.real_name}}</td>
+							<td>{{item.login_name}}</td>
+							<td>{{item.mobile}}</td>
+						</tr>
+					</tbody>
+				</nz-table>
+				<div class="page-box" *ngIf="statusParamsUsers.status==3">
+					<nz-pagination [nzPageIndex]="search.page_index" (nzPageIndexChange)='pageChange($event)' [nzPageSize]='search.page_size' [nzTotal]="collectionSize"></nz-pagination>
+				</div>
+			</div>
+			<div class="drawer-footer">
+				<button (click)='userSave()'  nz-button nzType="primary" class="mr10">保存</button>
+				<button (click)=closeUser() nz-button nzType="default">取消</button>
+			</div>
+		</div>
+	</nz-drawer>
 </div>

src/app/pages/system-management/department-management/department-management.component.scss

@@ -26,4 +26,27 @@
 			overflow-y:scroll; 
 		}
 	} 
+	.user-footer{
+
+		text-align: center;
+		
+	}
+}
+@-moz-document url-prefix(){
+	.user-footer{
+		padding-bottom: 20px; 
+	}
+}
+.ztree-child{
+	padding-bottom: 40px;
+	padding-right: 16px;
+}
+.drawer-footer{
+	display: inline-block;
+	position: relative;
+	left: 50%;
+	transform: translate(-50%)
+}
+.users-box{
+	padding-bottom: 30px;
 }

src/app/pages/system-management/department-management/department-management.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { FormBuilder,FormControl,FormGroup,Validators} from '@angular/forms';	
 import { HttpClientService } from '../../../services/http-client.service';
 import { Router } from '@angular/router';
-import { NzMessageService } from 'ng-zorro-antd';
+import { NzMessageService,NzModalRef, NzModalService  } from 'ng-zorro-antd';
 import { Observable } from 'rxjs';
 
 import 'ztree';
@@ -15,33 +15,50 @@ declare var jQuery: any
   styleUrls: ['./department-management.component.scss']
 })
 export class DepartmentManagementComponent implements OnInit {
+	collectionSize:any ; 
 	treeSelected:any;		//树模型-当前选中项
 	treeSelectedChild:any; //上级机构选择树
 	statusParamsTree:any={	//获取机构接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据  4请求成功，无数据 
 		status:1,
 	}
+	statusParamsUsers:any={	//接口的状态，0请求失败 1请求前 2请求中 3请求成功，有数据  4请求成功，无数据 
+		status:1,
+	}
 	public TreeData:any;
 	public canDel:any=false;
 	public canEdit:any=false;
 	public search:any={
-		orgId:'',	 
+		page_index:'1',
+		page_size:'10',
+		real_name:'',	 
 	}
-	public orgDetail:any='';
-	public orgSeleted:any=''; //所选机构详情
+	public orgDetail:any='';	//左侧机构目录当前选中项机构的详情信息
+	public orgSeleted:any=''; //新增或者修改时，当前选中的所属机构的机构详情信息
 	public modifyType:any='3'; //操作状态 1新增 2修改 3详情
 	public parentName:any='';
 	public parentNode:any='';	//当前选中机构的父级节点
-	public userList:any='';		//机构负责人列表
+	public userList:any='';		//机构负责人列表-详情时展示用户列表
+	public userSelecteds:any=[]; 	//机构负责人已选用户-新增、修改时 
+	public userData:any=[];		//用户列表数据
 	saveCheck:any=false; //保存检查，保存验证表单 false 还未验证  true 触发了验证
-	
+	public visible:any=false;
+	public orgSeletedBtn:any=true; //控制机构选择按钮
 	validateForm: FormGroup;
-
+	visibleUsers:any=false;
+	isLoadingSave:any=false;
+	nameOnly:any=true; //系统账号是否唯一 true唯一 false重复
+	oldLoginName:any=''; //修改时，保存原本的系统账号，用于检测唯一性
+	checkNameStatus:any=''; //检测账号唯一性的图标状态
+	orgList:any=[];
+	confirmModal:NzModalRef;
 	constructor(
 		private fb: FormBuilder,
 		private http:HttpClientService,
 		private router:Router,
 		private message: NzMessageService,
-	) { }
+		private modal: NzModalService,
+	) { 
+	}
 
 	ngOnInit() {
 		$('.tree-box').css('height',(document.documentElement.clientHeight-106+'px'));
@@ -57,19 +74,113 @@ export class DepartmentManagementComponent implements OnInit {
 		     code:[ '', [ Validators.required ] ],
 		     contact_person:[ '' ],
 		     contact_method:[ '' ],
-		     organization_type:[ '1' ],
+		     organization_type:[ '' ],
 		     address:[ '' ],
 
 		    });
 		this.initTree();
+		this.queryTable();
 	}
-	//新增、修改
+	//新增、修改  type 1新增  2修改
 	addModify(type){
+		//数据清空重置
 		this.modifyType=type;
-	}
+		this.validateForm.reset();
+		this.userSelecteds=[];
+		this.orgSeleted='';
+		this.checkNameStatus='';
+		this.nameOnly=true;
+		this.validateForm.patchValue({organization_type:1,});
+		if(type==1){
 
+		}else if(type==2){
+			let item=this.orgDetail;
+			this.validateForm.patchValue({
+				organization:item.organization,
+				shortName:item.shortName,
+				code:item.code,
+				contact_person:item.contact_person,
+				contact_method:item.contact_method,
+				organization_type:item.organization_type,
+				address:item.address,
+			});
+			this.orgSeleted=this.parentNode;
+			this.userList.forEach(option=>{
+				option.checked=true;
+				option.disabled=false;
+				this.userSelecteds.push(option)
+			})
+			
+		}
+		
+	}
+	//删除
+	delete(){
+		this.confirmModal = this.modal.confirm({
+		      nzTitle: '删除',
+		      nzContent: '确定删除【'+this.orgDetail.organization+'】?',
+		      nzOnOk: () => new Promise((resolve, reject) => {
+		      			this.http.delete('/sysapi/setting/organization/delOrgByid/'+this.orgDetail.id).subscribe((json)=>{
+		      				if(json.is_success){
+		      					resolve();
+		      					this.message.success(`删除成功!`);
+		      					this.initTree();
+		      				}else{
+		      					reject();
+		      					this.message.error(`删除失败!`);
+		      				}
+		      			})
+		              
+		            }).catch(() => console.log('Oops errors!'))
+		    });
+	}
+	//保存
 	submitForm(){
-		this.saveCheck=true;
+		let pid='';
+		let userList=[];
+		this.orgSeleted?pid=this.orgSeleted.id:pid='';
+		if(this.userSelecteds&&this.userSelecteds.length>0){
+			this.userSelecteds.forEach(item=>{
+				userList.push({uid:item.uid})
+			})
+		}
+		let params=Object.assign({},this.validateForm.value,{pid:pid},{userList:userList})
+		console.log(params)
+		if(this.modifyType==1){
+			this.http.post('/sysapi/setting/organization/add/',params).subscribe((json)=>{
+			   if(json.is_success){
+			       this.message.success(`新增成功!`);
+			       this.initTree();
+			     }else{
+			       this.message.error(`新增失败!`);
+			     }
+			})
+		}else if(this.modifyType==2){
+			this.http.put('/sysapi/setting/organization/updateById/'+this.orgDetail.id,params).subscribe((json)=>{
+			   if(json.is_success){
+			       this.message.success(`修改成功!`);
+			       this.initTree();
+			     }else{
+			       this.message.error(`修改失败!`);
+			     }
+			})
+		}
+	}
+	//取消	
+	cancel(){
+		this.modifyType=3;
+	}
+	//保存机构负责人
+	userSave(){
+		console.log(this.userData);
+		this.userData.forEach(item=>{
+			if(item.checked&&!item.disabled){
+				// 增加数据
+				this.userSelecteds = [ ...this.userSelecteds, item];
+			}
+		})
+		this.visibleUsers = false;
+		console.log(this.userSelecteds)
 	}
 	//保存选择机构
 	treeSave(){
@@ -82,6 +193,28 @@ export class DepartmentManagementComponent implements OnInit {
 			this.message.create('warning', `请选择所属机构！`,{ nzDuration: 2000 });
 		}
 	}
+	//打开机构负责人抽屉
+	openUsers(){
+		this.visibleUsers = true;
+		this.queryTable();
+	}
+	//处理机构负责人选择和数据回填
+	userSelect(){
+		if(this.userData){
+			this.userData.forEach(item=>{
+				this.userSelecteds.forEach(option=>{
+					if(item.uid==option.uid){
+						item.checked=true;
+						item.disabled=true;
+					}
+				})
+			})
+		}
+	}
+	//关闭用户选择抽屉
+	closeUser(){
+		this.visibleUsers = false;
+	}
 	//打开机构树抽屉
 	open(): void {
 		this.treeSelectedChild='';
@@ -96,6 +229,52 @@ export class DepartmentManagementComponent implements OnInit {
 		// this.orgSeletedBtn=true;
 		this.orgSeleted='';
 	}
+	//删除机构负责人
+	delectConfirm(item){
+		this.userSelecteds=this.userSelecteds.filter(function(option){
+			return item.uid!==option.uid
+		})
+	}
+	//取消删除
+	delectCancel(){
+
+	}
+	
+	//获取用户列表
+	queryTable():void{
+		this.statusParamsUsers.status=1;
+		this.http.get('/sysapi/setting/user/list',this.search).subscribe((json)=>{
+			if(json.is_success){
+				this.userData=json.body.list;
+				this.collectionSize=json.body.total;
+				if(json.body.list&&json.body.list.length>0){
+					this.statusParamsUsers.status=3;
+					this.userData.forEach(item=>{
+						if(this.userSelecteds.length>0){
+							this.userSelecteds.forEach(option=>{
+								if(item.uid==option.uid){
+									item.checked=true;
+									item.disabled=true;
+								}
+							})
+						}else{
+							item.checked=false;
+							item.disabled=false;
+						}
+					})
+				}else{
+					this.statusParamsUsers.status=4;
+				}
+			}else{
+				this.statusParamsUsers.status=0;
+			}
+		})
+	}
+	//翻页
+	pageChange(event){
+		this.search.page_index=event;
+		this.queryTable();
+	}
 	//修改时查询该系统下的所有用户
 	queryUserById():void{
 	  this.http.get('/sysapi/setting/organization/queryUserById/'+this.orgDetail.id).subscribe((json)=>{
@@ -106,6 +285,29 @@ export class DepartmentManagementComponent implements OnInit {
 	    }
 	  })
 	}
+	//检验编码的唯一性
+	checkName(){
+		//处理修改的时候，修改的值为原来的值，这时候直接显示验证成功
+		if(this.modifyType==2&&this.validateForm.value.code.trim()==this.oldLoginName){
+			this.nameOnly = true;
+			this.checkNameStatus='success';
+			return false;
+		}
+		//拿用户输入的机构编码跟机构列表的编码对比，判断编码是否已经存在
+		let status='true';
+		this.orgList.forEach(item=>{
+			if(this.validateForm.value.code.trim()==item.code){
+				this.checkNameStatus='error';
+				this.nameOnly = false;
+				status='false';
+				return false;
+			}
+		});
+		if(status=='true'&&this.validateForm.value.code.trim()){
+			this.checkNameStatus='success';
+			this.nameOnly = true;
+		}
+	}
 	//获取机构列表，树模型数据处理
 	initTree(){
    		//获取目录列表
@@ -114,6 +316,7 @@ export class DepartmentManagementComponent implements OnInit {
    			if(json.is_success){
    				if(json.body.length>0){
    					this.statusParamsTree.status=3;
+   					this.orgList=json.body;
    					let children=[];
    					json.body.forEach(option=>{
    						option.name=option.organization;
@@ -171,9 +374,9 @@ export class DepartmentManagementComponent implements OnInit {
 	        	var zTree = $.fn.zTree.getZTreeObj("treeDemo");
 	            this.treeSelected=treeNode;
 	            let isTopNode=this.treeSelected.getParentNode();	//是否为顶级节点 true不是顶级节点 false 为顶级节点
-	            console.log(isTopNode)
 	            if(isTopNode){	//子节点
 	            	this.orgDetail=treeNode;
+	            	this.oldLoginName=this.orgDetail.code;
 	            	this.queryUserById();
 	            	this.canDel=true;
 	            	this.canEdit=true;
@@ -184,7 +387,7 @@ export class DepartmentManagementComponent implements OnInit {
 	            		this.parentNode=isTopNode;
 	            	}
 	            }else{	//顶级节点
-	            	this.orgDetail='';
+	            	this.orgDetail=''; 
 	            	this.canDel=false;
 	            	this.canEdit=false;
 	            }