完善

src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html

@@ -7,10 +7,22 @@
     </div>
 
     <div class="content">
-        <p *ngIf="data.auditType != 0 && data.gasStation">{{data.gasStation.companyName}} - {{data.gasStation.locationName}} - {{data.gasStation.stationName}}</p>
+        <p *ngIf="data.auditType != 0 && data.auditType != 1 && data.gasStation">{{data.gasStation.companyName}} - {{data.gasStation.locationName}} - {{data.gasStation.stationName}}</p>
-        <div class="cutoffrule" *ngIf="data.auditType != 0"></div>
+        <div class="cutoffrule" *ngIf="data.auditType != 0 && data.auditType != 1"></div>
         <div *ngIf="data.auditType == 0"><app-gas-base-info [data]="data"></app-gas-base-info></div>
-        <div *ngIf="data.auditType == 1"></div>
+        <div *ngIf="data.auditType == 1">
+            <p>
+                办理提醒时间：修改时间 &nbsp;&nbsp;{{data.getData.handleRemindDays}}天
+                <span style="float: right;">默认时间 {{data.getData.handleRemindDaysDefault}}天</span>
+            </p>
+            <div class="cutoffrule"></div>
+            <p>
+                临期提醒时间：修改时间 &nbsp;&nbsp;{{data.getData.closingRemindDays}}天
+                <span style="float: right;">默认时间 {{data.getData.closingRemindDaysDefault}}天</span>
+            </p>
+            <div class="cutoffrule"></div>
+            <p>修改说明： &nbsp;&nbsp;{{data.getData.remark}}</p>
+        </div>
         <div *ngIf="data.auditType == 2">
             <p>证件名称: &nbsp;&nbsp;{{data.getData.licenseTypeName}}</p>
             <div class="cutoffrule"></div>
@@ -28,7 +40,6 @@
             <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 class="cutoffrule"></div>
         </div>
         <div class="cutoffrule"></div>
         <p [hidden]="data.getData.imageUrl === undefined">证件图片: &nbsp;&nbsp;

src/app/pages/audit/audit-ing/audit-ing.component.html

@@ -31,14 +31,7 @@
                     <td><label *ngIf="item.gasStation">{{item.gasStation.locationName}}</label></td>
                     <td><label *ngIf="item.gasStation">{{item.gasStation.companyName}}</label></td>
                     <td>{{item.committedTime | date:"yyyy/MM/dd"}}</td>
-                    <td>
+                    <td>{{item.auditStatusDesc}}</td>
-                        <span *ngIf="item.auditStatus == 0">无</span>
-                        <span *ngIf="item.auditStatus == 1">审核中</span>
-                        <span *ngIf="item.auditStatus == 2">审核通过</span>
-                        <span *ngIf="item.auditStatus == 3">审核驳回</span>
-                        <span *ngIf="item.auditStatus == 4">未提交审核</span>
-                        <span *ngIf="item.auditStatus == 5">审核完成</span>
-                    </td>
                     <td class="operation">
                         <span class="blueColor" (click)="dispose(item)">处置</span>
                         <span class="blueColor" (click)="details(item)">详情</span>

src/app/pages/audit/audit-ing/audit-ing.component.ts

@@ -6,6 +6,7 @@ import { Observable, fromEvent } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { DetailsFileCategoryComponent } from '../../license/file-category/details-file-category/details-file-category.component';
 import { DetailsUpdateCategoryComponent } from '../../license/update-category/details-update-category/details-update-category.component';
+import { AuditDetailsInformTimeComponent } from '../audit-inform-time/audit-details-inform-time/audit-details-inform-time.component';
 import { GasBaseInfoComponent } from '../gas-base-info/gas-base-info.component';
 import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component';
 
@@ -34,6 +35,7 @@ export class AuditIngComponent implements OnInit {
   MaxResultCount: string = '100'
   //获取当前油站档案类证照
   getStationList() {
+    this.tableSpin = true
     let data = JSON.parse(sessionStorage.getItem('userdata'));
     let params = {
       OrganizationUnitId: data.organization.id || "" ,
@@ -47,6 +49,7 @@ export class AuditIngComponent implements OnInit {
         element.itemData = JSON.parse(element.itemData)
       });
       this.list = info.result.items || []
+      this.tableSpin = false
       console.log(this.list)
     })
   }
@@ -91,7 +94,7 @@ export class AuditIngComponent implements OnInit {
               url = '/api/services/app/StationFileLicense/Audit'
             }
             let params = {
-              id: item.getData.id,
+              id: item.auditType == 0? item.gasStation.id : item.getData.id,
               remark: instance.textarea
             }
             let body = instance.isPass? 2 : 3;
@@ -114,7 +117,7 @@ export class AuditIngComponent implements OnInit {
     if (item.auditType == 0) {
       component = GasBaseInfoComponent
     } else if (item.auditType == 1) {
-
+      component = AuditDetailsInformTimeComponent
     } else if (item.auditType == 2) {
       component = DetailsUpdateCategoryComponent
     } else if (item.auditType) {

src/app/pages/audit/gas-base-info/gas-base-info.component.html

@@ -1,4 +1,11 @@
-<div>
+<div [ngStyle]="{'padding': isDetails? '0 15px' : null}">
+    <div class="title" *ngIf="isDetails">
+        <div class="titlecontent">
+            详情
+        </div>
+        <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
+    </div>
+
     <p>
         <label class="marginLeft">站名: &nbsp;&nbsp;{{baseInfo.stationName}}</label>
         <label>开业时间: &nbsp;&nbsp;{{baseInfo.openTime | date:"yyyy/MM/dd"}}</label>
@@ -67,4 +74,27 @@
         </p>
         <div class="cutoffrule"></div>
     </div>
+
+    <p class="recordP" *ngIf="isDetails">
+        <span>审核记录</span>
+        <span>
+            <span style="margin-right: 6px;">
+                审核次数：{{auditList.length}}
+            </span>
+            <span>
+                驳回次数：{{getRejectNum()}}
+            </span>
+        </span>
+    </p>
+    <nz-timeline *ngIf="isDetails">
+        <nz-timeline-item *ngFor="let item of auditList">
+            <span style="margin-right: 12px;">{{item.creationTime | date:"yyyy/MM/dd"}}</span>
+            <span *ngIf="item.auditStatus == 0">无</span>
+            <span *ngIf="item.auditStatus == 1">审核中</span>
+            <span *ngIf="item.auditStatus == 2">审核通过</span>
+            <span *ngIf="item.auditStatus == 3">审核驳回</span>
+            <span *ngIf="item.auditStatus == 4">已撤销审核</span>
+            <span *ngIf="item.auditStatus == 5">审核完成</span>
+        </nz-timeline-item>
+    </nz-timeline>
 </div>

src/app/pages/audit/gas-base-info/gas-base-info.component.scss

@@ -12,4 +12,36 @@ label{ display: inline-block; vertical-align: middle; }
 .marginLeft {
     width: 55%;
     overflow: hidden;
+}
+.title {
+    font-family: sybold;
+    width: 100%;
+    height: 48px;
+    background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%);
+    display: flex;
+    align-items: center;
+    position: relative;
+
+    .titlecontent {
+      width: 100%;
+      height: 32px;
+      line-height: 32px;
+      background: linear-gradient(270deg, rgba(35, 153, 255, 0) 0%, rgba(35, 153, 255, 0.57) 50%, rgba(35, 153, 255, 0) 100%);
+      text-align: center;
+      color: #91CCFF;
+      font-size: 16px;
+    }
+
+    i {
+      position: absolute;
+      right: 12px;
+      color: #fff;
+      font-size: 18px;
+      cursor: pointer;
+    }
+}
+.recordP{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }

src/app/pages/audit/gas-base-info/gas-base-info.component.ts

@@ -15,10 +15,10 @@ export class GasBaseInfoComponent implements OnInit {
   isDetails: boolean = false; //是否是详情
 
   ngOnInit(): void {
-    if (this.data.id === undefined) { //详情
+    // if (this.data.id === undefined) { //详情
-      console.log(this.data,'gasInfo')
+    //   this.isDetails = true
-      this.isDetails = true
+    //   this.getAuditLogging()
-    }
+    // }
     this.getBaseInfo()
   }
 
@@ -33,4 +33,32 @@ export class GasBaseInfoComponent implements OnInit {
     })
   }
 
+  destroyModal() {
+    this.modal.destroy({ data: 'this the result data' });
+  }
+
+  auditList: any[] = [];
+  //获取审核记录
+  getAuditLogging() {
+    if (!this.data.organizationId) {
+      return
+    }
+    let params = { orgId: this.data.organizationId }
+    this.http.get(`/api/services/app/GasStation/GetAuditted`,{params}).subscribe((data: any)=>{
+      //this.auditList = data.result.actionList || []
+      console.log(data)
+    })
+  }
+
+  //获取驳回次数
+  getRejectNum(): number {
+    let num = 0
+    this.auditList.forEach(item=>{
+      if (item.auditStatus == 3) {
+        num = num + 1
+      }
+    })
+    return num
+  }
+
 }

src/app/pages/license/file-category/file-category.component.ts

@@ -31,10 +31,12 @@ export class FileCategoryComponent implements OnInit {
 
   //获取当前油站档案类证照
   getStationList() {
+    this.tableSpin = true
     let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation'));
     let params = { orgId: data.organization.id || "" }
     this.http.get(`/api/services/app/StationFileLicense/GetStationList`,{params}).subscribe((info: any)=>{
       this.list = info.result
+      this.tableSpin = false
       console.log(info.result)
     })
   }

src/app/pages/license/update-category/update-category.component.ts

@@ -32,10 +32,12 @@ export class UpdateCategoryComponent implements OnInit {
 
   //获取当前油站档案类证照
   getStationList() {
+    this.tableSpin = true
     let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation'));
     let params = { orgId: data.organization.id || "" }
     this.http.get(`/api/services/app/StationValidityLicense/GetCurStationLicense`,{params}).subscribe((info: any)=>{
       this.list = info.result
+      this.tableSpin = false
       console.log(info.result)
     })
   }