From 1bf1750a2c2cafdbd7413fe18d16915a7f71ff52 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 05 Jul 2018 11:54:46 +0800
Subject: [PATCH] 设备保存bug修复

---
 src/app/routes/devices/basic-info/device-edit/device-edit.component.html |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
index b3b6f4b..e9400e4 100644
--- a/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
+++ b/src/app/routes/devices/basic-info/device-edit/device-edit.component.html
@@ -105,13 +105,23 @@
                 </nz-input>
             </div>
           </div>
+  </form>   
     <div class="modal-footer">
+         <span style="padding: 5px 10px;">
+            ������:                  
+          </span>
+          <nz-select style="width: 240px;" [(ngModel)]="configMap.orgId" (ngModelChange)="setOrgId($event)" [nzPlaceHolder]="'������ ������(������������������)'"
+            nzAllowClear [nzFilter]="false" nzShowSearch  (nzSearchChange)="orgSelectChange($event)" [nzNotFoundContent]="'������������'" >
+            <nz-option *ngFor="let option of orgOptions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+            </nz-option>
+          </nz-select>
+          &nbsp;
         <button nz-button type="button" (click)="close()">������</button>
-        <button nz-button [nzType]="'primary'" [nzLoading]="isSaving">
+        <button nz-button [nzType]="'primary'" (click)="save(null,validateForm.value,validateForm.valid)" [nzLoading]="isSaving">
           <span>
             ������
             <span *ngIf="isSaving">���</span>
           </span>
         </button>
     </div>
-  </form>
+

--
Gitblit v1.8.0