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

待办,审批记录完善

beijing
陈鹏飞 3 years ago
parent
9e36287e87
commit
16d7154508
6 changed files with 29 additions and 27 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. 12
      src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
  2. 18
      src/app/pages/audit/audit-ing/audit-ing.component.html
  3. 4
      src/app/pages/audit/audit-nav/audit-nav.component.ts
  4. 18
      src/app/pages/audit/audit-record/audit-record.component.html
  5. 2
      src/app/pages/home/home.component.html
  6. 2
      src/app/pages/plan-admin/plan-admin.component.html

12
src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
Unescape View File

@ -13,7 +13,7 @@
<div *ngIf="data.auditType == 1">
<p>公司名称: &nbsp;&nbsp;{{data.organization.displayName}}</p>
<div class="cutoffrule"></div>
<p>证件名称: &nbsp;&nbsp;{{data.getData.licenseType.licenseName}}</p>
<p>证照名称: &nbsp;&nbsp;{{data.getData.licenseType.licenseName}}</p>
<div class="cutoffrule"></div>
<p>
办理提醒时间：修改时间 &nbsp;&nbsp;{{data.getData.handleRemindDays}}天
@ -28,11 +28,11 @@
<p>修改说明： &nbsp;&nbsp;{{data.getData.remark}}</p>
</div>
<div *ngIf="data.auditType == 2">
<p>证件名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
<p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
<div class="cutoffrule"></div>
<p>证件编号: &nbsp;&nbsp;{{data.getData.licenseCode || ''}}</p>
<p>证照编号: &nbsp;&nbsp;{{data.getData.licenseCode || ''}}</p>
<div class="cutoffrule"></div>
<p>证件有效期: &nbsp;&nbsp;<span *ngIf="!data.getData.isLongTerm">{{data.getData.validityStartTime | date:"yyyy/MM/dd"}} - </span>{{data.getData.validityEndTime | date:"yyyy/MM/dd"}}</p>
<p>证照效期: &nbsp;&nbsp;<span *ngIf="!data.getData.isLongTerm">{{data.getData.validityStartTime | date:"yyyy/MM/dd"}} - </span>{{data.getData.validityEndTime | date:"yyyy/MM/dd"}}</p>
<div class="cutoffrule"></div>
<p>办理类型: &nbsp;&nbsp;{{getHandleTypes(data.getData.handleTypes)}}</p>
<div class="cutoffrule"></div>
@ -41,12 +41,12 @@
<p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck">是</span><span *ngIf="!data.getData.isYearlyCheck">否</span></p>
</div>
<div *ngIf="data.auditType == 3">
<p>证件名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
<p>证照名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
<div class="cutoffrule"></div>
<p>有无证照: &nbsp;&nbsp;<span *ngIf="data.getData.validatyType == 0">不适用</span><span *ngIf="data.getData.validatyType == 1">无</span><span *ngIf="data.getData.validatyType == 2">有</span></p>
</div>
<div class="cutoffrule"></div>
<p [hidden]="data.getData.imageUrl === undefined">证件图片: &nbsp;&nbsp;
<p [hidden]="data.getData.imageUrl === undefined">附件: &nbsp;&nbsp;
<img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'img'" [src]="data.getData.imageUrl" (click)="viewImg(data.getData.imageUrl)">
<img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data.getData)">
<img *ngIf="data.getData.imageUrl && getFileType(data.getData.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data.getData)">

18
src/app/pages/audit/audit-ing/audit-ing.component.html
Unescape View File

@ -9,11 +9,11 @@
</th>
<th>审批信息</th>
<th>加油站名称</th>
<th [nzWidth]="'16%'">区域</th>
<th>省公司</th>
<th>提交时间</th>
<th>审批状态</th>
<th>操作</th>
<th [nzWidth]="'16%'">区域名称</th>
<th>省公司名称</th>
<!-- <th>提交时间</th>
<th>审批状态</th> -->
<th>审批</th>
</tr>
</thead>
<tbody id="table">
@ -36,13 +36,11 @@
<ng-template #elseTemplate>
<label>{{item.organization ? item.organization.displayName : null}}</label>
</ng-template>
</td>
<td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }}</td>
<td>{{item.auditStatusDesc}}</td>
<!-- <td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }}</td>
<td>{{item.auditStatusDesc}}</td> -->
<td class="operation">
<span class="blueColor" (click)="dispose(item)">处置</span>
<span class="blueColor" (click)="dispose(item)">审批</span>
<span class="blueColor" (click)="details(item)">详情</span>
</td>
</tr>

4
src/app/pages/audit/audit-nav/audit-nav.component.ts
Unescape View File

@ -10,8 +10,8 @@ export class AuditNavComponent implements OnInit {
constructor() { }
navList = ['审批', '历史纪录']
selectedItem = '审批'
navList = ['待办', '审批记录']
selectedItem = '待办'
selectNav(item) {
this.selectedItem = item
}

18
src/app/pages/audit/audit-record/audit-record.component.html
Unescape View File

@ -91,11 +91,13 @@
<span style="margin-left: 30px;">审批类型</span>
</th>
<th>审批信息</th>
<th>加油站名称</th>
<th [nzWidth]="'16%'">区域</th>
<!-- <th>加油站名称</th>
<th [nzWidth]="'16%'">区域</th> -->
<th>省公司</th>
<th>提交时间</th>
<th>审批状态</th>
<th>申请人</th>
<th>审批时间</th>
<th>审批人</th>
<!-- <th>审批状态</th> -->
<th>操作</th>
</tr>
</thead>
@ -110,8 +112,8 @@
<span *ngIf="item.auditType == 2">更新类证照</span>
<span *ngIf="item.auditType == 3">档案类证照</span>
</td>
<td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
<td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td>
<!-- <td><label *ngIf="item.gasStation">{{item.gasStation.stationName}}</label></td>
<td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td> -->
<td>
<ng-container *ngIf="item.gasStation; else elseTemplate">
<label>{{item.gasStation.companyName}}</label>
@ -120,8 +122,10 @@
<label>{{item.organization ? item.organization.displayName : null}}</label>
</ng-template>
</td>
<td>{{item.creatorUser.name}}</td>
<td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss"}}</td>
<td>{{item.auditStatusDesc}}</td>
<td>{{item.auditUser.name}}</td>
<!-- <td>{{item.auditStatusDesc}}</td> -->
<td class="operation">
<span class="blueColor" (click)="details(item)">详情</span>
</td>

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

@ -20,7 +20,7 @@
预警记录
</li>
<li [routerLink]="['/audit']" routerLinkActive="router-link-active">
审批
证照管理
</li>
</div>
<div class="libox" *ngIf="isGasStationNav">

2
src/app/pages/plan-admin/plan-admin.component.html
Unescape View File

@ -30,7 +30,7 @@
<img src="../../../assets/images/logosm.png" alt="">
<div class="content">
<div class="contentitem">
<span class="grey" (click)="selectTab(0)" [ngClass]="{'selectedItem': selectedTab == 0}">站点管理</span>
<span class="grey" (click)="selectTab(0)" [ngClass]="{'selectedItem': selectedTab == 0}">油站管理</span>
<span class="grey" (click)="selectTab(1)" [ngClass]="{'selectedItem': selectedTab == 1}">更新类证照</span>
<span class="grey" (click)="selectTab(2)" [ngClass]="{'selectedItem': selectedTab == 2}">档案类证照</span>
</div>

Write Preview
Loading…
Cancel
Save