diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
index c38b226..7d0c97f 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
@@ -612,10 +612,10 @@ export class CriminalRecordsAdminComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD'),
isScrapped: true,
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
@@ -639,10 +639,10 @@ export class CriminalRecordsAdminComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
diff --git a/src/app/pages/criminal-records/criminal-records.component.ts b/src/app/pages/criminal-records/criminal-records.component.ts
index d369560..28fd58b 100644
--- a/src/app/pages/criminal-records/criminal-records.component.ts
+++ b/src/app/pages/criminal-records/criminal-records.component.ts
@@ -557,10 +557,10 @@ export class CriminalRecordsComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD'),
isScrapped: true,
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
@@ -583,10 +583,10 @@ export class CriminalRecordsComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.html b/src/app/pages/equipment-info/addequipment/addequipment.component.html
index 5a1f864..10af370 100644
--- a/src/app/pages/equipment-info/addequipment/addequipment.component.html
+++ b/src/app/pages/equipment-info/addequipment/addequipment.component.html
@@ -14,30 +14,30 @@
- 规格
+ 存放地点
-
+
- 购入日期
+ 生产日期
-
+
- 生产日期
+ 下次维保日期
-
+
有效期至
-
+
@@ -45,4 +45,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/pages/equipment-info/addequipment/addequipment.component.ts b/src/app/pages/equipment-info/addequipment/addequipment.component.ts
index 3a8fafa..b76f1db 100644
--- a/src/app/pages/equipment-info/addequipment/addequipment.component.ts
+++ b/src/app/pages/equipment-info/addequipment/addequipment.component.ts
@@ -15,10 +15,10 @@ export class AddequipmentComponent implements OnInit {
ngOnInit(): void {
this.validateForm = this.fb.group({
name: [null, [Validators.required]],
- specification: [null, [Validators.required]],
- buytime: [null, [Validators.required]],
- prodtime: [null, [Validators.required]],
- validitytime: [null, [Validators.required]]
+ storageLocation: [null, [Validators.required]],
+ productionDate: [null, [Validators.required]],
+ maintenanceDate: [null, [Validators.required]],
+ validityEndTime: [null, [Validators.required]]
});
}
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.html b/src/app/pages/equipment-info/editequipment/editequipment.component.html
index 253b2d8..4031d50 100644
--- a/src/app/pages/equipment-info/editequipment/editequipment.component.html
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.html
@@ -14,30 +14,34 @@
- 规格
+ 存放地点
-
+
- 购入日期
+ 生产日期
-
+
+
- 生产日期
+ 下次维保日期
-
+
+
有效期至
-
+
+
@@ -45,4 +49,4 @@
-
+
\ No newline at end of file
diff --git a/src/app/pages/equipment-info/editequipment/editequipment.component.ts b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
index 3ddba8e..cbc9381 100644
--- a/src/app/pages/equipment-info/editequipment/editequipment.component.ts
+++ b/src/app/pages/equipment-info/editequipment/editequipment.component.ts
@@ -19,10 +19,10 @@ export class EditequipmentComponent implements OnInit {
ngOnInit(): void {
this.validateForm = this.fb.group({
name: [null, [Validators.required]],
- specification: [null, [Validators.required]],
- buytime: [null, [Validators.required]],
- prodtime: [null, [Validators.required]],
- validitytime: [null, [Validators.required]]
+ storageLocation: [null, [Validators.required]],
+ productionDate: [null, [Validators.required]],
+ maintenanceDate: [null, [Validators.required]],
+ validityEndTime: [null, [Validators.required]]
});
this.data2 = JSON.parse(JSON.stringify(this.data))
}
diff --git a/src/app/pages/equipment-info/equipment-info.component.ts b/src/app/pages/equipment-info/equipment-info.component.ts
index 530fb25..f3ac262 100644
--- a/src/app/pages/equipment-info/equipment-info.component.ts
+++ b/src/app/pages/equipment-info/equipment-info.component.ts
@@ -73,10 +73,10 @@ export class EquipmentInfoComponent implements OnInit {
await new Promise(resolve => {
let body = {
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id
}
this.http.post('/api/services/app/FireEquipment/Create', body).subscribe(data => {
@@ -118,10 +118,10 @@ export class EquipmentInfoComponent implements OnInit {
let body = {
id: item.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: item.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe(data => {
diff --git a/src/app/pages/home-page/home-page.component.ts b/src/app/pages/home-page/home-page.component.ts
index 3366345..6a86b41 100644
--- a/src/app/pages/home-page/home-page.component.ts
+++ b/src/app/pages/home-page/home-page.component.ts
@@ -698,10 +698,10 @@ export class HomePageComponent implements OnInit {
isScrapped: true,
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD')
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD')
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
let body = {
@@ -723,10 +723,10 @@ export class HomePageComponent implements OnInit {
let body = {
id: copydata.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 35c0af2..5ed864e 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -151,10 +151,10 @@ export class HomeComponent implements OnInit {
isScrapped: true,
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD')
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD')
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
let body = {
@@ -183,10 +183,10 @@ export class HomeComponent implements OnInit {
let body = {
id: copydata.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: copydata.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
index 8180c8e..4fef0be 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.html
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -304,7 +304,90 @@
| {{item.name}} |
+
+
+
+ 证件编号:*
+
+
+
+
+
+
+
+
+
+
+
+ 证照有效期:*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证照提醒时间:*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证照年检时间:*
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 证照图片:
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- |
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.scss b/src/app/pages/oil-station-info/oil-station-info.component.scss
index 3c22a4e..bd41ce5 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.scss
+++ b/src/app/pages/oil-station-info/oil-station-info.component.scss
@@ -89,91 +89,92 @@
}
.imgtable {
-
- tr,
- td {
- height: 200px;
- }
+ width: 100%;
+ text-align: center;
+ border-collapse: collapse;
.imgbox {
+ width: 100%;
+ height: 100%;
position: relative;
- .deleteTr{
- position: absolute;
- right: 5px;
- top: 5px;
- cursor: pointer;
- }
- .uploadDivbox {
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- padding: 0 16px;
- display: flex;
- align-items: center;
- position: relative;
- }
-
- .uploadDiv {
- margin-left: 16px;
- width: 120px;
- height: 80px;
- // border: 1px solid red;
- display: flex;
- align-items: center;
- justify-content: center;
- position: relative;
-
- .fileinput {
- width: 114px;
- height: 32px;
- position: absolute;
- z-index: 100;
- opacity: 0;
- top: 23px;
- cursor: pointer;
- }
-
- button {
- z-index: 99;
- width: 114px;
- height: 32px;
- background: rgba(0, 129, 255, 0.3);
- border: 1px solid #36A2FF;
- opacity: 1;
- border-radius: 0px;
- color: #91CCFF;
- }
- }
+ display: flex;
+ flex-direction: column;
.timeDiv {
- position: absolute;
- right: 10px;
- top: 50%;
- transform: translateY(-50%);
+ width: 100%;
display: flex;
flex-direction: column;
- align-items: flex-start;
- justify-content: space-around;
.timeDivflex {
width: 100%;
+ height: 34px;
display: flex;
+ align-items: center;
+ margin: 5px 0;
nz-form-item {
- width: 45%;
+ width: 20%;
margin-right: 15px;
}
}
- .timeDivflex2 {
+ }
+
+
+ .uploadDivbox {
+ width: 100%;
+ height: 80px;
+ display: flex;
+ align-items: center;
+ position: relative;
+ margin: 5px 0;
+
+ .uploadDiv {
+ width: 120px;
+ height: 80px;
+ display: flex;
align-items: center;
- nz-form-item {
- width: 30%;
- margin-right: 9px;
+ justify-content: center;
+ position: relative;
+
+ .fileinput {
+ width: 114px;
+ height: 32px;
+ position: absolute;
+ z-index: 100;
+ opacity: 0;
+ top: 23px;
+ cursor: pointer;
+ }
+
+ button {
+ z-index: 99;
+ width: 114px;
+ height: 32px;
+ background: rgba(0, 129, 255, 0.3);
+ border: 1px solid #36A2FF;
+ opacity: 1;
+ border-radius: 0px;
+ color: #91CCFF;
}
}
}
+ .itemname {
+ width: 120px;
+ text-align: right;
+ box-sizing: border-box;
+ padding-right: 12px;
+ }
+
+ .deleteTr {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ cursor: pointer;
+ }
+
+
}
}
}
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
index 052e721..21e6a8a 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.ts
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -94,10 +94,19 @@ export class OilStationInfoComponent implements OnInit {
}
if (this.httpBody.licenses.length == 0) {
this.httpBody.licenses = [
- { name: '营业执照', code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true },
- { name: '危险化学品', code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false },
- { name: '成品油零售', code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true }
+ { name: '营业执照', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true },
+ { name: '危险化学品', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false },
+ { name: '成品油零售', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true }
]
+ } else {
+ console.log('走这里了',this.httpBody.licenses)
+ this.httpBody.licenses.forEach(item => {
+ if (item.endTime == '9999-01-01T00:00:00') {
+ item.isPerpetual = true
+ } else {
+ item.isPerpetual = false
+ }
+ })
}
this.httpBody.stationType ? this.httpBody.stationType = String(this.httpBody.stationType) : null
setTimeout(() => {
@@ -179,6 +188,13 @@ export class OilStationInfoComponent implements OnInit {
licenses: [
]
}
+
+ perpetualChange(item, $event) {
+ if ($event) {
+ item.endTime = '9999-01-01'
+ }
+ }
+
onChange($event) {
}
@@ -204,7 +220,7 @@ export class OilStationInfoComponent implements OnInit {
}
addTr() {
this.httpBody.licenses.push(
- { name: this.addName, code: '', startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false },
+ { name: this.addName, code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false },
)
}
deleteTrConfirm(key) {
@@ -247,10 +263,15 @@ export class OilStationInfoComponent implements OnInit {
body.stationType
body.govUnitDetail = JSON.stringify(this.httpBody.govUnitDetail)
console.log(body)
+
+ body.licenses.forEach(item => {
+ delete item.isPerpetual
+ })
+
this.http.put('/api/services/app/GasStation/Update', body).subscribe((data: any) => {
this.isLoadingSave = false
this.message.create('success', '保存成功！');
- this.httpBody.licenses = data.result.licenses
+ // this.httpBody.licenses = data.result.licenses
}, err => {
this.isLoadingSave = false
this.message.create('error', '保存失败！');
diff --git a/src/app/pages/today-warning-admin/today-warning-admin.component.ts b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
index b8d15de..5bf9863 100644
--- a/src/app/pages/today-warning-admin/today-warning-admin.component.ts
+++ b/src/app/pages/today-warning-admin/today-warning-admin.component.ts
@@ -229,10 +229,10 @@ export class TodayWarningAdminComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD'),
isScrapped: true,
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
@@ -256,10 +256,10 @@ export class TodayWarningAdminComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
diff --git a/src/app/pages/today-warning/today-warning.component.ts b/src/app/pages/today-warning/today-warning.component.ts
index 79287a3..763ba24 100644
--- a/src/app/pages/today-warning/today-warning.component.ts
+++ b/src/app/pages/today-warning/today-warning.component.ts
@@ -176,10 +176,10 @@ export class TodayWarningComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.copydata2.violatedItemSnapshotObj.name,
- specification: instance.copydata2.violatedItemSnapshotObj.specification,
- productionDate: moment(instance.copydata2.violatedItemSnapshotObj.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.copydata2.violatedItemSnapshotObj.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.copydata2.violatedItemSnapshotObj.storageLocation,
+ productionDate: moment(instance.copydata2.violatedItemSnapshotObj.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.copydata2.violatedItemSnapshotObj.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.copydata2.violatedItemSnapshotObj.validityEndTime).format('yyyy-MM-DD'),
isScrapped: true,
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
@@ -203,10 +203,10 @@ export class TodayWarningComponent implements OnInit {
let body = {
id: item.violatedItemSnapshotObj.id,
name: instance.validateForm.value.name,
- specification: instance.validateForm.value.specification,
- productionDate: moment(instance.validateForm.value.prodtime).format('yyyy-MM-DD'),
- purchaseDate: moment(instance.validateForm.value.buytime).format('yyyy-MM-DD'),
- validityEndTime: moment(instance.validateForm.value.validitytime).format('yyyy-MM-DD'),
+ storageLocation: instance.validateForm.value.storageLocation,
+ productionDate: moment(instance.validateForm.value.productionDate).format('yyyy-MM-DD'),
+ maintenanceDate: moment(instance.validateForm.value.maintenanceDate).format('yyyy-MM-DD'),
+ validityEndTime: moment(instance.validateForm.value.validityEndTime).format('yyyy-MM-DD'),
organizationUnitId: item.violatedItemSnapshotObj.organizationUnitId
}
this.http.put('/api/services/app/FireEquipment/Update', body).subscribe((data: any) => {
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 a22f659..0289f21 100644
--- a/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
+++ b/src/app/pages/warning-statistics-list/disposeequipment/disposeequipment.component.html
@@ -17,9 +17,9 @@
处置方式:维保
处置方式:报废
处置时间:{{data2.handleTime | date:"yyyy-MM-dd HH:mm:ss"}}
- 规格:{{newdata.specification}}
- 购入时间:{{newdata.purchaseDate | date:"yyyy-MM-dd"}}
- 生产时间:{{newdata.productionDate | date:"yyyy-MM-dd"}}
+ 存放地点:{{newdata.storageLocation}}
+ 生产日期:{{newdata.productionDate | date:"yyyy-MM-dd"}}
+ 下次维保日期:{{newdata.maintenanceDate | date:"yyyy-MM-dd"}}
有效期至:{{newdata.validityEndTime | date:"yyyy-MM-dd"}}