update

src/main/webapp/app/modal/basic-edit/basic-edit.component.html

@@ -21,10 +21,10 @@
 
                     <div nz-col [nzSpan]="12">
                         <nz-form-item nzFlex>
-                            <nz-form-label [nzSpan]="6" nzFor="os">操作系统</nz-form-label>
+                            <nz-form-label [nzSpan]="6" nzFor="invertoryname">品牌</nz-form-label>
                             <nz-form-control [nzSpan]="14">
-                                <input id="os" nz-input placeholder="操作系统" name="inventory_os"
-                                       [(ngModel)]="validateForm.inventory.os">
+                                <input id="invertoryname" nz-input placeholder="品牌" name="invertoryname"
+                                       [(ngModel)]="validateForm.inventory.invertoryname">
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -47,10 +47,10 @@
 
                     <div nz-col [nzSpan]="12">
                         <nz-form-item nzFlex>
-                            <nz-form-label [nzSpan]="6" nzFor="name">厂商</nz-form-label>
+                            <nz-form-label [nzSpan]="6" nzFor="serialnoA">型号</nz-form-label>
                             <nz-form-control [nzSpan]="14">
-                                <input id="inventory_name" nz-input placeholder="厂商" name="inventory_name"
-                                       [(ngModel)]="validateForm.inventory.name">
+                                <input id="serialnoA" nz-input placeholder="型号" name="serialnoA"
+                                       [(ngModel)]="validateForm.inventory.serialnoA">
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -68,10 +68,31 @@
 
                     <div nz-col [nzSpan]="12">
                         <nz-form-item nzFlex>
-                            <nz-form-label [nzSpan]="6" nzFor="serialno_a">产品序列号</nz-form-label>
+                            <nz-form-label [nzSpan]="6" nzFor="mac">MAC地址</nz-form-label>
                             <nz-form-control [nzSpan]="14">
-                                <input id="serialno_a" nz-input placeholder="产品序列号" name="inventory_serialno_a"
-                                       [(ngModel)]="validateForm.inventory.serialno_a">
+                                <input id="mac" nz-input placeholder="MAC地址" name="mac"
+                                       [(ngModel)]="validateForm.inventory.mac">
+                            </nz-form-control>
+                        </nz-form-item>
+                    </div>
+                </div>
+
+                <div nz-row [nzGutter]="24">
+                    <div nz-col [nzSpan]="12">
+                        <nz-form-item nzFlex>
+                            <nz-form-label [nzOffset]="4" [nzSpan]="6" nzRequired nzFor="storageLocation">存放地点</nz-form-label>
+                            <nz-form-control [nzSpan]="14">
+                                <input id="storageLocation" nz-input placeholder="存放地点" name="storageLocation" [(ngModel)]="validateForm.storageLocation">
+                            </nz-form-control>
+                        </nz-form-item>
+                    </div>
+
+                    <div nz-col [nzSpan]="12">
+                        <nz-form-item nzFlex>
+                            <nz-form-label [nzSpan]="6" nzFor="maintenanceExpiration">维保到期</nz-form-label>
+                            <nz-form-control [nzSpan]="14">
+                                <input id="maintenanceExpiration" nz-input placeholder="维保到期" name="maintenanceExpiration"
+                                       [(ngModel)]="validateForm.inventory.maintenanceExpiration">
                             </nz-form-control>
                         </nz-form-item>
                     </div>

src/main/webapp/app/modal/basic-edit/basic-edit.component.ts

@@ -99,9 +99,11 @@ export class BasicEditComponent implements OnInit {
                 this.validateForm.tls_issuer = data.tls_issuer + '';
                 this.validateForm.tls_subject = data.tls_subject + '';
                 this.validateForm.tls_psk = data.tls_psk + '';
-                this.validateForm.inventory.os = data.inventory.os;
-                this.validateForm.inventory.name = data.inventory.invertoryname;
-                this.validateForm.inventory.serialno_a = data.inventory.serialno_a;
+                this.validateForm.inventory.serialnoA = data.inventory.serialnoA;
+                this.validateForm.inventory.invertoryname = data.inventory.invertoryname;
+                this.validateForm.inventory.mac = data.inventory.mac;
+                this.validateForm.inventory.storageLocation = data.inventory.storageLocation;
+                this.validateForm.inventory.maintenanceExpiration = data.inventory.maintenanceExpiration;
                 this.validateForm.hostExtend.equipmentTypeid = data.hostExtend.equipmentTypeid +'';
                 this.validateForm.hostExtend.secondLevelTypeid = data.hostExtend.secondLevelTypeid +'';
                 this.validateForm.hostExtend.serviceid = data.hostExtend.serviceid +'';
@@ -396,9 +398,11 @@ export class BasicEditComponent implements OnInit {
             macros: this.macroList1,
             interfaces: this.interfaceslist,  //接口
             inventory: {
-                os: null,
-                name: null,
-                serialno_a: null
+                serialnoA: null,
+                invertoryname: null,
+                mac: null,
+                storageLocation: null,
+                maintenanceExpiration: null
             },
             templates: null,
             name: null,