From fd7b11ec894b6f8c5cc736489c0f26eec35ad3ce Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 11 May 2018 17:20:53 +0800
Subject: [PATCH] 设备 增加 行业

---
 src/app/routes/devices/basic-info/device-edit/device-edit.component.html |   46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 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 7df6bba..b3b6f4b 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
@@ -60,6 +60,22 @@
           </div>
           <div nz-form-item  nz-row class="mb-sm">
             <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+              <label>������������</label>
+            </div>
+            <div nz-form-control nz-col [nzSpan]="7" 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-label nz-col [nzSm]="4" [nzXs]="24">
+              <label>������������</label>
+            </div>
+            <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+                <nz-datepicker nzSize="large"  style="width: 100%;" formControlName="installTime" nzShowTime  [nzPlaceHolder]="'������������'"
+                [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
+            </div>
+          </div>
+          <div nz-form-item  nz-row class="mb-sm">
+            <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
               <label>������������</label>
             </div>
             <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
@@ -70,29 +86,25 @@
                 </nz-select>
             </div>
             <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-              <label>������������</label>
+              <label>������</label>
             </div>
             <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
+                <nz-select formControlName="professionId" [nzPlaceHolder]="'������ ������������'"
+                nzAllowClear [nzFilter]="false" nzShowSearch (nzSearchChange)="monitorPointChange($event)" [nzNotFoundContent]="'������������'" >
+                  <nz-option *ngFor="let option of professions" [nzLabel]="option.name" [nzValue]="option.id" [nzDisabled]="option.disabled">
+                  </nz-option>
+                </nz-select>
+            </div>
+          </div>
+          <div nz-form-item  nz-row class="mb-sm">
+            <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
+              <label>������������</label>
+            </div>
+            <div nz-form-control nz-col [nzSpan]="10" nzHasFeedback>
                 <nz-input formControlName="address" maxlength="20" [nzPlaceHolder]="'���������������������������'">
                 </nz-input>
             </div>
           </div>
-          <div nz-form-item  nz-row class="mb-sm">
-              <div nz-form-label nz-col [nzSm]="4" [nzXs]="24">
-                <label>������������</label>
-              </div>
-              <div nz-form-control nz-col [nzSpan]="7" 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-label nz-col [nzSm]="4" [nzXs]="24">
-                <label>������������</label>
-              </div>
-              <div nz-form-control nz-col [nzSpan]="7" nzHasFeedback>
-                  <nz-datepicker nzSize="large"  style="width: 100%;" formControlName="installTime" nzShowTime  [nzPlaceHolder]="'������������'"
-                  [nzFormat]="'YYYY-MM-DD HH:mm:ss'" ></nz-datepicker>
-              </div>
-            </div>
     <div class="modal-footer">
         <button nz-button type="button" (click)="close()">������</button>
         <button nz-button [nzType]="'primary'" [nzLoading]="isSaving">

--
Gitblit v1.8.0