From ee5731aef9fb2d5cc91292827e5daea7f1449d81 Mon Sep 17 00:00:00 2001 From: jingbowen <970029315@qq.com> Date: Wed, 10 Aug 2022 17:24:03 +0800 Subject: [PATCH] 123 --- .../unit-details/unit-details.component.ts | 6 +- .../home/basic-info/unit/unit.component.ts | 56 +++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/app/home/basic-info/unit-details/unit-details.component.ts b/src/app/home/basic-info/unit-details/unit-details.component.ts index 274a2c0..74f5dac 100644 --- a/src/app/home/basic-info/unit-details/unit-details.component.ts +++ b/src/app/home/basic-info/unit-details/unit-details.component.ts @@ -1,6 +1,7 @@ import { Component, Renderer2, OnDestroy, AfterViewInit, ElementRef, OnInit, ViewChild } from '@angular/core'; import { CustomReuseStrategy } from 'src/app/CustomReuseStrategy'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { Router } from '@angular/router'; import { HttpClient } from '@angular/common/http'; import { asBlob } from 'html-docx-js-typescript' // 要保存这个docx文件推荐引入file-saver哦,你可以用npm i -D file-saver来安装 @@ -13,7 +14,7 @@ import { saveAs } from 'file-saver' export class UnitDetailsComponent implements OnInit { @ViewChild('box') box: ElementRef; - constructor(private fb: FormBuilder, private http: HttpClient, private renderer: Renderer2, private el: ElementRef) { + constructor(private router: Router,private fb: FormBuilder, private http: HttpClient, private renderer: Renderer2, private el: ElementRef) { } datas= { @@ -73,7 +74,8 @@ export class UnitDetailsComponent implements OnInit { jiuyuanzhan=[] id='62f209e9f63e69362ed3239e' ngOnInit(): void { - console.log(666,this.datas); + console.log(this.router); + this.validateForm = this.fb.group({ unit: [null, [Validators.required]], name: [null], diff --git a/src/app/home/basic-info/unit/unit.component.ts b/src/app/home/basic-info/unit/unit.component.ts index 6ac1498..6e0da39 100644 --- a/src/app/home/basic-info/unit/unit.component.ts +++ b/src/app/home/basic-info/unit/unit.component.ts @@ -8,7 +8,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { NzModalService } from 'ng-zorro-antd/modal'; import { NzMessageService } from 'ng-zorro-antd/message'; import { AddUnitComponent } from '../add-unit/add-unit.component'; -import { UnitEditComponent } from '../unit-edit/unit-edit.component' +import { UnitEditComponent }from '../unit-edit/unit-edit.component' @Component({ selector: 'app-unit', templateUrl: './unit.component.html', @@ -25,38 +25,45 @@ export class UnitComponent implements OnInit { datas = "" ngOnInit(): void { + this.validateForm = this.fb.group({ + level: [null], + type: [null], + event: [null], + area: [null], + disposalState: [null], + + }); + this.getCompanies() } searchValue = ''; - next() { this.router.navigate(['/basicInfo/unit/details']); } - - totalCount - pageChange($event) { - - } - nzLoading = false getCompanies() { - this.nzLoading = true this.http.get('/api/Companies').subscribe((data: any) => { - this.nzLoading = false console.log(data); + this.listOfData = data.items this.listOfData = [...this.listOfData] console.log(this.listOfData); - + + for (let index = 0; index < this.listOfData.length; index++) { + this.listOfData[index].creationTime=this.listOfData[index].creationTime.substring(0,10) + + } }) } ngOnDestroy(): void { + console.log('删除了6666666666666') // CustomReuseStrategy.deleteRouteSnapshot('/basicInfo/unit'); } - + addOr(node?: any) { - + console.log(node); + const modal = this.modal.create({ nzTitle: "新增单位", nzContent: AddUnitComponent, @@ -82,12 +89,15 @@ export class UnitComponent implements OnInit { } this.http.post('/api/Companies', body).subscribe({ next: (data: any) => { - console.log(data, 80808) - + this.message.create('success', '编辑成功!'); + modal.destroy() + this.getCompanies() + return true }, error: (err) => { - console.log(err) + this.message.create('warning', '创建失败'); + return false } } @@ -103,17 +113,5 @@ export class UnitComponent implements OnInit { const instance = modal.getContentComponent(); } - - - look(data) { - this.router.navigate(['/basicInfo/unit/details'], { queryParams: { id: data.id, pattern: 'look' } }) - } - - edit(data) { - this.router.navigate(['/basicInfo/unit/details'], { queryParams: { id: data.id, pattern: 'edit' } }) - } - - delete(data) { - - } + }