shaojiahao
/
Sinopec-Anxin
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

[完善]完善油站信息页面+返回按钮

dev
邵佳豪 3 years ago
parent
cfadf76f5b
commit
08052c1cd4
5 changed files with 116 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/app/pages/home/home.component.html
  2. 68
      src/app/pages/oil-station-info/oil-station-info.component.html
  3. 15
      src/app/pages/oil-station-info/oil-station-info.component.scss
  4. 43
      src/app/pages/oil-station-info/oil-station-info.component.ts
  5. BIN
      src/assets/images/goback.png

8
src/app/pages/home/home.component.html
Unescape View File

@ -45,7 +45,7 @@
{{time}}
</span>
<span style="margin: 0 18px;">|</span>
<span style="margin: 0 12px;">|</span>
<span style="margin-right: 8px;"> {{surname}} </span>
<a nz-dropdown [nzDropdownMenu]="menu" [nzTrigger]="'click'" [nzBackdrop]='false'>
@ -60,10 +60,10 @@
<li nz-menu-item (click)="signOut()">退出系统</li>
</ul>
</nz-dropdown-menu>
<span style="margin: 0 12px;" *ngIf="isGasStationBack">|</span>
<img style="cursor: pointer;" *ngIf="isGasStationBack" src="../../../assets/images/goback.png" alt="" (click)="goback()">
</div>
<div class="backbtn" *ngIf="isGasStationBack">
<button nz-button (click)="goback()">返回</button>
</div>
</div>
<div class="content">
<router-outlet></router-outlet>

68
src/app/pages/oil-station-info/oil-station-info.component.html
Unescape View File

@ -8,7 +8,7 @@
<div class="table">
<table formGroupName="oilStation">
<tr>
<td class="head">所属组织机构</td>
<td class="head">站名</td>
<td class="text organizations">
{{userdata.organization.displayName}}
</td>
@ -30,6 +30,7 @@
<nz-select [(ngModel)]="httpBody.stationType" formControlName="oilStationType">
<nz-option nzValue="0" nzLabel="自营"></nz-option>
<nz-option nzValue="1" nzLabel="加盟"></nz-option>
<nz-option nzValue="2" nzLabel="其他"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
@ -47,7 +48,7 @@
</tr>
<tr>
<td class="head">地址</td>
<td colspan="text">
<td class="text" colspan="3">
<nz-form-item>
<nz-form-control>
<nz-input-group>
@ -56,7 +57,7 @@
</nz-form-control>
</nz-form-item>
</td>
<td class="head">营业执照有效期<span style="color: red;">*</span></td>
<!-- <td class="head">营业执照有效期<span style="color: red;">*</span></td>
<td colspan="text">
<nz-form-item>
<nz-form-control>
@ -64,7 +65,7 @@
</nz-range-picker>
</nz-form-control>
</nz-form-item>
</td>
</td> -->
</tr>
<tr>
<td class="head">区域</td>
@ -298,7 +299,7 @@
</td>
</tr>
</table>
<table class="imgtable" id="images">
<table formGroupName="validityTime" class="imgtable" id="images">
<tr>
<td class="head">营业执照</td>
<td colspan="3" class="imgbox">
@ -316,6 +317,25 @@
<button nz-button [nzLoading]="isLoadingOne"><i nz-icon nzType="upload"
nzTheme="outline"></i>重新上传</button>
</div>
<div class="timeDiv">
<nz-form-item style="width: 35%;border: 1px solid #91CCFF;margin-right: 12px;">
<nz-form-control>
<nz-range-picker [(ngModel)]="businessLicensevalidityTime"
formControlName="businessLicensevalidityTime">
</nz-range-picker>
</nz-form-control>
</nz-form-item>
<span><span style="color: red;">*</span>提前预警时间天数：</span>
<nz-form-item style="width: 5%;border: 1px solid #91CCFF;margin-right: 12px;">
<nz-form-control>
<nz-input-group>
<input style="padding: 0;text-align: center;" [(ngModel)]="httpBody.validityTermDays" nz-input
type="number" formControlName="businessLicensevalidityTimeDay" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<span>天</span>
</div>
</div>
</td>
@ -338,6 +358,26 @@
<button nz-button [nzLoading]="isLoadingTwo"><i nz-icon nzType="upload"
nzTheme="outline"></i>重新上传</button>
</div>
<div class="timeDiv">
<nz-form-item style="width: 35%;border: 1px solid #91CCFF;margin-right: 12px;">
<nz-form-control>
<nz-range-picker [(ngModel)]="hazardousLicensevalidityTime"
formControlName="hazardousLicensevalidityTime">
</nz-range-picker>
</nz-form-control>
</nz-form-item>
<span><span style="color: red;">*</span>提前预警时间天数：</span>
<nz-form-item style="width: 5%;border: 1px solid #91CCFF;margin-right: 12px;">
<nz-form-control>
<nz-input-group>
<input style="padding: 0;text-align: center;" [(ngModel)]="httpBody.dangerousTermDays" nz-input
type="number" formControlName="hazardousLicensevalidityTimeDay" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<span>天</span>
</div>
</div>
</td>
</tr>
@ -359,6 +399,24 @@
<button nz-button [nzLoading]="isLoadingThree"><i nz-icon nzType="upload"
nzTheme="outline"></i>重新上传</button>
</div>
<div class="timeDiv">
<nz-form-item style="width: 35%;border: 1px solid #91CCFF;margin-right: 12px;">
<nz-form-control>
<nz-range-picker [(ngModel)]="oilLicensevalidityTime" formControlName="oilLicensevalidityTime">
</nz-range-picker>
</nz-form-control>
</nz-form-item>
<span><span style="color: red;">*</span>提前预警时间天数：</span>
<nz-form-item style="width: 5%;border: 1px solid #91CCFF;margin-right: 12px;">
<nz-form-control>
<nz-input-group>
<input style="padding: 0;text-align: center;" [(ngModel)]="httpBody.sellLicenseTermDays" nz-input
type="number" formControlName="oilLicensevalidityTimeDay" />
</nz-input-group>
</nz-form-control>
</nz-form-item>
<span>天</span>
</div>
</div>
</td>
</tr>

15
src/app/pages/oil-station-info/oil-station-info.component.scss
Unescape View File

@ -74,7 +74,9 @@
.text {
width: 33%;
}
.text2 {
width: 83%;
}
.organizations {
text-align: left;
color: #fff;
@ -98,8 +100,17 @@
padding: 0 16px;
display: flex;
align-items: center;
position: relative;
}
.timeDiv{
position: absolute;
right: 10px;
top: 50%;
transform: translateY(-50%);
display: flex;
align-items: center;
justify-content: flex-end;
}
.uploadDiv {
margin-left: 16px;
width: 120px;

43
src/app/pages/oil-station-info/oil-station-info.component.ts
Unescape View File

@ -27,7 +27,7 @@ export class OilStationInfoComponent implements OnInit {
oilStationType: [null],
laneNumber: [null],
address: [null],
validityTime: [null, [Validators.required]],//营业执照有效期
// validityTime: [null, [Validators.required]],//营业执照有效期
locationName: [null],
companyName: [null],
leaderName: [null],
@ -54,6 +54,14 @@ export class OilStationInfoComponent implements OnInit {
address: [null],
distance: [null],
contactInformation: [null]
}),
validityTime: this.fb.group({
businessLicensevalidityTime: [null],
businessLicensevalidityTimeDay: [null, [Validators.required]],
hazardousLicensevalidityTime: [null],
hazardousLicensevalidityTimeDay: [null, [Validators.required]],
oilLicensevalidityTime: [null],
oilLicensevalidityTimeDay: [null, [Validators.required]]
})
});
@ -65,7 +73,9 @@ export class OilStationInfoComponent implements OnInit {
validityTime: any = []//营业执照有效期
businessLicensevalidityTime: any = []//营业执照有效期
hazardousLicensevalidityTime: any = []//危化品有效期
oilLicensevalidityTime: any = []//成品油有效期
//获取油站信息
gallery
getInfo() {
@ -83,9 +93,15 @@ export class OilStationInfoComponent implements OnInit {
this.hospital = data.result.govUnitDetail.hospital
this.fireBrigade = data.result.govUnitDetail.fireBrigade
this.httpBody.stationType = String(this.httpBody.stationType)
this.validityTime[0] = data.result.validityStartTime
this.validityTime[1] = data.result.validityEndTime
this.validityTime = [...this.validityTime]
this.businessLicensevalidityTime[0] = data.result.validityStartTime
this.businessLicensevalidityTime[1] = data.result.validityEndTime
this.businessLicensevalidityTime = [...this.businessLicensevalidityTime]
this.hazardousLicensevalidityTime[0] = data.result.dangerousStartTime
this.hazardousLicensevalidityTime[1] = data.result.dangerousEndTime
this.hazardousLicensevalidityTime = [...this.hazardousLicensevalidityTime]
this.oilLicensevalidityTime[0] = data.result.sellLicenseStartTime
this.oilLicensevalidityTime[1] = data.result.sellLicenseEndTime
this.oilLicensevalidityTime = [...this.oilLicensevalidityTime]
} else {
this.httpBody.id = data.result.id
}
@ -128,6 +144,13 @@ export class OilStationInfoComponent implements OnInit {
organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
validityStartTime: '',
validityEndTime: '',
dangerousStartTime: '',
dangerousEndTime: '',
sellLicenseStartTime: '',
sellLicenseEndTime: '',
validityTermDays: null,
dangerousTermDays: null,
sellLicenseTermDays: null,
openTime: '',
stationType: '',
laneCount: '',
@ -160,8 +183,14 @@ export class OilStationInfoComponent implements OnInit {
if (this.validateForm.valid) {
this.isLoadingSave = true
this.httpBody.openTime = moment(this.httpBody.openTime).format('YYYY-MM-MM')//开业时间格式化
this.httpBody.validityStartTime = moment(this.validityTime[0]).format('YYYY-MM-MM')//开业时间格式化
this.httpBody.validityEndTime = moment(this.validityTime[1]).format('YYYY-MM-MM')//开业时间格式化
this.httpBody.validityStartTime = moment(this.businessLicensevalidityTime[0]).format('YYYY-MM-MM')//
this.httpBody.validityEndTime = moment(this.businessLicensevalidityTime[1]).format('YYYY-MM-MM')//
this.httpBody.dangerousStartTime = moment(this.hazardousLicensevalidityTime[0]).format('YYYY-MM-MM')//
this.httpBody.dangerousEndTime = moment(this.hazardousLicensevalidityTime[1]).format('YYYY-MM-MM')//
this.httpBody.sellLicenseStartTime = moment(this.oilLicensevalidityTime[0]).format('YYYY-MM-MM')//
this.httpBody.sellLicenseEndTime = moment(this.oilLicensevalidityTime[1]).format('YYYY-MM-MM')//
this.httpBody.govUnitDetail.policeStation = this.validateForm.value.policeStation
this.httpBody.govUnitDetail.hospital = this.validateForm.value.hospital
this.httpBody.govUnitDetail.fireBrigade = this.validateForm.value.fireBrigade

BIN
src/assets/images/goback.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

Write Preview
Loading…
Cancel
Save