diff --git a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
new file mode 100644
index 0000000..3e0e8e3
--- /dev/null
+++ b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
@@ -0,0 +1,30 @@
+<div class="box" id="detailsupdatecategory">
+ <div class="title">
+ <div class="titlecontent">
+ 详情
+ </div>
+ <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
+ </div>
+
+ <div class="content">
+ <p>山东省某中化公司</p>
+ <div class="cutoffrule"></div>
+ <p class="flexp">
+ <span>办理提醒时间：修改时间 80天</span>
+ <span>默认时间 90天</span>
+ </p>
+ <div class="cutoffrule"></div>
+ <p class="flexp">
+ <span>临期提醒时间：修改时间 15天</span>
+ <span>默认时间 30天</span>
+ </p>
+ <div class="cutoffrule"></div>
+ <p>修改说明：修改原因陈述修改原因陈述，修改原因陈述。</p>
+ <div class="cutoffrule"></div>
+ <p>审核状态：审核驳回</p>
+ <div class="cutoffrule"></div>
+ <p>驳回说明：不同意</p>
+ </div>
+
+
+</div>
\ No newline at end of file
diff --git a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.scss b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.scss
new file mode 100644
index 0000000..83c449f
--- /dev/null
+++ b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.scss
@@ -0,0 +1,65 @@
+.box {
+ .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;
+ }
+ }
+
+ .content {
+ box-sizing: border-box;
+ padding: 0 15px;
+ max-height: 580px;
+ overflow-y: auto;
+
+ .circle {
+ width: 8px;
+ height: 8px;
+ background: linear-gradient(180deg, #36A2FF 0%, #FFFFFF 100%);
+ opacity: 1;
+ }
+
+ .recordP {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+ }
+
+ p {
+ margin-bottom: 0;
+ color: #C4E2FC;
+ margin: 12px 0;
+
+ img {
+ width: 88px;
+ height: 56px;
+ cursor: pointer;
+ }
+ }
+ .flexp{
+ display: flex;
+ justify-content: space-between;
+ }
+}
diff --git a/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
new file mode 100644
index 0000000..52f0e6b
--- /dev/null
+++ b/src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
@@ -0,0 +1,18 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+
+@Component({
+ selector: 'app-audit-details-inform-time',
+ templateUrl: './audit-details-inform-time.component.html',
+ styleUrls: ['./audit-details-inform-time.component.scss']
+})
+export class AuditDetailsInformTimeComponent implements OnInit {
+ @Input() data?: any;
+ constructor(private modal: NzModalRef) { }
+
+ ngOnInit(): void {
+ }
+ destroyModal() {
+ this.modal.destroy({ data: 'this the result data' });
+ }
+}
diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html
index 4b680ee..4650790 100644
--- a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html
+++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.html
@@ -1 +1,43 @@
-<p>audit-inform-time works!</p>
+<div class="box informTime" id="inform">
+ <div class="tablebox" id="tablebox">
+ <nz-table *ngIf="tableScrollHeight" [nzLoading]="tableSpin" [nzPageSize]='9999' #headerTable [nzData]="list"
+ [nzShowPagination]="false" [nzScroll]="{ y:tableScrollHeight }" [nzNoResult]='null' nzTableLayout="fixed">
+ <thead>
+ <tr>
+ <th rowspan="2" [nzWidth]="'16%'">
+ <span>审批类型</span>
+ </th>
+ <th colspan="2">办理提醒时间</th>
+ <th colspan="2">临期提醒时间</th>
+ <th rowspan="2">提交审核时间</th>
+ <th rowspan="2">审核状态</th>
+ <th rowspan="2">操作</th>
+ </tr>
+ <tr>
+ <th>默认时间</th>
+ <th>现用时间</th>
+ <th>默认时间</th>
+ <th>现用时间</th>
+ </tr>
+ </thead>
+ <tbody id="table">
+ <tr *ngFor="let item of headerTable.data;let key = index">
+ <td>
+ 营业执照
+ </td>
+ <td>90天</td>
+ <td>90天</td>
+ <td>90天</td>
+ <td>90天</td>
+ <td>时间</td>
+ <td>审批状态</td>
+ <td class="operation">
+ <span class="blueColor" (click)="edit(item)">编辑</span>
+ <span class="blueColor" (click)="details(item)">审核详情</span>
+ </td>
+ </tr>
+ </tbody>
+ </nz-table>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.scss b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.scss
index e69de29..aaca580 100644
--- a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.scss
+++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.scss
@@ -0,0 +1,15 @@
+.box {
+ width: 100%;
+ height: 100%;
+}
+
+.tablebox {
+ width: 100%;
+ height: 100%;
+
+ .operation {
+ span {
+ margin-right: 6px;
+ }
+ }
+}
diff --git a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
index 059841e..310cda6 100644
--- a/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
+++ b/src/app/pages/audit/audit-inform-time/audit-inform-time.component.ts
@@ -1,4 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewContainerRef } from '@angular/core';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { Observable, fromEvent } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { AuditDetailsInformTimeComponent } from './audit-details-inform-time/audit-details-inform-time.component';
+import { EditInformTimeComponent } from './edit-inform-time/edit-inform-time.component';
+// import { AuditDisposeComponent } from './audit-dispose/audit-dispose.component';
@Component({
selector: 'app-audit-inform-time',
@@ -7,9 +13,69 @@ import { Component, OnInit } from '@angular/core';
})
export class AuditInformTimeComponent implements OnInit {
- constructor() { }
+ constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef) { }
+ tableSpin = false
+ list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+ tableScrollHeight
ngOnInit(): void {
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 85) + 'px'
+ // 页面监听
+ fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 85) + 'px'
+ });
}
+
+
+ edit(item) {
+ console.log('item', item)
+ const modal = this.modal.create({
+ nzContent: EditInformTimeComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 600,
+ nzBodyStyle: {
+ 'border': '1px solid #91CCFF',
+ 'border-radius': '0px',
+ 'padding': '7px',
+ 'box-shadow': '0 0 8px 0 #fff',
+ 'background-image': 'linear-gradient(#003665, #000f25)'
+ },
+ nzComponentParams: {
+ data: item
+ },
+ nzFooter: null,
+ nzClosable: false,
+ nzOnOk: async () => {
+
+ }
+ });
+ const instance = modal.getContentComponent();
+ modal.afterClose.subscribe(result => { });
+ }
+ details(item) {
+ console.log('item', item)
+ const modal = this.modal.create({
+ nzContent: AuditDetailsInformTimeComponent,
+ nzViewContainerRef: this.viewContainerRef,
+ nzWidth: 650,
+ nzBodyStyle: {
+ 'border': '1px solid #91CCFF',
+ 'border-radius': '0px',
+ 'padding': '7px',
+ 'box-shadow': '0 0 8px 0 #fff',
+ 'background-image': 'linear-gradient(#003665, #000f25)'
+ },
+ nzComponentParams: {
+ data: item
+ },
+ nzFooter: null,
+ nzClosable: false,
+ nzOnOk: async () => {
+
+ }
+ });
+ const instance = modal.getContentComponent();
+ modal.afterClose.subscribe(result => { });
+ }
}
diff --git a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
new file mode 100644
index 0000000..8025296
--- /dev/null
+++ b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
@@ -0,0 +1,54 @@
+<div class="box" id="editfilecategory">
+ <div class="title">
+ <div class="titlecontent">
+ 编辑
+ </div>
+ <i nz-icon nzType="close" nzTheme="outline" (click)="destroyModal()"></i>
+ </div>
+ <form nz-form [formGroup]="validateForm" class="form">
+
+ <div class="timebox">
+ <div>
+ <p>办理提醒时间</p>
+
+ <nz-form-item>
+ <nz-form-control>
+ <nz-input-group>
+ <input nz-input type="number" formControlName="time1" placeholder="请填写时间" />
+ </nz-input-group>
+ </nz-form-control>
+ </nz-form-item>
+
+ <p class="p2">默认时间： 90天</p>
+ </div>
+ <div>
+ <p>临期提醒时间</p>
+
+ <nz-form-item>
+ <nz-form-control>
+ <nz-input-group>
+ <input nz-input type="number" formControlName="time2" placeholder="请填写时间" />
+ </nz-input-group>
+ </nz-form-control>
+ </nz-form-item>
+
+ <p class="p2">默认时间： 30天</p>
+ </div>
+ </div>
+ <div class="explain">
+ <p>修改说明</p>
+
+ <nz-form-item>
+ <nz-form-control>
+ <textarea formControlName="explain"></textarea>
+ </nz-form-control>
+ </nz-form-item>
+ </div>
+
+
+ <div class="btnbox">
+ <button nz-button type="submit" class="ok" (click)="ok()">提交审核</button>
+ <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
+ </div>
+ </form>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.scss b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.scss
new file mode 100644
index 0000000..58a90a1
--- /dev/null
+++ b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.scss
@@ -0,0 +1,103 @@
+.box {
+ .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;
+ }
+ }
+
+
+
+
+ p {
+ margin-bottom: 0;
+ color: #C4E2FC;
+ margin: 12px 0;
+ }
+
+ .p2 {
+ margin: 6px 0;
+ font-size: 12px;
+ color: #C4E2FC;
+ }
+
+ .form {
+ box-sizing: border-box;
+ padding: 0 17px;
+
+ .timebox {
+ display: flex;
+
+ div {
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ box-sizing: border-box;
+ padding:0 6px;
+ }
+ }
+
+ .explain {
+ box-sizing: border-box;
+ padding:0 6px;
+
+ textarea {
+ width: 100%;
+ height: 100px;
+
+ background: rgba(145, 204, 255, 0.16);
+ color: #fff;
+ }
+ }
+
+ .btnbox {
+ width: 100%;
+ margin-top: 24px;
+ margin-bottom: 17px;
+ display: flex;
+ justify-content: flex-end;
+
+ button {
+ border-radius: 0px;
+ color: #91CCFF;
+ }
+
+ button:nth-child(2) {
+ margin-left: 16px;
+ }
+
+ .ok {
+ background: rgba(0, 129, 255, 0.4);
+ }
+
+ .cancel {
+ border: 1px solid #C4E2FC;
+ background: #0c1e38;
+ color: rgba(99, 102, 105, 0.6);
+ box-shadow: 0 0 3px 0 #fff inset;
+ }
+ }
+ }
+
+}
diff --git a/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts
new file mode 100644
index 0000000..b138e4d
--- /dev/null
+++ b/src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts
@@ -0,0 +1,38 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { NzModalRef } from 'ng-zorro-antd/modal';
+import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import { HttpClient } from '@angular/common/http';
+import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
+@Component({
+ selector: 'app-edit-inform-time',
+ templateUrl: './edit-inform-time.component.html',
+ styleUrls: ['./edit-inform-time.component.scss']
+})
+export class EditInformTimeComponent implements OnInit {
+
+ @Input() data?: any;
+
+ validateForm!: FormGroup;
+ constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { }
+
+
+ data2
+ ngOnInit(): void {
+ this.validateForm = this.fb.group({
+ time1: [null, [Validators.required]],
+ time2: [null, [Validators.required]],
+ explain: [null]
+ });
+ this.data2 = JSON.parse(JSON.stringify(this.data))
+ }
+
+
+ destroyModal() {
+ this.modal.destroy({ data: 'this the result data' });
+ }
+ ok() {
+ this.modal.triggerOk()
+ }
+
+
+}
diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html
index 7842d37..fed8094 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -1 +1,121 @@
-<p>audit-record works!</p>
+<div class="box" id="inform">
+ <div class="search">
+ <form nz-form [formGroup]="validateForm" class="login-form" (ngSubmit)="submitForm()">
+ <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-select>
+ </nz-form-control>
+ </nz-form-item>
+
+ <nz-form-item class="searchParams">
+ <nz-form-control>
+ <nz-select nzAllowClear formControlName="info" nzPlaceHolder="审批信息">
+ <nz-option nzValue="0" nzLabel="油站信息"></nz-option>
+ <nz-option nzValue="1" nzLabel="更新类证照提醒时间"></nz-option>
+ <nz-option nzValue="2" nzLabel="更新类证照"></nz-option>
+ <nz-option nzValue="3" nzLabel="档案类证照"></nz-option>
+ </nz-select>
+ </nz-form-control>
+ </nz-form-item>
+
+ <nz-form-item class="searchParams searchParamsLong">
+ <nz-form-control>
+ <nz-tree-select [nzAllowClear]="false" [nzDropdownClassName]="'maxHeightTreeSelect'" nzShowSearch
+ formControlName="organization" [nzNodes]="nodes" nzPlaceHolder="请选择所属机构"
+ [nzExpandedIcon]="multiExpandedIconTpl">
+ </nz-tree-select>
+ <ng-template #multiExpandedIconTpl let-node let-origin="origin">
+ <ng-container *ngIf="node.children.length == 0; else elseTemplate">
+
+ </ng-container>
+ <ng-template #elseTemplate>
+ <i nz-icon [nzType]="node.isExpanded ? 'caret-down' : 'caret-right'"
+ class="ant-tree-switcher-line-icon"></i>
+ </ng-template>
+ </ng-template>
+ </nz-form-control>
+ </nz-form-item>
+
+
+ <nz-form-item class="searchParams searchParams2">
+ <nz-form-control>
+ <nz-range-picker [nzAllowClear]="false" formControlName="datePicker"></nz-range-picker>
+ <br />
+ </nz-form-control>
+ </nz-form-item>
+
+ <nz-form-item class="searchParams">
+ <nz-form-control>
+ <nz-select nzAllowClear formControlName="level" nzPlaceHolder="审批级别">
+ <nz-option nzValue="1" nzLabel="总公司"></nz-option>
+ <nz-option nzValue="2" nzLabel="省公司"></nz-option>
+ <nz-option nzValue="3" nzLabel="区域"></nz-option>
+ </nz-select>
+ </nz-form-control>
+ </nz-form-item>
+ <nz-form-item class="searchParams">
+ <nz-form-control>
+ <nz-select nzAllowClear formControlName="state" nzPlaceHolder="审批状态">
+ <nz-option nzValue="1" nzLabel="审核中"></nz-option>
+ <nz-option nzValue="2" nzLabel="审核通过"></nz-option>
+ <nz-option nzValue="3" nzLabel="审核驳回"></nz-option>
+ <nz-option nzValue="4" nzLabel="已撤销审核"></nz-option>
+ <nz-option nzValue="5" nzLabel="审核完成"></nz-option>
+ </nz-select>
+ </nz-form-control>
+ </nz-form-item>
+
+ <nz-form-item class="btn">
+ <nz-form-control>
+ <button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
+ </nz-form-control>
+ </nz-form-item>
+
+ <nz-form-item class="btn">
+ <nz-form-control>
+ <button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
+ [nzType]="'sync'"></i>重置</button>
+ </nz-form-control>
+ </nz-form-item>
+ </form>
+ </div>
+ <div class="tablebox" id="tablebox">
+ <nz-table *ngIf="tableScrollHeight" [nzLoading]="tableSpin" [nzPageSize]='9999' #headerTable [nzData]="list"
+ [nzShowPagination]="false" [nzScroll]="{ y:tableScrollHeight }" [nzNoResult]='null' nzTableLayout="fixed">
+ <thead>
+ <tr>
+ <th [nzWidth]="'16%'">
+ <span style="margin-left: 25%;">审批类型</span>
+ </th>
+ <th>审批信息</th>
+ <th>加油站名称</th>
+ <th>区域</th>
+ <th>省公司</th>
+ <th>提交时间</th>
+ <th>审批状态</th>
+ <th>操作</th>
+ </tr>
+ </thead>
+ <tbody id="table">
+ <tr *ngFor="let item of headerTable.data;let key = index">
+ <td>
+ <span style="margin-left: 25%;">审批类型</span>
+ </td>
+ <td>审批信息</td>
+ <td>加油站名称</td>
+ <td>区域</td>
+ <td>省公司</td>
+ <td>提交时间</td>
+ <td>审批状态</td>
+ <td class="operation">
+ <span class="blueColor">详情</span>
+ </td>
+ </tr>
+ </tbody>
+ </nz-table>
+
+ </div>
+</div>
\ No newline at end of file
diff --git a/src/app/pages/audit/audit-record/audit-record.component.scss b/src/app/pages/audit/audit-record/audit-record.component.scss
index e69de29..8daef6d 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.scss
+++ b/src/app/pages/audit/audit-record/audit-record.component.scss
@@ -0,0 +1,67 @@
+.box {
+ width: 100%;
+ height: 100%;
+}
+
+.search {
+ box-sizing: border-box;
+ width: 100%;
+ height: 32px;
+ margin-bottom: 16px;
+
+ form {
+ width: 100%;
+ height: 32px;
+ display: flex;
+ justify-content: flex-start;
+
+ .searchParams,
+ .btn {
+ margin: 0 3px;
+ }
+
+ .searchParams {
+ // flex: 5;
+ width: 150px;
+ }
+
+ .searchParamsLong {
+ width: 250px;
+ }
+
+ .searchParams2 {
+ width: 220px;
+ }
+
+ .btn {
+ // flex: 1;
+ }
+
+ nz-select {
+ color: rgba(145, 204, 255, 0.95);
+ }
+
+ nz-tree-select {
+ color: rgba(145, 204, 255, 0.95);
+ }
+
+ nz-range-picker {
+ background-color: rgba(0, 0, 0, 0);
+ width: 100%;
+ }
+
+ }
+
+
+}
+
+.tablebox {
+ width: 100%;
+ height: 100%;
+
+ .operation {
+ span {
+ margin-right: 6px;
+ }
+ }
+}
diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts
index 263b4eb..bc1dd22 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -1,15 +1,199 @@
-import { Component, OnInit } from '@angular/core';
-
+import { HttpClient } from '@angular/common/http';
+import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { NzModalService } from 'ng-zorro-antd/modal';
+import { Observable, fromEvent } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { TreeService } from 'src/app/service/tree.service';
@Component({
selector: 'app-audit-record',
templateUrl: './audit-record.component.html',
styleUrls: ['./audit-record.component.scss']
})
export class AuditRecordComponent implements OnInit {
+ validateForm!: FormGroup;
+ constructor(private element: ElementRef, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private toTree: TreeService, private http: HttpClient, private fb: FormBuilder) { }
+
+ list = [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]
+
+ tableScrollHeight
+ startdate
+ enddate
+ async ngOnInit(): Promise<void> {
+ this.validateForm = this.fb.group({
+ type: [null],
+ info: [null],
+ organization: [null],
+ datePicker: [null],
+ level: [null],
+ state: [null],
+ });
+ //当前日期
+ let myDate: any = new Date();
+ let nowY = myDate.getFullYear();
+ let nowM = myDate.getMonth() + 1;
+ let nowD = myDate.getDate();
+ this.enddate = nowY + "-" + (nowM < 10 ? "0" + nowM : nowM) + "-" + (nowD < 10 ? "0" + nowD : nowD);//当前日期
+ //获取三十天前日期
+ let lw = new Date(myDate - 1000 * 60 * 60 * 24 * 30);//最后一个数字30可改，30天的意思
+ let lastY = lw.getFullYear();
+ let lastM = lw.getMonth() + 1;
+ let lastD = lw.getDate();
+ this.startdate = lastY + "-" + (lastM < 10 ? "0" + lastM : lastM) + "-" + (lastD < 10 ? "0" + lastD : lastD);//三十天之前日期
+
+
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px'
+ // 页面监听
+ fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => {
+ this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 42) + 'px'
+ });
+
+ this.getTypeList()
+
+ await this.getAllOrganization()
+ this.getRecordList()
+ }
+ SkipCount
+ submitForm(): void {
+ for (const i in this.validateForm.controls) {
+ this.validateForm.controls[i].markAsDirty();
+ this.validateForm.controls[i].updateValueAndValidity();
+ }
+ this.list = []
+ this.SkipCount = '0'
+ // this.getRecordList()
+ }
+
+ resetForm(e: MouseEvent): void {
+ e.preventDefault();
+ this.validateForm.reset();
+ for (const key in this.validateForm.controls) {
+ this.validateForm.controls[key].markAsPristine();
+ this.validateForm.controls[key].updateValueAndValidity();
+ }
+ this.validateForm.patchValue({
+ organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ datePicker: [this.startdate, this.enddate],
+ });
+ this.list = []
+ this.SkipCount = '0'
+ // this.getViolateRecgordList()
+ }
- constructor() { }
- ngOnInit(): void {
+ //获取所有组织机构
+ nodes: any = []
+ async getAllOrganization() {
+ let OrganizationUnitId = JSON.parse(sessionStorage.getItem('userdata')).organization.id
+ let params = {
+ OrganizationUnitId: OrganizationUnitId,
+ IsContainsChildren: "true"
+ }
+ await new Promise((resolve, reject) => {
+ this.http.get('/api/services/app/Organization/GetAll', {
+ params: params
+ }).subscribe((data: any) => {
+ data.result.items.forEach(element => {
+ if (element.id == OrganizationUnitId) {
+ element.parentId = null
+ }
+ element.key = element.id
+ element.title = element.displayName
+ });
+ this.nodes = [...this.toTree.toTree(data.result.items)]
+ console.log('组织机构列表', this.nodes)
+ this.validateForm.patchValue({
+ organization: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ datePicker: [this.startdate, this.enddate],
+ });
+ resolve(data)
+
+ })
+ })
+
+ }
+
+ //证照类型
+ typeLoading
+ typeList
+ getTypeList() {
+ this.typeLoading = true
+ let promiseArr = []
+ let api = ['/api/services/app/ValidityLicenseType/GetAll', '/api/services/app/FileLicenseType/GetAll']
+ api.forEach(element => {
+ promiseArr.push(
+ new Promise((resolve, reject) => {
+ this.http.get(element, {
+ params: {
+ SkipCount: '0',
+ MaxResultCount: '999'
+ }
+ }).subscribe({
+ next: (data) => {
+ resolve(data)
+ },
+ error: err => {
+ reject(err)
+ }
+ })
+ })
+ )
+ });
+
+ Promise.all(promiseArr).then((result) => {
+
+ let arr = [{ licenseName: '油站信息' }]
+ result.forEach(item => {
+ arr = arr.concat(item.result.items)
+ });
+ this.typeLoading = false
+ this.typeList = arr
+ // console.log('证照类型', arr)
+ }).catch((error) => {
+ console.log('证照类型', error)
+ })
}
+
+ //历史记录列表
+ totalCount//列表总数
+ tableSpin = false
+ getRecordList() {
+ console.log('获得历史记录列表')
+ let params = {
+ // Level: this.validateForm.value.level,
+ // ViolationIds: ViolationIds,
+ // ViolateArea: this.validateForm.value.site,
+ // OrganizationUnitId: this.validateForm.value.organization,
+ // IsContainsChildren: 'true',
+ // IsHandled: disposalState,
+ // ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
+ // SkipCount: this.SkipCount,
+ // MaxResultCount: this.MaxResultCount,
+ // Positive: this.validateForm.value.misinformation
+ }
+ // this.tableSpin = true
+ // this.http.get('/api/services/app/ViolateRecord/GetAll', {
+ // params: params
+ // }).subscribe((data: any) => {
+ // this.list = this.list.concat(data.result.items);
+ // this.list = [...this.list]
+ // this.totalCount = data.result.totalCount
+ // console.log('违规记录列表', data)
+ // this.tableSpin = false
+ // })
+ }
+
+
+ ngAfterViewInit(): void {
+ fromEvent(this.element.nativeElement.querySelector(`.ant-table-body`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe((event: any) => { //监听 DOM 滚动事件
+ if (event.target.scrollHeight - (event.target.scrollTop + event.target.clientHeight) <= 10) {
+ if (this.totalCount > this.list.length) {
+ console.log('需要加载数据了', event)
+ this.SkipCount = String(Number(this.SkipCount) + 50)
+ this.getRecordList()
+ }
+ }
+ });
+ }
}
diff --git a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
index 0a4efee..35205b6 100644
--- a/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
+++ b/src/app/pages/criminal-records-admin/criminal-records-admin.component.ts
@@ -480,7 +480,7 @@ export class CriminalRecordsAdminComponent implements OnInit {
Level: this.validateForm.value.level,
ViolationIds: ViolationIds,
ViolateArea: this.validateForm.value.site,
- OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ OrganizationUnitId: this.validateForm.value.organization,
IsContainsChildren: 'true',
IsHandled: disposalState,
ViolateTime: this.validateForm.value.datePicker ? [moment(this.validateForm.value.datePicker[0]).format('yyyy-MM-DD'), moment(this.validateForm.value.datePicker[1]).format('yyyy-MM-DD')] : null,
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.html b/src/app/pages/oil-station-info/oil-station-info.component.html
index 4fef0be..ac37f7a 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.html
+++ b/src/app/pages/oil-station-info/oil-station-info.component.html
@@ -6,6 +6,7 @@
<div class="tablebox">
<form nz-form [formGroup]="validateForm" (ngSubmit)="submitForm()">
<div class="table">
+
<table formGroupName="oilStation">
<tr>
<td class="head">站名</td>
@@ -28,9 +29,9 @@
<nz-form-item>
<nz-form-control>
<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-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>
@@ -58,14 +59,14 @@
</nz-form-item>
</td>
<!-- <td class="head">营业执照有效期<span style="color: red;">*</span></td>
- <td colspan="text">
- <nz-form-item>
- <nz-form-control>
- <nz-range-picker [(ngModel)]="validityTime" formControlName="validityTime">
- </nz-range-picker>
- </nz-form-control>
- </nz-form-item>
- </td> -->
+ <td colspan="text">
+ <nz-form-item>
+ <nz-form-control>
+ <nz-range-picker [(ngModel)]="validityTime" formControlName="validityTime">
+ </nz-range-picker>
+ </nz-form-control>
+ </nz-form-item>
+ </td> -->
</tr>
<tr>
<td class="head">区域</td>
@@ -300,7 +301,14 @@
</td>
</tr>
</table>
- <table class="imgtable" id="images">
+
+ <!-- 审核中遮罩层 -->
+ <div class="shade" *ngIf="httpBody.auditStatus == 1">
+ 审核中...
+ </div>
+
+
+ <!-- <table class="imgtable" id="images">
<tr *ngFor="let item of httpBody.licenses;let key = index">
<td class="head" [title]="item.name">{{item.name}}</td>
<td colspan="3" class="imgbox">
@@ -416,10 +424,13 @@
</nz-modal>
</td>
</tr>
- </table>
+ </table> -->
</div>
<div class="btnbox">
- <button [nzLoading]="isLoadingSave" nz-button type="submit">保存</button>
+ <span style="color: #fff;">当前审核状态：{{httpBody.auditStatus | auditStatus}}</span>
+ <button [nzLoading]="isSubmitAuditLoading" nz-button type="button" *ngIf="httpBody.auditStatus != 1" (click)="submitAudit()">提交审核</button>
+ <button [nzLoading]="isRevocationAuditLoading" nz-button type="button" *ngIf="httpBody.auditStatus == 1" (click)="revocationAudit()">撤销审核</button>
+ <button [nzLoading]="isLoadingSave" nz-button type="button" (click)="submitForm()" *ngIf="httpBody.auditStatus != 1" >保存</button>
<button (click)="exportExcel()" nz-button type="button"><img style="vertical-align: top;margin-right: 6px;"
src="../../../assets/images/excel.png" alt=""> 导出Excel</button>
</div>
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.scss b/src/app/pages/oil-station-info/oil-station-info.component.scss
index 24e0541..d8f917f 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.scss
+++ b/src/app/pages/oil-station-info/oil-station-info.component.scss
@@ -27,11 +27,12 @@
.tablebox {
flex: 1;
-
+
.table {
+ position: relative;
table,
table tr th,
@@ -178,31 +179,40 @@
}
}
+
+ .shade {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+ background-color: rgba(77, 80, 83, 0.3);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 25px;
+ font-family: titlefont;
+ color: white;
+ }
}
.btnbox {
- height: 40px;
+ height: 36px;
+ line-height: 36px;
width: 100%;
- margin-bottom: 24px;
display: flex;
justify-content: flex-end;
button {
- height: 40px;
- background: rgba(0, 129, 255, 0.3);
+ height: 36px;
+ background: rgba(0, 129, 255, 0.4);
border: 1px solid #36A2FF;
opacity: 1;
border-radius: 0px;
color: #91CCFF;
}
- button:nth-child(1) {
- width: 100px;
- margin-left: 16px;
- }
-
- button:nth-child(2) {
- width: 130px;
+ button{
margin-left: 16px;
}
}
diff --git a/src/app/pages/oil-station-info/oil-station-info.component.ts b/src/app/pages/oil-station-info/oil-station-info.component.ts
index 21e6a8a..59580b4 100644
--- a/src/app/pages/oil-station-info/oil-station-info.component.ts
+++ b/src/app/pages/oil-station-info/oil-station-info.component.ts
@@ -53,15 +53,7 @@ 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]]
- // })
+ })
});
this.getInfo()
@@ -71,14 +63,14 @@ export class OilStationInfoComponent implements OnInit {
//获取油站信息
- gallery
+ // gallery
getInfo() {
this.http.get('/api/services/app/GasStation/Get', {
params: {
organizationUnitId: this.userdata.organization.id
}
}).subscribe((data: any) => {
- console.log('油站信息', data)
+
this.httpBody = data.result
if (!this.httpBody.govUnitDetail) {
this.httpBody.govUnitDetail = {
@@ -92,30 +84,32 @@ export class OilStationInfoComponent implements OnInit {
this.hospital = data.result.govUnitDetail.hospital
this.fireBrigade = data.result.govUnitDetail.fireBrigade
}
- if (this.httpBody.licenses.length == 0) {
- this.httpBody.licenses = [
- { name: '营业执照', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true },
- { name: '危险化学品', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false },
- { name: '成品油零售', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true }
- ]
- } else {
- console.log('走这里了',this.httpBody.licenses)
- this.httpBody.licenses.forEach(item => {
- if (item.endTime == '9999-01-01T00:00:00') {
- item.isPerpetual = true
- } else {
- item.isPerpetual = false
- }
- })
- }
- this.httpBody.stationType ? this.httpBody.stationType = String(this.httpBody.stationType) : null
- setTimeout(() => {
- this.gallery = new Viewer(document.getElementById('images'), {
- show: () => { // 动态加载图片后，更新实例
- this.gallery.update();
- },
- });
- }, 0);
+ // if (this.httpBody.licenses.length == 0) {
+ // this.httpBody.licenses = [
+ // { name: '营业执照', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 1, hasAnnualInspection: true },
+ // { name: '危险化学品', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 3, hasAnnualInspection: false },
+ // { name: '成品油零售', code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: 2, hasAnnualInspection: true }
+ // ]
+ // } else {
+ // console.log('走这里了',this.httpBody.licenses)
+ // this.httpBody.licenses.forEach(item => {
+ // if (item.endTime == '9999-01-01T00:00:00') {
+ // item.isPerpetual = true
+ // } else {
+ // item.isPerpetual = false
+ // }
+ // })
+ // }
+ // this.httpBody.stationType ? this.httpBody.stationType = String(this.httpBody.stationType) : null
+
+ console.log('油站信息', this.httpBody)
+ // setTimeout(() => {
+ // this.gallery = new Viewer(document.getElementById('images'), {
+ // show: () => { // 动态加载图片后，更新实例
+ // this.gallery.update();
+ // },
+ // });
+ // }, 0);
}, err => {
console.log('油站错误信息', err.error.error.message)
@@ -165,6 +159,7 @@ export class OilStationInfoComponent implements OnInit {
id: null,
stationName: JSON.parse(sessionStorage.getItem('userdata')).organization.displayName,
organizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
+ auditStatus: null,
openTime: '',
stationType: '',
laneCount: '',
@@ -195,63 +190,60 @@ export class OilStationInfoComponent implements OnInit {
}
}
- onChange($event) {
- }
+ // addName = ''
+ // isVisible = false;
+ // showModal(): void {
+ // this.addName = ''
+ // this.isVisible = true;
+ // }
- addName = ''
- isVisible = false;
- showModal(): void {
- console.log(this.addName)
- this.addName = ''
- this.isVisible = true;
- }
+ // handleOk(): void {
+ // this.isVisible = false;
+ // if (this.addName) {
+ // this.addTr()
+ // }
+ // }
- handleOk(): void {
- this.isVisible = false;
- if (this.addName) {
- this.addTr()
- }
- }
-
- handleCancel(): void {
- console.log('Button cancel clicked!');
- this.isVisible = false;
- }
- addTr() {
- this.httpBody.licenses.push(
- { name: this.addName, code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false },
- )
- }
- deleteTrConfirm(key) {
- console.log(key)
- this.httpBody.licenses.splice(key, 1);
- }
+ // handleCancel(): void {
+ // console.log('Button cancel clicked!');
+ // this.isVisible = false;
+ // }
+ // addTr() {
+ // this.httpBody.licenses.push(
+ // { name: this.addName, code: '', isPerpetual: false, startTime: '', endTime: '', firstWarnTime: '', secondWarnTime: '', imageUrl: '', annualInspectionTime: '', annualInspectionWarnTime: '', annualInspectionOrganizationName: '', type: -1, hasAnnualInspection: false },
+ // )
+ // }
+ // deleteTrConfirm(key) {
+ // console.log(key)
+ // this.httpBody.licenses.splice(key, 1);
+ // }
goback() {
this.router.navigate(['/todaywarning/petrolStation'])
}
+ isLoadingSave: boolean = false
submitForm() {
- let valid = true
- console.log(this.httpBody.licenses)
- this.httpBody.licenses.forEach(element => {
- if (!element.startTime || !element.endTime || !element.firstWarnTime || !element.secondWarnTime || !element.code) {
- valid = false
- console.log('普通拦截')
- return
- }
- if (element.hasAnnualInspection) {
- if (!element.annualInspectionWarnTime || !element.annualInspectionOrganizationName || !element.annualInspectionTime) {
- valid = false
- console.log('年检拦截')
- return
- }
- }
- });
- if (!valid) {
- this.message.create('error', '请将证照信息填写完整！');
- return
- }
+ // let valid = true
+ // console.log(this.httpBody.licenses)
+ // this.httpBody.licenses.forEach(element => {
+ // if (!element.startTime || !element.endTime || !element.firstWarnTime || !element.secondWarnTime || !element.code) {
+ // valid = false
+ // console.log('普通拦截')
+ // return
+ // }
+ // if (element.hasAnnualInspection) {
+ // if (!element.annualInspectionWarnTime || !element.annualInspectionOrganizationName || !element.annualInspectionTime) {
+ // valid = false
+ // console.log('年检拦截')
+ // return
+ // }
+ // }
+ // });
+ // if (!valid) {
+ // this.message.create('error', '请将证照信息填写完整！');
+ // return
+ // }
if (this.validateForm.valid) {
this.isLoadingSave = true
this.httpBody.openTime = moment(this.httpBody.openTime).format('YYYY-MM-MM')//开业时间格式化
@@ -271,7 +263,6 @@ export class OilStationInfoComponent implements OnInit {
this.http.put('/api/services/app/GasStation/Update', body).subscribe((data: any) => {
this.isLoadingSave = false
this.message.create('success', '保存成功！');
- // this.httpBody.licenses = data.result.licenses
}, err => {
this.isLoadingSave = false
this.message.create('error', '保存失败！');
@@ -283,57 +274,87 @@ export class OilStationInfoComponent implements OnInit {
}
- isLoadingSave: boolean = false
- uploadIndex: string
- filechange(e, index) {
- let file = e.target.files[0] || null //获取上传的文件
- this.uploadIndex = index
- this.openFileSelect(file, `stationPhotos/${this.userdata.organization.id}/`)
- }
- //设置文件路径并上传
- postFilePath
- async openFileSelect(file: File, extensionPath: string) {
- this.postFilePath = extensionPath;
- let fileSize = file.size || null //上传文件的总大小
- let shardSize = 5 * 1024 * 1024 //5MB 超过5MB要分块上传
- if (fileSize >= shardSize) // 超过5MB要分块上传
- {
- await this.postFileByMul(file);
- setTimeout(() => {
- this.gallery.destroy()
- this.gallery = new Viewer(document.getElementById('images'));
- }, 0);
- }
- else //普通上传
- {
- await this.postFile(file);
- setTimeout(() => {
- this.gallery.destroy()
- this.gallery = new Viewer(document.getElementById('images'));
- }, 0);
+ // uploadIndex: string
+ // filechange(e, index) {
+ // let file = e.target.files[0] || null //获取上传的文件
+ // this.uploadIndex = index
+ // this.openFileSelect(file, `stationPhotos/${this.userdata.organization.id}/`)
+ // }
+ // //设置文件路径并上传
+ // postFilePath
+ // async openFileSelect(file: File, extensionPath: string) {
+ // this.postFilePath = extensionPath;
+ // let fileSize = file.size || null //上传文件的总大小
+ // let shardSize = 5 * 1024 * 1024 //5MB 超过5MB要分块上传
+ // if (fileSize >= shardSize) // 超过5MB要分块上传
+ // {
+ // await this.postFileByMul(file);
+ // setTimeout(() => {
+ // this.gallery.destroy()
+ // this.gallery = new Viewer(document.getElementById('images'));
+ // }, 0);
+ // }
+ // else //普通上传
+ // {
+ // await this.postFile(file);
+ // setTimeout(() => {
+ // this.gallery.destroy()
+ // this.gallery = new Viewer(document.getElementById('images'));
+ // }, 0);
+ // }
+ // }
+ // //上传文件
+ // async postFile(file: File) {
+ // await new Promise((resolve, reject) => {
+ // this.objectsSrv.postFile(this.postFilePath, file).subscribe(data => {
+ // let dataObj = data as any;
+ // let filePath: string = ObjectsSimpleService.baseUrl + dataObj.objectName;
+ // this.httpBody.licenses[this.uploadIndex].imageUrl = filePath
+ // resolve('success')
+ // });
+ // })
+ // }
+
+ // /**
+ // * 分块上传
+ // * @param file
+ // */
+ // postFileByMul(file: File) {
+ // this.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => {
+ // let dataObj = value as any;
+ // this.httpBody.licenses[this.uploadIndex].imageUrl = dataObj.filePath
+ // });
+
+ // }
+
+
+ isSubmitAuditLoading: boolean = false
+ submitAudit() {
+ let params = {
+ id: this.httpBody.id
}
- }
- //上传文件
- async postFile(file: File) {
- await new Promise((resolve, reject) => {
- this.objectsSrv.postFile(this.postFilePath, file).subscribe(data => {
- let dataObj = data as any;
- let filePath: string = ObjectsSimpleService.baseUrl + dataObj.objectName;
- this.httpBody.licenses[this.uploadIndex].imageUrl = filePath
- resolve('success')
- });
+ this.http.post('/api/services/app/GasStation/Commit', null, { params: params }).subscribe((data: any) => {
+ this.isSubmitAuditLoading = false
+ this.getInfo()
+ this.message.create('success', '提交审核成功！');
+ }, err => {
+ this.isSubmitAuditLoading = false
+ this.message.create('error', '提交审核失败！');
})
}
- /**
- * 分块上传
- * @param file
- */
- postFileByMul(file: File) {
- this.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => {
- let dataObj = value as any;
- this.httpBody.licenses[this.uploadIndex].imageUrl = dataObj.filePath
- });
-
+ isRevocationAuditLoading: boolean = false
+ revocationAudit() {
+ let params = {
+ id: this.httpBody.id
+ }
+ this.http.post('/api/services/app/GasStation/Uncommit', null, { params: params }).subscribe((data: any) => {
+ this.isRevocationAuditLoading = false
+ this.getInfo()
+ this.message.create('success', '撤销审核成功！');
+ }, err => {
+ this.isRevocationAuditLoading = false
+ this.message.create('error', '撤销审核失败！');
+ })
}
}
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index de22d3d..adbab1d 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -79,11 +79,14 @@ import { AuditIngComponent } from './audit/audit-ing/audit-ing.component';
import { AuditRecordComponent } from './audit/audit-record/audit-record.component';
import { AuditInformTimeComponent } from './audit/audit-inform-time/audit-inform-time.component';
import { AuditDisposeComponent } from './audit/audit-ing/audit-dispose/audit-dispose.component';
+import { EditInformTimeComponent } from './audit/audit-inform-time/edit-inform-time/edit-inform-time.component';
+import { AuditDetailsInformTimeComponent } from './audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component';
+import { auditStatusPipe } from '../pipes/type.pipe';
@NgModule({
declarations: [LoginComponent, RegisterComponent, HomeComponent, PlanComponent, TodayWarningComponent, CriminalRecordsComponent,
TodayWarningAdminComponent, CriminalRecordsAdminComponent, LeftDomainComponent, EquipmentInfoComponent, OilStationInfoComponent,
- AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent,PdfWordLookComponent, MisinformationListComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent],
+ AddequipmentComponent, EditequipmentComponent, PlanAdminComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, HomePageComponent, OilUnloadingProcessListComponent, ChangePasswordComponent, FacilitySortPipe, WarningStatisticsListComponent, DisposeequipmentComponent, NavBarComponent, InformComponent, UpdateCategoryComponent, FileCategoryComponent, HistoriesComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, MisinformationListComponent, OilStationListComponent, UpdateLicenseListComponent, FileLicenseListComponent, AuditNavComponent, AuditIngComponent, AuditRecordComponent, AuditInformTimeComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent,auditStatusPipe],
imports: [
@@ -127,7 +130,7 @@ import { AuditDisposeComponent } from './audit/audit-ing/audit-dispose/audit-dis
NzToolTipModule,
NzTimelineModule
],
- entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent,AuditDisposeComponent],
+ entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
diff --git a/src/app/pipes/type.pipe.ts b/src/app/pipes/type.pipe.ts
new file mode 100644
index 0000000..b5342d7
--- /dev/null
+++ b/src/app/pipes/type.pipe.ts
@@ -0,0 +1,9 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({ name: 'auditStatus' })
+export class auditStatusPipe implements PipeTransform {
+ transform(value: number): string {
+ let arr = ['未提交审核', '审核中', '审核通过', '审核驳回', '已撤销审核', '审核完成']
+ return arr[value]
+ }
+}
\ No newline at end of file
diff --git a/src/theme.less b/src/theme.less
index aef831b..e3c1ede 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -205,7 +205,8 @@
#editupdatecategory,
#detailsupdatecategory,
#editfilecategory,
-#detailsfilecategory {
+#detailsfilecategory,
+#inform {
::-webkit-input-placeholder {
/* WebKit browsers */
color: #345d85;
@@ -456,6 +457,29 @@
}
}
+//蓝色 表格 tree-通知时间
+
+.informTime {
+
+
+
+ .ant-table-thead>tr {
+ border: 0px;
+ box-shadow: none !important;
+ }
+
+ .ant-table-thead>tr>th {
+ text-align: center;
+ border: 1px solid rgba(35, 217, 255, 0.4);
+ }
+
+ .ant-table-tbody>tr>td {
+ text-align: center;
+ }
+
+
+}
+
#stationPlanBox {
nz-table {
width: 96%;