update

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

@@ -24,7 +24,7 @@
                             <nz-form-label [nzSpan]="6" nzFor="invertoryname">品牌</nz-form-label>
                             <nz-form-control [nzSpan]="14">
                                 <input id="invertoryname" nz-input placeholder="品牌" name="invertoryname"
-                                       [(ngModel)]="validateForm.inventory.invertoryname">
+                                       [(ngModel)]="validateForm.inventoryExtend.invertoryname">
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -50,7 +50,7 @@
                             <nz-form-label [nzSpan]="6" nzFor="serialnoA">型号</nz-form-label>
                             <nz-form-control [nzSpan]="14">
                                 <input id="serialnoA" nz-input placeholder="型号" name="serialnoA"
-                                       [(ngModel)]="validateForm.inventory.serialnoA">
+                                       [(ngModel)]="validateForm.inventoryExtend.serialnoA">
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -71,7 +71,7 @@
                             <nz-form-label [nzSpan]="6" nzFor="mac">MAC地址</nz-form-label>
                             <nz-form-control [nzSpan]="14">
                                 <input id="mac" nz-input placeholder="MAC地址" name="mac"
-                                       [(ngModel)]="validateForm.inventory.mac">
+                                       [(ngModel)]="validateForm.inventoryExtend.mac">
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -82,7 +82,7 @@
                         <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">
+                                <input id="storageLocation" nz-input placeholder="存放地点" name="storageLocation" [(ngModel)]="validateForm.inventoryExtend.storageLocation">
                             </nz-form-control>
                         </nz-form-item>
                     </div>
@@ -92,7 +92,7 @@
                             <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">
+                                       [(ngModel)]="validateForm.inventoryExtend.maintenanceExpiration">
                             </nz-form-control>
                         </nz-form-item>
                     </div>

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

@@ -99,11 +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.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.inventoryExtend = data.inventoryExtend;
+                // this.validateForm.inventoryExtend.invertoryname = data.inventoryExtend.invertoryname;
+                // this.validateForm.inventoryExtend.mac = data.inventoryExtend.mac;
+                // this.validateForm.inventoryExtend.storageLocation = data.inventoryExtend.storageLocation;
+                // this.validateForm.inventoryExtend.maintenanceExpiration = data.inventoryExtend.maintenanceExpiration;
                 this.validateForm.hostExtend.equipmentTypeid = data.hostExtend.equipmentTypeid +'';
                 this.validateForm.hostExtend.secondLevelTypeid = data.hostExtend.secondLevelTypeid +'';
                 this.validateForm.hostExtend.serviceid = data.hostExtend.serviceid +'';
@@ -397,7 +397,7 @@ export class BasicEditComponent implements OnInit {
             },
             macros: this.macroList1,
             interfaces: this.interfaceslist,  //接口
-            inventory: {
+            inventoryExtend: {
                 serialnoA: null,
                 invertoryname: null,
                 mac: null,