From 9cd223e02abde85ba740ae8117e02f254c329167 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 21 Jun 2018 11:42:26 +0800
Subject: [PATCH] 优化
---
src/app/routes/reports/demo/demo.component.ts | 2 +-
src/app/routes/systems/account/account-edit/account-edit.component.html | 2 +-
src/app/routes/systems/account/account-edit/account-edit.component.ts | 8 ++++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/app/routes/reports/demo/demo.component.ts b/src/app/routes/reports/demo/demo.component.ts
index 9a81c7e..c279929 100644
--- a/src/app/routes/reports/demo/demo.component.ts
+++ b/src/app/routes/reports/demo/demo.component.ts
@@ -168,7 +168,7 @@
});
break;
case 1:
- this.areacodeService.getAreas(option.value).subscribe(
+ this.areacodeService.getAreas(option.value,false).subscribe(
(res: {label: string, value: string}[]) => {
event.resolve(res);
});
diff --git a/src/app/routes/systems/account/account-edit/account-edit.component.html b/src/app/routes/systems/account/account-edit/account-edit.component.html
index edcd62d..58b2dad 100644
--- a/src/app/routes/systems/account/account-edit/account-edit.component.html
+++ b/src/app/routes/systems/account/account-edit/account-edit.component.html
@@ -39,7 +39,7 @@
</div>
<div nz-form-control nz-col [nzSpan]="8" nzHasFeedback>
<nz-select style="width: 290px;" nzAllowClear [nzPlaceHolder]="'input search text'" [nzFilter]="false" nzShowSearch
- formControlName="organizationId" (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'������������'" >
+ formControlName="organizationId" (nzSearchChange)="searchChange($event)" [nzNotFoundContent]="'������������'" required>
<nz-option *ngFor="let option of searchOptions" [nzLabel]="option['name']" [nzValue]="option['id']"> </nz-option>
</nz-select>
</div>
diff --git a/src/app/routes/systems/account/account-edit/account-edit.component.ts b/src/app/routes/systems/account/account-edit/account-edit.component.ts
index 01a6157..809b306 100644
--- a/src/app/routes/systems/account/account-edit/account-edit.component.ts
+++ b/src/app/routes/systems/account/account-edit/account-edit.component.ts
@@ -3,6 +3,8 @@
import {HttpClient} from '@angular/common/http';
import {environment} from '../../../../../environments/environment';
import {FormGroup, FormBuilder, FormControl, Validators} from '@angular/forms';
+import * as $ from 'jquery';
+
@Component({
selector: 'app-account-edit',
@@ -35,6 +37,12 @@
id: [account.id]
});
this.searchOptions = account.organization ? [account.organization] : [];
+
+ $(document).keydown(function(event) {
+ switch (event.keyCode) {
+ case 13: return false;
+ }
+ });
}
save() {
--
Gitblit v1.8.0