Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/Sinopec-Anxin

src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html

@@ -11,6 +11,8 @@
         <div class="cutoffrule"></div>
         <p>证照名称: {{data.licenseType ? data.licenseType.licenseName : null}}</p>
         <div class="cutoffrule"></div>
+        <p>公司名称: {{data.organization ? data.organization.displayName : null}}</p>
+        <div class="cutoffrule"></div>
         <p class="flexp">
             <span>办理提醒时间：修改时间 {{data.handleRemindDays}}天</span>
             <span>默认时间 {{data.handleRemindDaysDefault}}天</span>
@@ -25,7 +27,7 @@
         <div class="cutoffrule"></div>
         <p>审核状态：{{data.auditStatus | auditStatus}}</p>
         <div class="cutoffrule"></div>
-        <p>驳回说明：{{data.auditLog? data.auditLog.rejectReason : ''}}</p>
+        <p>审核说明：{{data.auditLog? data.auditLog.rejectReason : ''}}</p>
     </div>
 
 

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

@@ -191,6 +191,7 @@ export class AuditRecordComponent implements OnInit {
   }
 
   details(item) {
+    let or = item
     let component
     if (item.auditType == 0) {
       component = GasBaseInfoComponent
@@ -203,6 +204,9 @@ export class AuditRecordComponent implements OnInit {
     }
     this.getData(item).then(res => {
       item.getData = res
+      if (item.auditType == 1) {
+        item.getData.organization = item.organization
+      }
       const modal = this.modal.create({
         nzContent: component,
         nzViewContainerRef: this.viewContainerRef,