[完善]待办字段;证照记录搜索条件

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

@@ -11,7 +11,8 @@
                     <th *ngIf="level != 1 ">油站名称</th>
                     <th [nzWidth]="'16%'" *ngIf="level != 1 ">区域名称</th>
                     <th>公司名称</th>
-                    <!-- <th>提交时间</th> -->
+                    <th>申请人</th>
+                    <th>提交时间</th>
                     <th>审批状态</th>
                     <th>审批</th>
                 </tr>
@@ -38,7 +39,8 @@
                             <label>{{item.organization ? item.organization.displayName : null}}</label>
                         </ng-template>
                     </td>
-                    <!-- <td>{{item.committedTime | date:"yyyy/MM/dd HH:mm:ss" }}</td> -->
+                    <td><span *ngIf="item.creatorUser">{{item.creatorUser.name || ''}}</span></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>

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

@@ -10,6 +10,7 @@
                         <nz-option *ngIf="!level" nzValue="2" nzLabel="经营类证照"></nz-option>
                         <nz-option *ngIf="!level" nzValue="3" nzLabel="资产类证照"></nz-option>
                         <nz-option *ngIf="level" nzValue="4" nzLabel="用户信息"></nz-option>
+                        <nz-option *ngIf="level" nzValue="5" nzLabel="预警申诉"></nz-option>
                     </nz-select>
                 </nz-form-control>
             </nz-form-item>
@@ -17,8 +18,9 @@
             <nz-form-item class="searchParams searchParamsLong">
                 <nz-form-control>
                     <nz-select nzAllowClear formControlName="type" nzPlaceHolder="审批类型" [nzLoading]="typeLoading">
-                        <nz-option *ngFor="let item of typeList" [nzValue]="item.licenseName"
-                            [nzLabel]="item.licenseName"></nz-option>
+                        <nz-option *ngFor="let item of typeList"
+                            [nzValue]="item.licenseName ? item.licenseName : item.eventSystemName"
+                            [nzLabel]="item.licenseName ? item.licenseName : item.eventSystemName"></nz-option>
                     </nz-select>
                 </nz-form-control>
             </nz-form-item>

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

@@ -61,6 +61,9 @@ export class AuditRecordComponent implements OnInit {
     this.getTypeList()
     await this.getAllOrganization()
     this.getRecordList()
+
+
+    this.warningType()
   }
 
   ngOnDestroy(): void {
@@ -165,6 +168,25 @@ export class AuditRecordComponent implements OnInit {
 
     })
   }
+
+  warningTypesDetails
+  warningTypesDetailsCopy
+  //获得所有预警事件
+  warningType() {
+    this.http.get('/api/services/app/Violation/GetAllList').subscribe((data: any) => {
+
+      data.result = data.result.filter((item) => {
+        return item.eventSystemName != '设备报废临期提醒' && item.eventSystemName != '设备维保临期提醒' && item.eventSystemName != '证照有效期办理提醒' && item.eventSystemName != '证照有效期临期提醒' && item.eventSystemName != '证照年检办理提醒' && item.eventSystemName != '证照年检临期提醒'
+      })
+
+      this.warningTypesDetails = JSON.parse(JSON.stringify(data.result))
+      this.warningTypesDetailsCopy = JSON.parse(JSON.stringify(data.result)) //原始数据备份
+      // console.log('所有预警事件', this.warningTypesDetailsCopy)
+    })
+  }
+
+
+
   infoChange(e) {
     if (e == '0') {
       this.typeList = this.typeListOfStationData
@@ -176,6 +198,8 @@ export class AuditRecordComponent implements OnInit {
       this.typeList = this.typeListOfFile
     } else if (e == '4') {
       this.typeList = this.typeListOfUsers
+    } else if (e == '5') {
+      this.typeList = [...this.warningTypesDetailsCopy]
     } else {
       this.typeList = [...this.typeListOfStationData, ...this.typeListOfUpdate, ...this.typeListOfFile]
     }

src/app/pages/records/criminal-records-admin/criminal-records-admin.component.html

@@ -120,7 +120,7 @@
           </nz-form-control>
         </nz-form-item>
 
-        <nz-form-item class="searchParams">
+        <nz-form-item class="searchParams" [hidden]="!isMisinformation">
           <nz-form-control>
             <nz-select nzAllowClear formControlName="appealState" nzPlaceHolder="申诉状态">
               <nz-option nzValue="0" nzLabel="未申诉"></nz-option>

src/app/pages/records/criminal-records/criminal-records.component.html

@@ -96,7 +96,7 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
-        <nz-form-item class="searchParams">
+        <nz-form-item class="searchParams" [hidden]="!isMisinformation">
           <nz-form-control>
             <nz-select nzAllowClear formControlName="appealState" nzPlaceHolder="申诉状态">
               <nz-option nzValue="0" nzLabel="未申诉"></nz-option>