|
|
|
@ -1,21 +1,29 @@ |
|
|
|
import { Component, OnInit, Inject } from '@angular/core'; |
|
|
|
import { Component, OnInit, Inject } from "@angular/core"; |
|
|
|
import {MatTreeFlatDataSource, MatTreeFlattener} from '@angular/material/tree'; |
|
|
|
import { |
|
|
|
import {FlatTreeControl} from '@angular/cdk/tree'; |
|
|
|
MatTreeFlatDataSource, |
|
|
|
import { HttpClient } from '@angular/common/http'; |
|
|
|
MatTreeFlattener, |
|
|
|
import {MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog'; |
|
|
|
} from "@angular/material/tree"; |
|
|
|
import {FormControl} from '@angular/forms'; |
|
|
|
import { FlatTreeControl } from "@angular/cdk/tree"; |
|
|
|
import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; |
|
|
|
import { HttpClient } from "@angular/common/http"; |
|
|
|
import { TreeService } from '../../http-interceptors/tree.service' |
|
|
|
import { |
|
|
|
|
|
|
|
MatDialog, |
|
|
|
|
|
|
|
MatDialogRef, |
|
|
|
|
|
|
|
MAT_DIALOG_DATA, |
|
|
|
|
|
|
|
} from "@angular/material/dialog"; |
|
|
|
|
|
|
|
import { FormControl } from "@angular/forms"; |
|
|
|
|
|
|
|
import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar"; |
|
|
|
|
|
|
|
import { TreeService } from "../../http-interceptors/tree.service"; |
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'app-organization', |
|
|
|
selector: "app-organization", |
|
|
|
templateUrl: './organization.component.html', |
|
|
|
templateUrl: "./organization.component.html", |
|
|
|
styleUrls: ['./organization.component.scss'] |
|
|
|
styleUrls: ["./organization.component.scss"], |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class OrganizationComponent implements OnInit { |
|
|
|
export class OrganizationComponent implements OnInit { |
|
|
|
data:any =[] //存储所有组织机构
|
|
|
|
data: any = []; //存储所有组织机构
|
|
|
|
newdata = []; |
|
|
|
newdata = []; |
|
|
|
|
|
|
|
|
|
|
|
private _transformer = (node, level: number) => {//要给渲染节点传那些属性参数
|
|
|
|
private _transformer = (node, level: number) => { |
|
|
|
|
|
|
|
//要给渲染节点传那些属性参数
|
|
|
|
return { |
|
|
|
return { |
|
|
|
expandable: !!node.children && node.children.length > 0, |
|
|
|
expandable: !!node.children && node.children.length > 0, |
|
|
|
name: node.name, |
|
|
|
name: node.name, |
|
|
|
@ -28,22 +36,33 @@ export class OrganizationComponent implements OnInit { |
|
|
|
isTop: node.isTop, |
|
|
|
isTop: node.isTop, |
|
|
|
isBottom: node.isBottom, |
|
|
|
isBottom: node.isBottom, |
|
|
|
code: node.code, |
|
|
|
code: node.code, |
|
|
|
division:node.division |
|
|
|
division: node.division, |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
}; |
|
|
|
treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable); |
|
|
|
treeControl = new FlatTreeControl<any>( |
|
|
|
treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); |
|
|
|
(node) => node.level, |
|
|
|
|
|
|
|
(node) => node.expandable |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
treeFlattener = new MatTreeFlattener( |
|
|
|
|
|
|
|
this._transformer, |
|
|
|
|
|
|
|
(node) => node.level, |
|
|
|
|
|
|
|
(node) => node.expandable, |
|
|
|
|
|
|
|
(node) => node.children |
|
|
|
|
|
|
|
); |
|
|
|
dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); |
|
|
|
dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); |
|
|
|
|
|
|
|
|
|
|
|
constructor(private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,private tree: TreeService) { |
|
|
|
constructor( |
|
|
|
} |
|
|
|
private http: HttpClient, |
|
|
|
isloading:any = false //loading效果
|
|
|
|
public dialog: MatDialog, |
|
|
|
|
|
|
|
public snackBar: MatSnackBar, |
|
|
|
|
|
|
|
private tree: TreeService |
|
|
|
|
|
|
|
) {} |
|
|
|
|
|
|
|
isloading: any = false; //loading效果
|
|
|
|
//重新获取列表并且展开到上次位置的方法
|
|
|
|
//重新获取列表并且展开到上次位置的方法
|
|
|
|
getlist = (): void => { |
|
|
|
getlist = (): void => { |
|
|
|
this.http.get('/api/Organizations').subscribe( |
|
|
|
this.http.get("/api/Organizations").subscribe((data: any) => { |
|
|
|
(data:any)=>{ |
|
|
|
|
|
|
|
this.data = data; |
|
|
|
this.data = data; |
|
|
|
this.newdata = this.tree.toTree(data) |
|
|
|
this.newdata = this.tree.toTree(data); |
|
|
|
|
|
|
|
|
|
|
|
const nodes = this.treeControl.dataNodes; |
|
|
|
const nodes = this.treeControl.dataNodes; |
|
|
|
const expandNodes = []; |
|
|
|
const expandNodes = []; |
|
|
|
@ -53,76 +72,79 @@ export class OrganizationComponent implements OnInit { |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.dataSource.data = this.newdata; |
|
|
|
this.dataSource.data = this.newdata; |
|
|
|
let newNodes = this.treeControl.dataNodes; |
|
|
|
let newNodes = this.treeControl.dataNodes; |
|
|
|
newNodes = newNodes.filter(n => { |
|
|
|
newNodes = newNodes.filter((n) => { |
|
|
|
return expandNodes.indexOf(n.id) >= 0; |
|
|
|
return expandNodes.indexOf(n.id) >= 0; |
|
|
|
}); |
|
|
|
}); |
|
|
|
newNodes.forEach(item => { |
|
|
|
newNodes.forEach((item) => { |
|
|
|
this.treeControl.expand(item); |
|
|
|
this.treeControl.expand(item); |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
}; |
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
//初始化视图
|
|
|
|
//初始化视图
|
|
|
|
ngOnInit() { |
|
|
|
ngOnInit() { |
|
|
|
this.http.get('/api/Organizations').subscribe( |
|
|
|
this.http.get("/api/Organizations").subscribe((data: any) => { |
|
|
|
(data:any)=>{ |
|
|
|
|
|
|
|
this.data = data; |
|
|
|
this.data = data; |
|
|
|
this.dataSource.data = this.tree.toTree(data); |
|
|
|
this.dataSource.data = this.tree.toTree(data); |
|
|
|
this.treeControl.expand(this.treeControl.dataNodes[0]); |
|
|
|
this.treeControl.expand(this.treeControl.dataNodes[0]); |
|
|
|
} |
|
|
|
}); |
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
hasChild = (_: number, node: any) => node.expandable; |
|
|
|
hasChild = (_: number, node: any) => node.expandable; |
|
|
|
|
|
|
|
|
|
|
|
//创建组织按钮
|
|
|
|
//创建组织按钮
|
|
|
|
create(value) { |
|
|
|
create(value) { |
|
|
|
const dialogRef = this.dialog.open(CreateOrganization, {//调用open方法打开对话框并且携带参数过去
|
|
|
|
const dialogRef = this.dialog.open(CreateOrganization, { |
|
|
|
width: '260px', |
|
|
|
//调用open方法打开对话框并且携带参数过去
|
|
|
|
data: {id:value.id,childlength:value.children,level:value.level} |
|
|
|
width: "260px", |
|
|
|
|
|
|
|
data: { id: value.id, childlength: value.children, level: value.level }, |
|
|
|
}); |
|
|
|
}); |
|
|
|
dialogRef.afterClosed().subscribe( |
|
|
|
dialogRef.afterClosed().subscribe((data) => { |
|
|
|
data=>{ |
|
|
|
|
|
|
|
if (data) { |
|
|
|
if (data) { |
|
|
|
this.getlist() |
|
|
|
this.getlist(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
createOne() { |
|
|
|
|
|
|
|
const dialogRef = this.dialog.open(CreateOrganization, { |
|
|
|
|
|
|
|
//调用open方法打开对话框并且携带参数过去
|
|
|
|
|
|
|
|
width: "260px", |
|
|
|
|
|
|
|
data: { id: "", childlength: "", level: "" }, |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
dialogRef.afterClosed().subscribe((data) => { |
|
|
|
|
|
|
|
if (data) { |
|
|
|
|
|
|
|
this.getlist(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
//编辑组织按钮
|
|
|
|
//编辑组织按钮
|
|
|
|
edit(node) { |
|
|
|
edit(node) { |
|
|
|
const dialogRef = this.dialog.open(EditOrganization, {//调用open方法打开对话框并且携带参数过去
|
|
|
|
const dialogRef = this.dialog.open(EditOrganization, { |
|
|
|
data: node |
|
|
|
//调用open方法打开对话框并且携带参数过去
|
|
|
|
|
|
|
|
data: node, |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
dialogRef.afterClosed().subscribe((data) => { |
|
|
|
|
|
|
|
this.getlist(); |
|
|
|
}); |
|
|
|
}); |
|
|
|
dialogRef.afterClosed().subscribe( |
|
|
|
|
|
|
|
data=>{ |
|
|
|
|
|
|
|
this.getlist() |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
//删除组织按钮
|
|
|
|
//删除组织按钮
|
|
|
|
delete(value) { |
|
|
|
delete(value) { |
|
|
|
var isdeleted = confirm("确定要删除此组织？") |
|
|
|
var isdeleted = confirm("确定要删除此组织？"); |
|
|
|
if (isdeleted) { |
|
|
|
if (isdeleted) { |
|
|
|
//请求删除接口
|
|
|
|
//请求删除接口
|
|
|
|
this.isloading = true |
|
|
|
this.isloading = true; |
|
|
|
this.http.delete(`/api/Organizations/${value.id}`).subscribe( data=>{
|
|
|
|
this.http.delete(`/api/Organizations/${value.id}`).subscribe((data) => { |
|
|
|
this.getlist() |
|
|
|
this.getlist(); |
|
|
|
|
|
|
|
}); |
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
//禁用按钮
|
|
|
|
//禁用按钮
|
|
|
|
disable(value) { |
|
|
|
disable(value) { |
|
|
|
this.isloading = true |
|
|
|
this.isloading = true; |
|
|
|
if (!value.enabled) { |
|
|
|
if (!value.enabled) { |
|
|
|
this.http.put( |
|
|
|
this.http |
|
|
|
`/api/Organizations/${value.id}`,
|
|
|
|
.put(`/api/Organizations/${value.id}`, { |
|
|
|
{ |
|
|
|
|
|
|
|
id: value.id, |
|
|
|
id: value.id, |
|
|
|
code: value.code, |
|
|
|
code: value.code, |
|
|
|
name: value.name, |
|
|
|
name: value.name, |
|
|
|
@ -130,32 +152,29 @@ export class OrganizationComponent implements OnInit { |
|
|
|
order: value.order, |
|
|
|
order: value.order, |
|
|
|
location: null, |
|
|
|
location: null, |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: value.parentId |
|
|
|
parentId: value.parentId, |
|
|
|
} |
|
|
|
}) |
|
|
|
).subscribe( |
|
|
|
.subscribe( |
|
|
|
data=>{ |
|
|
|
(data) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('启用成功','确定',config); |
|
|
|
this.snackBar.open("启用成功", "确定", config); |
|
|
|
this.getlist() |
|
|
|
this.getlist(); |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('操作无效','确定',config); |
|
|
|
this.snackBar.open("操作无效", "确定", config); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
} else { |
|
|
|
// var isdeleted = confirm("确定要禁用此组织？")
|
|
|
|
// var isdeleted = confirm("确定要禁用此组织？")
|
|
|
|
// if(isdeleted){
|
|
|
|
// if(isdeleted){
|
|
|
|
this.http.put( |
|
|
|
this.http |
|
|
|
`/api/Organizations/${value.id}`,
|
|
|
|
.put(`/api/Organizations/${value.id}`, { |
|
|
|
{ |
|
|
|
|
|
|
|
id: value.id, |
|
|
|
id: value.id, |
|
|
|
code: value.code, |
|
|
|
code: value.code, |
|
|
|
name: value.name, |
|
|
|
name: value.name, |
|
|
|
@ -163,49 +182,47 @@ export class OrganizationComponent implements OnInit { |
|
|
|
order: value.order, |
|
|
|
order: value.order, |
|
|
|
location: null, |
|
|
|
location: null, |
|
|
|
enabled: false, |
|
|
|
enabled: false, |
|
|
|
parentId: value.parentId |
|
|
|
parentId: value.parentId, |
|
|
|
} |
|
|
|
}) |
|
|
|
).subscribe( |
|
|
|
.subscribe( |
|
|
|
data=>{ |
|
|
|
(data) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('禁用成功','确定',config); |
|
|
|
this.snackBar.open("禁用成功", "确定", config); |
|
|
|
this.getlist() |
|
|
|
this.getlist(); |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('操作无效','确定',config); |
|
|
|
this.snackBar.open("操作无效", "确定", config); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
// }
|
|
|
|
// }
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//向上箭头
|
|
|
|
//向上箭头
|
|
|
|
updata = [] |
|
|
|
updata = []; |
|
|
|
up(node) { |
|
|
|
up(node) { |
|
|
|
this.isloading = true |
|
|
|
this.isloading = true; |
|
|
|
var olddata = this.data; |
|
|
|
var olddata = this.data; |
|
|
|
// console.log(1,olddata)
|
|
|
|
// console.log(1,olddata)
|
|
|
|
// console.log(2,node)
|
|
|
|
// console.log(2,node)
|
|
|
|
this.updata = [] |
|
|
|
this.updata = []; |
|
|
|
olddata.forEach(item => { |
|
|
|
olddata.forEach((item) => { |
|
|
|
if (item.id == node.parentId) { |
|
|
|
if (item.id == node.parentId) { |
|
|
|
this.updata = item.children |
|
|
|
this.updata = item.children; |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
// console.log(this.updata)
|
|
|
|
// console.log(this.updata)
|
|
|
|
this.updata.forEach((item, index) => { |
|
|
|
this.updata.forEach((item, index) => { |
|
|
|
if (item.name == node.name) { |
|
|
|
if (item.name == node.name) { |
|
|
|
this.http.put(//更改点击的节点为上一节点的order
|
|
|
|
this.http |
|
|
|
|
|
|
|
.put( |
|
|
|
|
|
|
|
//更改点击的节点为上一节点的order
|
|
|
|
`/api/Organizations/${this.updata[index].id}`, |
|
|
|
`/api/Organizations/${this.updata[index].id}`, |
|
|
|
{ |
|
|
|
{ |
|
|
|
id: this.updata[index].id, |
|
|
|
id: this.updata[index].id, |
|
|
|
@ -217,10 +234,13 @@ export class OrganizationComponent implements OnInit { |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.updata[index].parentId, |
|
|
|
parentId: this.updata[index].parentId, |
|
|
|
} |
|
|
|
} |
|
|
|
).subscribe( |
|
|
|
) |
|
|
|
data=>{
|
|
|
|
.subscribe( |
|
|
|
|
|
|
|
(data) => { |
|
|
|
// this.getlist()
|
|
|
|
// this.getlist()
|
|
|
|
this.http.put(//更改上一节点为点击节点的order
|
|
|
|
this.http |
|
|
|
|
|
|
|
.put( |
|
|
|
|
|
|
|
//更改上一节点为点击节点的order
|
|
|
|
`/api/Organizations/${this.updata[index - 1].id}`, |
|
|
|
`/api/Organizations/${this.updata[index - 1].id}`, |
|
|
|
{ |
|
|
|
{ |
|
|
|
id: this.updata[index - 1].id, |
|
|
|
id: this.updata[index - 1].id, |
|
|
|
@ -232,55 +252,49 @@ export class OrganizationComponent implements OnInit { |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.updata[index].parentId, |
|
|
|
parentId: this.updata[index].parentId, |
|
|
|
} |
|
|
|
} |
|
|
|
).subscribe( |
|
|
|
) |
|
|
|
data=>{ |
|
|
|
.subscribe( |
|
|
|
this.getlist() |
|
|
|
(data) => { |
|
|
|
|
|
|
|
this.getlist(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('更改order失败','确定',config); |
|
|
|
this.snackBar.open("更改order失败", "确定", config); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('更改order失败','确定',config); |
|
|
|
this.snackBar.open("更改order失败", "确定", config); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//向下箭头
|
|
|
|
//向下箭头
|
|
|
|
downdata = [] |
|
|
|
downdata = []; |
|
|
|
down(node) { |
|
|
|
down(node) { |
|
|
|
this.isloading = true |
|
|
|
this.isloading = true; |
|
|
|
var olddata = this.data; |
|
|
|
var olddata = this.data; |
|
|
|
this.downdata = [] |
|
|
|
this.downdata = []; |
|
|
|
olddata.forEach(item => { |
|
|
|
olddata.forEach((item) => { |
|
|
|
if (item.id == node.parentId) { |
|
|
|
if (item.id == node.parentId) { |
|
|
|
this.downdata = item.children |
|
|
|
this.downdata = item.children; |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
// console.log(this.downdata)
|
|
|
|
// console.log(this.downdata)
|
|
|
|
this.downdata.forEach((item, index) => { |
|
|
|
this.downdata.forEach((item, index) => { |
|
|
|
if (item.name == node.name) { |
|
|
|
if (item.name == node.name) { |
|
|
|
this.http.put(//更改点击的节点为下一节点的order
|
|
|
|
this.http |
|
|
|
|
|
|
|
.put( |
|
|
|
|
|
|
|
//更改点击的节点为下一节点的order
|
|
|
|
`/api/Organizations/${this.downdata[index].id}`, |
|
|
|
`/api/Organizations/${this.downdata[index].id}`, |
|
|
|
{ |
|
|
|
{ |
|
|
|
id: this.downdata[index].id, |
|
|
|
id: this.downdata[index].id, |
|
|
|
@ -292,10 +306,13 @@ export class OrganizationComponent implements OnInit { |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.downdata[index].parentId, |
|
|
|
parentId: this.downdata[index].parentId, |
|
|
|
} |
|
|
|
} |
|
|
|
).subscribe( |
|
|
|
) |
|
|
|
data=>{
|
|
|
|
.subscribe( |
|
|
|
|
|
|
|
(data) => { |
|
|
|
// this.getlist()
|
|
|
|
// this.getlist()
|
|
|
|
this.http.put(//更改上一节点为点击节点的order
|
|
|
|
this.http |
|
|
|
|
|
|
|
.put( |
|
|
|
|
|
|
|
//更改上一节点为点击节点的order
|
|
|
|
`/api/Organizations/${this.downdata[index + 1].id}`, |
|
|
|
`/api/Organizations/${this.downdata[index + 1].id}`, |
|
|
|
{ |
|
|
|
{ |
|
|
|
id: this.downdata[index + 1].id, |
|
|
|
id: this.downdata[index + 1].id, |
|
|
|
@ -307,179 +324,154 @@ export class OrganizationComponent implements OnInit { |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.downdata[index].parentId, |
|
|
|
parentId: this.downdata[index].parentId, |
|
|
|
} |
|
|
|
} |
|
|
|
).subscribe( |
|
|
|
) |
|
|
|
data=>{ |
|
|
|
.subscribe( |
|
|
|
this.getlist() |
|
|
|
(data) => { |
|
|
|
|
|
|
|
this.getlist(); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('更改order失败','确定',config); |
|
|
|
this.snackBar.open("更改order失败", "确定", config); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
)
|
|
|
|
); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('更改order失败','确定',config); |
|
|
|
this.snackBar.open("更改order失败", "确定", config); |
|
|
|
this.isloading = false |
|
|
|
this.isloading = false; |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
selectedOrg:any//当前选择的组织机构
|
|
|
|
selectedOrg: any; //当前选择的组织机构
|
|
|
|
OfficesList:any //获得的下级列表
|
|
|
|
OfficesList: any; //获得的下级列表
|
|
|
|
//获得点击组织机构的下级机关单位
|
|
|
|
//获得点击组织机构的下级机关单位
|
|
|
|
getOffices(node) { |
|
|
|
getOffices(node) { |
|
|
|
// console.log(node)
|
|
|
|
// console.log(node)
|
|
|
|
this.selectedOrg = node |
|
|
|
this.selectedOrg = node; |
|
|
|
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe(data => { |
|
|
|
this.http.get(`/api/OrganizationsOffices/${node.id}`).subscribe((data) => { |
|
|
|
// console.log("获取成功",data)
|
|
|
|
// console.log("获取成功",data)
|
|
|
|
this.OfficesList = data |
|
|
|
this.OfficesList = data; |
|
|
|
}) |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
//新增下属机关
|
|
|
|
//新增下属机关
|
|
|
|
addOffices() { |
|
|
|
addOffices() { |
|
|
|
const dialogRef = this.dialog.open(addOffices, {//调用open方法打开对话框并且携带参数过去
|
|
|
|
const dialogRef = this.dialog.open(addOffices, { |
|
|
|
data: {selectedOrg:this.selectedOrg,OfficesList:this.OfficesList} |
|
|
|
//调用open方法打开对话框并且携带参数过去
|
|
|
|
|
|
|
|
data: { selectedOrg: this.selectedOrg, OfficesList: this.OfficesList }, |
|
|
|
}); |
|
|
|
}); |
|
|
|
dialogRef.afterClosed().subscribe( |
|
|
|
dialogRef.afterClosed().subscribe((data) => { |
|
|
|
data=>{ |
|
|
|
if (data == "创建成功") { |
|
|
|
if(data == '创建成功'){ |
|
|
|
this.getOffices(this.selectedOrg); |
|
|
|
this.getOffices(this.selectedOrg) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
//编辑机关
|
|
|
|
//编辑机关
|
|
|
|
editOffice(item) { |
|
|
|
editOffice(item) { |
|
|
|
const dialogRef = this.dialog.open(editOffices, {//调用open方法打开对话框并且携带参数过去
|
|
|
|
const dialogRef = this.dialog.open(editOffices, { |
|
|
|
data: {item:item} |
|
|
|
//调用open方法打开对话框并且携带参数过去
|
|
|
|
|
|
|
|
data: { item: item }, |
|
|
|
}); |
|
|
|
}); |
|
|
|
dialogRef.afterClosed().subscribe( |
|
|
|
dialogRef.afterClosed().subscribe((data) => { |
|
|
|
data=>{ |
|
|
|
if (data == "修改成功") { |
|
|
|
if(data == '修改成功'){ |
|
|
|
this.getOffices(this.selectedOrg); |
|
|
|
this.getOffices(this.selectedOrg) |
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
//删除机关
|
|
|
|
//删除机关
|
|
|
|
deleteOffice(item) { |
|
|
|
deleteOffice(item) { |
|
|
|
let isDelete = window.confirm('确定要删除此机关吗?') |
|
|
|
let isDelete = window.confirm("确定要删除此机关吗?"); |
|
|
|
if (isDelete) { |
|
|
|
if (isDelete) { |
|
|
|
this.http.delete(`/api/OrganizationsOffices/${item.id}`).subscribe(data => { |
|
|
|
this.http |
|
|
|
|
|
|
|
.delete(`/api/OrganizationsOffices/${item.id}`) |
|
|
|
|
|
|
|
.subscribe((data) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('删除成功','确定',config); |
|
|
|
this.snackBar.open("删除成功", "确定", config); |
|
|
|
this.getOffices(this.selectedOrg) |
|
|
|
this.getOffices(this.selectedOrg); |
|
|
|
}) |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//创建组织
|
|
|
|
//创建组织
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'createorganization', |
|
|
|
selector: "createorganization", |
|
|
|
templateUrl: './createorganization.component.html', |
|
|
|
templateUrl: "./createorganization.component.html", |
|
|
|
styleUrls: ['./organization.component.scss'] |
|
|
|
styleUrls: ["./organization.component.scss"], |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class CreateOrganization { |
|
|
|
export class CreateOrganization { |
|
|
|
myControl = new FormControl(); |
|
|
|
myControl = new FormControl(); |
|
|
|
ishttp: boolean =false |
|
|
|
ishttp: boolean = false; |
|
|
|
constructor(private http: HttpClient,public dialogRef: MatDialogRef<CreateOrganization>,@Inject(MAT_DIALOG_DATA) public data, |
|
|
|
constructor( |
|
|
|
public snackBar: MatSnackBar) {} |
|
|
|
private http: HttpClient, |
|
|
|
|
|
|
|
public dialogRef: MatDialogRef<CreateOrganization>, |
|
|
|
|
|
|
|
@Inject(MAT_DIALOG_DATA) public data, |
|
|
|
|
|
|
|
public snackBar: MatSnackBar |
|
|
|
|
|
|
|
) {} |
|
|
|
|
|
|
|
|
|
|
|
onNoClick(): void { |
|
|
|
onNoClick(): void { |
|
|
|
this.dialogRef.close(); |
|
|
|
this.dialogRef.close(); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
onSubmit(value) { |
|
|
|
onSubmit(value) { |
|
|
|
if(this.data.childlength){//如果点击节点存在children
|
|
|
|
let obj = { |
|
|
|
this.http.post( |
|
|
|
|
|
|
|
'/api/Organizations',
|
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
id: "", |
|
|
|
id: "", |
|
|
|
code:value.number, |
|
|
|
code: "12000000", |
|
|
|
division:value.division, |
|
|
|
division: "12000000", |
|
|
|
name: value.name, |
|
|
|
name: "天津总队", |
|
|
|
level:this.data.level + 1, |
|
|
|
level: 0, |
|
|
|
order: this.data.childlength[this.data.childlength.length -1].order + 1, |
|
|
|
order: null, |
|
|
|
location: null, |
|
|
|
location: null, |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.data.id, |
|
|
|
parentId: null, |
|
|
|
} |
|
|
|
}; |
|
|
|
).subscribe( |
|
|
|
//如果点击节点存在children
|
|
|
|
data=>{ |
|
|
|
this.http |
|
|
|
this.dialogRef.close(data);
|
|
|
|
.post("/api/Organizations", { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('创建组织成功','确定',config); |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
err=>{ |
|
|
|
|
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
|
|
|
|
config.verticalPosition = 'top'; |
|
|
|
|
|
|
|
config.duration = 3000 |
|
|
|
|
|
|
|
this.snackBar.open('请填写正确格式','确定',config); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
this.http.post( |
|
|
|
|
|
|
|
'/api/Organizations',
|
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
id: "", |
|
|
|
id: "", |
|
|
|
code: value.number, |
|
|
|
code: value.number, |
|
|
|
division: value.division, |
|
|
|
division: value.division, |
|
|
|
name: value.name, |
|
|
|
name: value.name, |
|
|
|
level: this.data.level + 1, |
|
|
|
level: this.data.level + 1, |
|
|
|
order:0, |
|
|
|
order: this.data.childlength |
|
|
|
|
|
|
|
? this.data.childlength[this.data.childlength.length - 1].order + 1 |
|
|
|
|
|
|
|
: 0, |
|
|
|
location: null, |
|
|
|
location: null, |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.data.id, |
|
|
|
parentId: this.data.id, |
|
|
|
} |
|
|
|
}) |
|
|
|
).subscribe( |
|
|
|
.subscribe( |
|
|
|
data=>{ |
|
|
|
(data) => { |
|
|
|
this.dialogRef.close(data); |
|
|
|
this.dialogRef.close(data); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('创建组织成功','确定',config); |
|
|
|
this.snackBar.open("创建组织成功", "确定", config); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('请填写正确格式','确定',config); |
|
|
|
this.snackBar.open("请填写正确格式", "确定", config); |
|
|
|
} |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//编辑组件
|
|
|
|
//编辑组件
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'editorganization', |
|
|
|
selector: "editorganization", |
|
|
|
templateUrl: './editorganization.component.html', |
|
|
|
templateUrl: "./editorganization.component.html", |
|
|
|
styleUrls: ['./organization.component.scss'] |
|
|
|
styleUrls: ["./organization.component.scss"], |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class EditOrganization { |
|
|
|
export class EditOrganization { |
|
|
|
newdata = []; |
|
|
|
newdata = []; |
|
|
|
@ -491,65 +483,77 @@ export class EditOrganization { |
|
|
|
id: node.id, |
|
|
|
id: node.id, |
|
|
|
parentId: node.parentId, |
|
|
|
parentId: node.parentId, |
|
|
|
children: node.children, |
|
|
|
children: node.children, |
|
|
|
division:node.division |
|
|
|
division: node.division, |
|
|
|
}; |
|
|
|
}; |
|
|
|
} |
|
|
|
}; |
|
|
|
treeControl = new FlatTreeControl<any>(node => node.level, node => node.expandable); |
|
|
|
treeControl = new FlatTreeControl<any>( |
|
|
|
treeFlattener = new MatTreeFlattener(this._transformer, node => node.level, node => node.expandable, node => node.children); |
|
|
|
(node) => node.level, |
|
|
|
|
|
|
|
(node) => node.expandable |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
treeFlattener = new MatTreeFlattener( |
|
|
|
|
|
|
|
this._transformer, |
|
|
|
|
|
|
|
(node) => node.level, |
|
|
|
|
|
|
|
(node) => node.expandable, |
|
|
|
|
|
|
|
(node) => node.children |
|
|
|
|
|
|
|
); |
|
|
|
dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); |
|
|
|
dataSource = new MatTreeFlatDataSource(this.treeControl, this.treeFlattener); |
|
|
|
myControl = new FormControl(); |
|
|
|
myControl = new FormControl(); |
|
|
|
organizationname:string=""//自己组织的名字
|
|
|
|
organizationname: string = ""; //自己组织的名字
|
|
|
|
organizationcode:any//自己组织的编号
|
|
|
|
organizationcode: any; //自己组织的编号
|
|
|
|
organizationName:any =''//上级组织的名字
|
|
|
|
organizationName: any = ""; //上级组织的名字
|
|
|
|
organizationId:any =''//上级组织的id
|
|
|
|
organizationId: any = ""; //上级组织的id
|
|
|
|
organizationLevel:number =null//上级组织的层级
|
|
|
|
organizationLevel: number = null; //上级组织的层级
|
|
|
|
organizationchildlength:number = null |
|
|
|
organizationchildlength: number = null; |
|
|
|
allOrganizations:any //所有组织机构
|
|
|
|
allOrganizations: any; //所有组织机构
|
|
|
|
division:any //区划
|
|
|
|
division: any; //区划
|
|
|
|
constructor(private http: HttpClient,public dialogRef: MatDialogRef<EditOrganization>,@Inject(MAT_DIALOG_DATA) public data, |
|
|
|
constructor( |
|
|
|
private tree:TreeService,public snackBar: MatSnackBar) {} |
|
|
|
private http: HttpClient, |
|
|
|
|
|
|
|
public dialogRef: MatDialogRef<EditOrganization>, |
|
|
|
|
|
|
|
@Inject(MAT_DIALOG_DATA) public data, |
|
|
|
|
|
|
|
private tree: TreeService, |
|
|
|
|
|
|
|
public snackBar: MatSnackBar |
|
|
|
|
|
|
|
) {} |
|
|
|
|
|
|
|
|
|
|
|
//获取所有组织机构
|
|
|
|
//获取所有组织机构
|
|
|
|
getMechanism() { |
|
|
|
getMechanism() { |
|
|
|
this.http.get('/api/Organizations').subscribe( |
|
|
|
this.http.get("/api/Organizations").subscribe((data: any) => { |
|
|
|
(data:any)=>{ |
|
|
|
this.allOrganizations = data; |
|
|
|
this.allOrganizations = data |
|
|
|
|
|
|
|
this.dataSource.data = this.tree.toTree(data); |
|
|
|
this.dataSource.data = this.tree.toTree(data); |
|
|
|
data.forEach(item=>{ |
|
|
|
data.forEach((item) => { |
|
|
|
if (item.id == this.data.parentId) { |
|
|
|
if (item.id == this.data.parentId) { |
|
|
|
this.organizationName = item.name |
|
|
|
this.organizationName = item.name; |
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}); |
|
|
|
} |
|
|
|
}); |
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
ngOnInit() { |
|
|
|
ngOnInit() { |
|
|
|
// console.log(this.data)
|
|
|
|
// console.log(this.data)
|
|
|
|
this.getMechanism() |
|
|
|
this.getMechanism(); |
|
|
|
this.organizationname = this.data.name |
|
|
|
this.organizationname = this.data.name; |
|
|
|
this.organizationcode = this.data.code |
|
|
|
this.organizationcode = this.data.code; |
|
|
|
this.division = this.data.division |
|
|
|
this.division = this.data.division; |
|
|
|
} |
|
|
|
} |
|
|
|
hasChild = (_: number, node: any) => node.expandable; |
|
|
|
hasChild = (_: number, node: any) => node.expandable; |
|
|
|
onNoClick(): void { |
|
|
|
onNoClick(): void { |
|
|
|
this.dialogRef.close(); |
|
|
|
this.dialogRef.close(); |
|
|
|
} |
|
|
|
} |
|
|
|
add(e) { |
|
|
|
add(e) { |
|
|
|
this.organizationName=e.name |
|
|
|
this.organizationName = e.name; |
|
|
|
this.organizationId=e.id |
|
|
|
this.organizationId = e.id; |
|
|
|
this.organizationLevel=e.level |
|
|
|
this.organizationLevel = e.level; |
|
|
|
if(e.children){//如果点击的父组织有子节点
|
|
|
|
if (e.children) { |
|
|
|
this.organizationchildlength = e.children.length |
|
|
|
//如果点击的父组织有子节点
|
|
|
|
|
|
|
|
this.organizationchildlength = e.children.length; |
|
|
|
} else { |
|
|
|
} else { |
|
|
|
this.organizationchildlength = 0 |
|
|
|
this.organizationchildlength = 0; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
onSubmit(value) { |
|
|
|
onSubmit(value) { |
|
|
|
if(this.organizationLevel){//如果点击了右边的树
|
|
|
|
if (this.organizationLevel) { |
|
|
|
this.http.put( |
|
|
|
//如果点击了右边的树
|
|
|
|
`/api/Organizations/${this.data.id}`,
|
|
|
|
this.http |
|
|
|
{ |
|
|
|
.put(`/api/Organizations/${this.data.id}`, { |
|
|
|
id: this.data.id, |
|
|
|
id: this.data.id, |
|
|
|
code: value.number, |
|
|
|
code: value.number, |
|
|
|
division: value.division, |
|
|
|
division: value.division, |
|
|
|
@ -559,26 +563,26 @@ export class EditOrganization { |
|
|
|
location: null, |
|
|
|
location: null, |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.organizationId, |
|
|
|
parentId: this.organizationId, |
|
|
|
} |
|
|
|
}) |
|
|
|
).subscribe( |
|
|
|
.subscribe( |
|
|
|
data=>{ |
|
|
|
(data) => { |
|
|
|
this.dialogRef.close(); |
|
|
|
this.dialogRef.close(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('修改成功','确定',config); |
|
|
|
this.snackBar.open("修改成功", "确定", config); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('请填写正确格式','确定',config); |
|
|
|
this.snackBar.open("请填写正确格式", "确定", config); |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
}else{ //如果只改了姓名
|
|
|
|
} else { |
|
|
|
this.http.put( |
|
|
|
//如果只改了姓名
|
|
|
|
`/api/Organizations/${this.data.id}`,
|
|
|
|
this.http |
|
|
|
{ |
|
|
|
.put(`/api/Organizations/${this.data.id}`, { |
|
|
|
id: this.data.id, |
|
|
|
id: this.data.id, |
|
|
|
code: value.number, |
|
|
|
code: value.number, |
|
|
|
division: value.division, |
|
|
|
division: value.division, |
|
|
|
@ -588,37 +592,39 @@ export class EditOrganization { |
|
|
|
location: null, |
|
|
|
location: null, |
|
|
|
enabled: true, |
|
|
|
enabled: true, |
|
|
|
parentId: this.data.parentId, |
|
|
|
parentId: this.data.parentId, |
|
|
|
} |
|
|
|
}) |
|
|
|
).subscribe( |
|
|
|
.subscribe( |
|
|
|
data=>{ |
|
|
|
(data) => { |
|
|
|
this.dialogRef.close(); |
|
|
|
this.dialogRef.close(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('修改成功','确定',config); |
|
|
|
this.snackBar.open("修改成功", "确定", config); |
|
|
|
}, |
|
|
|
}, |
|
|
|
err=>{ |
|
|
|
(err) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('请填写正确格式','确定',config); |
|
|
|
this.snackBar.open("请填写正确格式", "确定", config); |
|
|
|
} |
|
|
|
} |
|
|
|
) |
|
|
|
); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//增加下属机关
|
|
|
|
//增加下属机关
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'addOffices', |
|
|
|
selector: "addOffices", |
|
|
|
templateUrl: './addOffices.html', |
|
|
|
templateUrl: "./addOffices.html", |
|
|
|
styleUrls: ['./organization.component.scss'] |
|
|
|
styleUrls: ["./organization.component.scss"], |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class addOffices { |
|
|
|
export class addOffices { |
|
|
|
|
|
|
|
constructor( |
|
|
|
constructor(private http: HttpClient,public dialogRef: MatDialogRef<addOffices>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} |
|
|
|
private http: HttpClient, |
|
|
|
|
|
|
|
public dialogRef: MatDialogRef<addOffices>, |
|
|
|
|
|
|
|
@Inject(MAT_DIALOG_DATA) public data, |
|
|
|
|
|
|
|
public snackBar: MatSnackBar |
|
|
|
|
|
|
|
) {} |
|
|
|
|
|
|
|
|
|
|
|
onNoClick(): void { |
|
|
|
onNoClick(): void { |
|
|
|
this.dialogRef.close(); |
|
|
|
this.dialogRef.close(); |
|
|
|
@ -630,30 +636,35 @@ export class addOffices { |
|
|
|
id: null, |
|
|
|
id: null, |
|
|
|
organizationId: this.data.selectedOrg.id, |
|
|
|
organizationId: this.data.selectedOrg.id, |
|
|
|
officeName: value.name, |
|
|
|
officeName: value.name, |
|
|
|
order: this.data.OfficesList.length == 0 ? 0 : this.data.OfficesList[this.data.OfficesList.length - 1].order, |
|
|
|
order: |
|
|
|
enabled: true |
|
|
|
this.data.OfficesList.length == 0 |
|
|
|
} |
|
|
|
? 0 |
|
|
|
this.http.post('/api/OrganizationsOffices',body).subscribe(data => { |
|
|
|
: this.data.OfficesList[this.data.OfficesList.length - 1].order, |
|
|
|
|
|
|
|
enabled: true, |
|
|
|
|
|
|
|
}; |
|
|
|
|
|
|
|
this.http.post("/api/OrganizationsOffices", body).subscribe((data) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('创建成功','确定',config); |
|
|
|
this.snackBar.open("创建成功", "确定", config); |
|
|
|
this.dialogRef.close('创建成功'); |
|
|
|
this.dialogRef.close("创建成功"); |
|
|
|
}) |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//编辑下属机关
|
|
|
|
//编辑下属机关
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'editOffices', |
|
|
|
selector: "editOffices", |
|
|
|
templateUrl: './editOffices.html', |
|
|
|
templateUrl: "./editOffices.html", |
|
|
|
styleUrls: ['./organization.component.scss'] |
|
|
|
styleUrls: ["./organization.component.scss"], |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class editOffices { |
|
|
|
export class editOffices { |
|
|
|
|
|
|
|
constructor( |
|
|
|
constructor(private http: HttpClient,public dialogRef: MatDialogRef<editOffices>,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} |
|
|
|
private http: HttpClient, |
|
|
|
|
|
|
|
public dialogRef: MatDialogRef<editOffices>, |
|
|
|
|
|
|
|
@Inject(MAT_DIALOG_DATA) public data, |
|
|
|
|
|
|
|
public snackBar: MatSnackBar |
|
|
|
|
|
|
|
) {} |
|
|
|
|
|
|
|
|
|
|
|
ngOnInit(): void { |
|
|
|
ngOnInit(): void { |
|
|
|
// console.log(this.data)
|
|
|
|
// console.log(this.data)
|
|
|
|
@ -661,7 +672,7 @@ export class editOffices { |
|
|
|
onNoClick(): void { |
|
|
|
onNoClick(): void { |
|
|
|
this.dialogRef.close(); |
|
|
|
this.dialogRef.close(); |
|
|
|
} |
|
|
|
} |
|
|
|
officeName:any = this.data.item.officeName |
|
|
|
officeName: any = this.data.item.officeName; |
|
|
|
onSubmit(value) { |
|
|
|
onSubmit(value) { |
|
|
|
// console.log(value)
|
|
|
|
// console.log(value)
|
|
|
|
let body = { |
|
|
|
let body = { |
|
|
|
@ -669,14 +680,16 @@ export class editOffices { |
|
|
|
organizationId: this.data.item.organizationId, |
|
|
|
organizationId: this.data.item.organizationId, |
|
|
|
officeName: value.name, |
|
|
|
officeName: value.name, |
|
|
|
order: this.data.item.order, |
|
|
|
order: this.data.item.order, |
|
|
|
enabled: true |
|
|
|
enabled: true, |
|
|
|
} |
|
|
|
}; |
|
|
|
this.http.put(`/api/OrganizationsOffices/${this.data.item.id}`,body).subscribe(data => { |
|
|
|
this.http |
|
|
|
|
|
|
|
.put(`/api/OrganizationsOffices/${this.data.item.id}`, body) |
|
|
|
|
|
|
|
.subscribe((data) => { |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
const config = new MatSnackBarConfig(); |
|
|
|
config.verticalPosition = 'top'; |
|
|
|
config.verticalPosition = "top"; |
|
|
|
config.duration = 3000 |
|
|
|
config.duration = 3000; |
|
|
|
this.snackBar.open('修改成功','确定',config); |
|
|
|
this.snackBar.open("修改成功", "确定", config); |
|
|
|
this.dialogRef.close('修改成功'); |
|
|
|
this.dialogRef.close("修改成功"); |
|
|
|
}) |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
