|
|
|
@ -1,5 +1,8 @@ |
|
|
|
import { HttpClient } from '@angular/common/http'; |
|
|
|
import { HttpClient } from '@angular/common/http'; |
|
|
|
import { Component, OnInit } from '@angular/core'; |
|
|
|
import { Component, OnInit, ViewContainerRef } from '@angular/core'; |
|
|
|
|
|
|
|
import { NzMessageService } from 'ng-zorro-antd/message'; |
|
|
|
|
|
|
|
import { NzModalService } from 'ng-zorro-antd/modal'; |
|
|
|
|
|
|
|
import { AllotPersonComponent } from './allot-person/allot-person.component'; |
|
|
|
|
|
|
|
|
|
|
|
@Component({ |
|
|
|
@Component({ |
|
|
|
selector: 'app-da-subordinate-audit', |
|
|
|
selector: 'app-da-subordinate-audit', |
|
|
|
@ -8,42 +11,58 @@ import { Component, OnInit } from '@angular/core'; |
|
|
|
}) |
|
|
|
}) |
|
|
|
export class DaSubordinateAuditComponent implements OnInit { |
|
|
|
export class DaSubordinateAuditComponent implements OnInit { |
|
|
|
|
|
|
|
|
|
|
|
constructor(private http: HttpClient) { } |
|
|
|
constructor(private http: HttpClient, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private message: NzMessageService) { } |
|
|
|
|
|
|
|
|
|
|
|
OrganizationId |
|
|
|
OrganizationId |
|
|
|
selectedTab = 0 |
|
|
|
selectedTab = 0 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
atPresentData = { id: 0, name: '', finished: 0, totalCount: 0, list: [] } |
|
|
|
|
|
|
|
|
|
|
|
selectTab(item) { |
|
|
|
selectTab(item) { |
|
|
|
this.selectedTab = item |
|
|
|
this.selectedTab = item.id |
|
|
|
|
|
|
|
this.atPresentData = item |
|
|
|
} |
|
|
|
} |
|
|
|
ngOnInit(): void { |
|
|
|
ngOnInit(): void { |
|
|
|
this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId |
|
|
|
this.OrganizationId = JSON.parse(sessionStorage.getItem('userData')).organizationId |
|
|
|
let month = new Date().getMonth() + 1 |
|
|
|
this.selectedMonth = new Date().getMonth() + 1 |
|
|
|
this.selectedMonth = month + '月' |
|
|
|
|
|
|
|
|
|
|
|
this.getTaskList(0) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//获得主协调查人员
|
|
|
|
|
|
|
|
this.getSupervisor('main') |
|
|
|
|
|
|
|
this.getSupervisor('assisted') |
|
|
|
|
|
|
|
|
|
|
|
this.getTaskList() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
months = [ |
|
|
|
months = [ |
|
|
|
{ name: '1月', isable: true }, |
|
|
|
{ id: 1, name: '1月', isable: true }, |
|
|
|
{ name: '2月', isable: true }, |
|
|
|
{ id: 2, name: '2月', isable: true }, |
|
|
|
{ name: '3月', isable: true }, |
|
|
|
{ id: 3, name: '3月', isable: true }, |
|
|
|
{ name: '4月', isable: true }, |
|
|
|
{ id: 4, name: '4月', isable: true }, |
|
|
|
{ name: '5月', isable: true }, |
|
|
|
{ id: 5, name: '5月', isable: true }, |
|
|
|
{ name: '6月', isable: true }, |
|
|
|
{ id: 6, name: '6月', isable: true }, |
|
|
|
{ name: '7月', isable: true }, |
|
|
|
{ id: 7, name: '7月', isable: true }, |
|
|
|
{ name: '8月', isable: true }, |
|
|
|
{ id: 8, name: '8月', isable: true }, |
|
|
|
{ name: '9月', isable: true }, |
|
|
|
{ id: 9, name: '9月', isable: true }, |
|
|
|
{ name: '10月', isable: true }, |
|
|
|
{ id: 10, name: '10月', isable: true }, |
|
|
|
{ name: '11月', isable: true }, |
|
|
|
{ id: 11, name: '11月', isable: true }, |
|
|
|
{ name: '12月', isable: true } |
|
|
|
{ id: 12, name: '12月', isable: true } |
|
|
|
] |
|
|
|
] |
|
|
|
selectedMonth |
|
|
|
selectedMonth |
|
|
|
|
|
|
|
selectedYear = 2022 |
|
|
|
|
|
|
|
selectedTime |
|
|
|
selectMonth(item) { |
|
|
|
selectMonth(item) { |
|
|
|
this.selectedMonth = item.name |
|
|
|
this.selectedMonth = item.id |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.getTaskList(this.selectedTab) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
selectYear(e) { |
|
|
|
|
|
|
|
this.selectedYear = e |
|
|
|
|
|
|
|
console.log('年', e) |
|
|
|
|
|
|
|
this.getTaskList(this.selectedTab) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
nzLoading = false |
|
|
|
|
|
|
|
PageNumber = 1 |
|
|
|
PageNumber = 1 |
|
|
|
PageSize = 9999 |
|
|
|
PageSize = 9999 |
|
|
|
|
|
|
|
|
|
|
|
@ -52,11 +71,17 @@ export class DaSubordinateAuditComponent implements OnInit { |
|
|
|
{ id: 1, name: '联络指导任务', finished: 0, totalCount: 0, list: [] } |
|
|
|
{ id: 1, name: '联络指导任务', finished: 0, totalCount: 0, list: [] } |
|
|
|
] |
|
|
|
] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
isloading = false |
|
|
|
getTaskList() { |
|
|
|
getTaskList(index) { |
|
|
|
this.nzLoading = true |
|
|
|
this.isloading = true |
|
|
|
|
|
|
|
this.data = [ |
|
|
|
|
|
|
|
{ id: 0, name: '熟悉演练任务', finished: 0, totalCount: 0, list: [] }, |
|
|
|
|
|
|
|
{ id: 1, name: '联络指导任务', finished: 0, totalCount: 0, list: [] } |
|
|
|
|
|
|
|
] |
|
|
|
|
|
|
|
let selectedTime = this.selectedYear + '-' + this.selectedMonth + '-' + '01' |
|
|
|
|
|
|
|
console.log('查询时间', selectedTime) |
|
|
|
let params = { |
|
|
|
let params = { |
|
|
|
|
|
|
|
Month: selectedTime, |
|
|
|
OrganizationId: this.OrganizationId, |
|
|
|
OrganizationId: this.OrganizationId, |
|
|
|
PageNumber: this.PageNumber, |
|
|
|
PageNumber: this.PageNumber, |
|
|
|
PageSize: this.PageSize |
|
|
|
PageSize: this.PageSize |
|
|
|
@ -64,8 +89,6 @@ export class DaSubordinateAuditComponent implements OnInit { |
|
|
|
this.http.get('/api/PlanTasks', { |
|
|
|
this.http.get('/api/PlanTasks', { |
|
|
|
params: params |
|
|
|
params: params |
|
|
|
}).subscribe((data: any) => { |
|
|
|
}).subscribe((data: any) => { |
|
|
|
this.nzLoading = false |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let arr1 = [] |
|
|
|
let arr1 = [] |
|
|
|
let arr2 = [] |
|
|
|
let arr2 = [] |
|
|
|
data.items.forEach(element => { |
|
|
|
data.items.forEach(element => { |
|
|
|
@ -91,8 +114,126 @@ export class DaSubordinateAuditComponent implements OnInit { |
|
|
|
this.data[1].totalCount = arr2.length |
|
|
|
this.data[1].totalCount = arr2.length |
|
|
|
this.data[1].list = [...arr2] |
|
|
|
this.data[1].list = [...arr2] |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
this.atPresentData = this.data[index] |
|
|
|
|
|
|
|
console.log(this.atPresentData) |
|
|
|
|
|
|
|
this.isloading = false |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
assitantsupervisorList |
|
|
|
|
|
|
|
mainsupervisorList |
|
|
|
|
|
|
|
getSupervisor(type) { |
|
|
|
|
|
|
|
let params = { |
|
|
|
|
|
|
|
inspectorType: type |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.http.get('/api/Users/Inspectors', { |
|
|
|
|
|
|
|
params: params |
|
|
|
|
|
|
|
}).subscribe((data: any) => { |
|
|
|
|
|
|
|
console.log('检查员列表', data) |
|
|
|
|
|
|
|
if (type == 'main') { |
|
|
|
|
|
|
|
this.mainsupervisorList = data |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.assitantsupervisorList = data |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
allot(item) { |
|
|
|
|
|
|
|
console.log(item) |
|
|
|
|
|
|
|
if (this.mainsupervisorList.length == 0 || this.assitantsupervisorList.length == 0) { |
|
|
|
|
|
|
|
this.message.create('warning', '请从用户管理添加检查人员'); |
|
|
|
|
|
|
|
return |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
const modal = this.modal.create({ |
|
|
|
|
|
|
|
nzTitle: '分配监督检查员', |
|
|
|
|
|
|
|
nzContent: AllotPersonComponent, |
|
|
|
|
|
|
|
nzViewContainerRef: this.viewContainerRef, |
|
|
|
|
|
|
|
nzWidth: 485, |
|
|
|
|
|
|
|
nzMaskClosable: false, |
|
|
|
|
|
|
|
nzComponentParams: { |
|
|
|
|
|
|
|
mainsupervisorList: this.mainsupervisorList, |
|
|
|
|
|
|
|
assitantsupervisorList: this.assitantsupervisorList |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
nzOnOk: async () => { |
|
|
|
|
|
|
|
if (instance.validateForm.valid) { |
|
|
|
|
|
|
|
await new Promise((resolve, reject) => { |
|
|
|
|
|
|
|
let body = { |
|
|
|
|
|
|
|
mainSupervisorId: instance.validateForm.value.main, |
|
|
|
|
|
|
|
assitantSupervisorId: instance.validateForm.value.assitant |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
this.http.patch(`/api/PlanTasks/${item.id}`, body).subscribe({ |
|
|
|
|
|
|
|
next: async (data) => { |
|
|
|
|
|
|
|
this.message.create('success', '分配成功'); |
|
|
|
|
|
|
|
resolve(data) |
|
|
|
|
|
|
|
this.getTaskList(this.selectedTab) |
|
|
|
|
|
|
|
return true |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
error: (err) => { |
|
|
|
|
|
|
|
this.message.create('warning', '分配失败'); |
|
|
|
|
|
|
|
reject(err) |
|
|
|
|
|
|
|
return false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
this.message.create('warning', '请填写完整！'); |
|
|
|
|
|
|
|
return false |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
const instance = modal.getContentComponent(); |
|
|
|
|
|
|
|
modal.afterOpen.subscribe(() => console.log('[afterOpen] emitted!')); |
|
|
|
|
|
|
|
modal.afterClose.subscribe(result => console.log('[afterClose] The result is:', result)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
agree(item) { |
|
|
|
|
|
|
|
this.modal.confirm({ |
|
|
|
|
|
|
|
nzTitle: `确定要同意该申请吗?`, |
|
|
|
|
|
|
|
nzOkText: '确定', |
|
|
|
|
|
|
|
nzOkType: 'default', |
|
|
|
|
|
|
|
nzOnOk: () => { |
|
|
|
|
|
|
|
this.http.post(`/api/PlanTasks/Approval/${item.id}`, null, { |
|
|
|
|
|
|
|
params: { |
|
|
|
|
|
|
|
approvalStatus: 'approved' |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}).subscribe({ |
|
|
|
|
|
|
|
next: (data) => { |
|
|
|
|
|
|
|
this.message.create('success', '审核成功'); |
|
|
|
|
|
|
|
this.getTaskList(this.selectedTab) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
error: (err) => { |
|
|
|
|
|
|
|
this.message.create('warning', '审核失败'); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
nzCancelText: '取消' |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
reject(item) { |
|
|
|
|
|
|
|
this.modal.confirm({ |
|
|
|
|
|
|
|
nzTitle: `确定要驳回该申请吗?`, |
|
|
|
|
|
|
|
nzOkText: '确定', |
|
|
|
|
|
|
|
nzOkType: 'default', |
|
|
|
|
|
|
|
nzOnOk: () => { |
|
|
|
|
|
|
|
this.http.post(`/api/PlanTasks/Approval/${item.id}`, null, { |
|
|
|
|
|
|
|
params: { |
|
|
|
|
|
|
|
approvalStatus: 'reject' |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}).subscribe({ |
|
|
|
|
|
|
|
next: (data) => { |
|
|
|
|
|
|
|
this.message.create('success', '审核成功'); |
|
|
|
|
|
|
|
this.getTaskList(this.selectedTab) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
error: (err) => { |
|
|
|
|
|
|
|
this.message.create('warning', '审核失败'); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}) |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
nzCancelText: '取消' |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
