diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html index b4f7fdf..69507aa 100644 --- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html +++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html @@ -6,13 +6,12 @@ - - - - +

维保

+

报废


+ 已处置
+ 已处置
器材名称:{{newdata.name}}
处置方式:维保
处置方式:报废
@@ -22,6 +21,13 @@ 下次维保日期:{{newdata.maintenanceDate | date:"yyyy-MM-dd"}}
有效期至:{{newdata.validityEndTime | date:"yyyy-MM-dd"}}

+ +

+ 器材名称:{{data2.violatedItemSnapshotObj.name}}
+ 存放地点:{{data2.violatedItemSnapshotObj.storageLocation}}
+ 有效期至:{{data2.violatedItemSnapshotObj.validityEndTime | date:"yyyy-MM-dd"}} +

+

消防器材名称

@@ -67,7 +73,6 @@
-
diff --git a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts index 6fb797c..3672893 100644 --- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts +++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.ts @@ -17,13 +17,16 @@ export class DisposeequipmentComponent implements OnInit { radioValue = "A" data2 copydata2 - + isScrap isScraped newdata ngOnInit(): void { this.data2 = JSON.parse(JSON.stringify(this.data)) this.copydata2 = JSON.parse(JSON.stringify(this.data)) + + + console.log('快照预警数据', this.data2) if (this.data2.handleTime) { let params = { @@ -38,6 +41,12 @@ export class DisposeequipmentComponent implements OnInit { this.isScraped = '维保' } }) + }else{ + if(this.data2.desc == '维保'){ + this.isScrap = false + }else{ + this.isScrap = true + } } this.validateForm = this.fb.group({ @@ -57,13 +66,4 @@ export class DisposeequipmentComponent implements OnInit { ok() { this.modal.triggerOk() } - //是否报废 - isScrap = false - ngModelChange(e) { - if (e == 'A') { - this.isScrap = false - } else { - this.isScrap = true - } - } }