From 309d1f9d649daa08bb9b068af014749f6d4a5bce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 06 Jul 2018 14:00:45 +0800
Subject: [PATCH] 设备和监控点父页面 筛选条件不予 编辑页面联动
---
src/app/routes/systems/organization/organization-edit/organization-edit.component.html | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/app/routes/systems/organization/organization-edit/organization-edit.component.html b/src/app/routes/systems/organization/organization-edit/organization-edit.component.html
index 7830d63..b945e8e 100644
--- a/src/app/routes/systems/organization/organization-edit/organization-edit.component.html
+++ b/src/app/routes/systems/organization/organization-edit/organization-edit.component.html
@@ -14,7 +14,7 @@
<label>������</label>
</div>
<div nz-form-control nz-col [nzSpan]="4" nzHasFeedback>
- <nz-select style="width: 120px;" formControlName="rank" [nzPlaceHolder]="'������ ������'">
+ <nz-select style="width:100%;" formControlName="rank" [nzPlaceHolder]="'������ ������'">
<nz-option *ngFor="let option of rankOptions" [nzLabel]="option.label" [nzValue]="option.value" [nzDisabled]="option.disabled">
</nz-option>
</nz-select>
@@ -58,15 +58,16 @@
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<label nz-form-item-required>������������</label>
</div>
- <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
- <nz-datepicker nzSize="large" style="width: 90%;" formControlName="createTime" nzShowTime [nzPlaceHolder]="'������������'"
+ <div nz-form-control nz-col [nzSpan]="6" nzHasFeedback>
+ <nz-datepicker nzSize="large" style="width:100%;" formControlName="createTime" nzShowTime [nzPlaceHolder]="'������������'"
[nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
</div>
+ <div nz-form-control nz-col [nzSpan]="1" nzHasFeedback></div>
<div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
<label nz-form-item-required>������������</label>
</div>
<div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
- <nz-datepicker nzSize="large" style="width: 90%;" formControlName="expireTime" nzShowTime [nzPlaceHolder]="'������������'"
+ <nz-datepicker nzSize="large" style="width:100%;" formControlName="expireTime" nzShowTime [nzPlaceHolder]="'������������'"
[nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
</div>
</div>
--
Gitblit v1.8.0