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

[完善]根据文档修改

beijing
邵佳豪 3 years ago
parent
7b5d1b0de6
commit
5cca00a273
11 changed files with 73 additions and 36 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. 2
      src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
  2. 12
      src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
  3. 1
      src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
  4. 7
      src/app/pages/audit/audit-inform-time/audit-inform-time.component.html
  5. 9
      src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
  6. 5
      src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts
  7. 39
      src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
  8. 10
      src/app/pages/audit/audit-ing/audit-ing.component.ts
  9. 12
      src/app/pages/audit/audit-nav/audit-nav.component.html
  10. 6
      src/app/pages/license/histories/histories.component.html
  11. 6
      src/app/pages/license/inform/inform.component.html

2
src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts
Unescape View File

@ -43,7 +43,7 @@ export class EditAnnualInspectionComponent implements OnInit {
let body = {
licenseTypeId: this.dataCopy.licenseTypeId,
organizationId: JSON.parse(sessionStorage.getItem('userdata')).organization.id,
yearlyCheckDate: moment(this.validateForm.value.time).format('YYYY-MM-DD')//开业时间格式化
yearlyCheckDate: moment(this.validateForm.value.time).format('YYYY-MM-DD')
}
this.http.put('/api/services/app/OrganizationValidityLicenseRule/UpdateYearlyCheckDate', body).subscribe((data) => {
this.message.create('success', '修改成功');

12
src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.html
Unescape View File

@ -14,20 +14,22 @@
<p>公司名称: {{data.organization ? data.organization.displayName : null}}</p>
<div class="cutoffrule"></div>
<p class="flexp">
<span>办理提醒时间：修改时间 {{data.handleRemindDays}}天</span>
<span>办理提醒时间: 修改时间 {{data.handleRemindDays}}天</span>
<span>默认时间 {{data.handleRemindDaysDefault}}天</span>
</p>
<div class="cutoffrule"></div>
<p class="flexp">
<span>临期提醒时间：修改时间 {{data.closingRemindDays}}天</span>
<span>临期提醒时间: 修改时间 {{data.closingRemindDays}}天</span>
<span>默认时间 {{data.closingRemindDaysDefault}}天</span>
</p>
<div class="cutoffrule"></div>
<p>修改说明：{{data.remark}}</p>
<p *ngIf="data.isYearlyCheckDefault">年检时间: {{data.yearlyCheckDate | date:"MM/dd"}}</p>
<div *ngIf="data.isYearlyCheckDefault" class="cutoffrule"></div>
<p>修改说明: {{data.remark}}</p>
<div class="cutoffrule"></div>
<p>审核状态：{{data.auditStatus | auditStatus}}</p>
<p>审核状态: {{data.auditStatus | auditStatus}}</p>
<div class="cutoffrule"></div>
<p>审核说明：{{data.auditLog? data.auditLog.rejectReason : ''}}</p>
<p>审核说明: {{data.auditLog? data.auditLog.rejectReason : ''}}</p>
</div>

1
src/app/pages/audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component.ts
Unescape View File

@ -13,7 +13,6 @@ export class AuditDetailsInformTimeComponent implements OnInit {
organizationName
ngOnInit(): void {
this.organizationName = JSON.parse(sessionStorage.getItem('userdata')).organization.displayName
}
destroyModal() {

7
src/app/pages/audit/audit-inform-time/audit-inform-time.component.html
Unescape View File

@ -9,6 +9,7 @@
</th>
<th colspan="2">办理提醒时间</th>
<th colspan="2">临期提醒时间</th>
<th colspan="2">年检设置</th>
<th rowspan="2">提交审核时间</th>
<th rowspan="2">审核状态</th>
<th rowspan="2">操作</th>
@ -18,6 +19,8 @@
<th>现用时间</th>
<th>默认时间</th>
<th>现用时间</th>
<th>是否年检</th>
<th>年检时间</th>
</tr>
</thead>
<tbody id="table">
@ -29,6 +32,8 @@
<td>{{item.handleRemindDays}}天</td>
<td>{{item.closingRemindDaysDefault}}天</td>
<td>{{item.closingRemindDays}}天</td>
<td>{{item.isYearlyCheckDefault ? '是' : '否'}}</td>
<td>{{item.yearlyCheckDate | date:"MM/dd"}}</td>
<td>{{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}}</td>
<td>{{item.auditStatus | auditStatus}}</td>
<td class="operation">
@ -36,7 +41,7 @@
[ngClass]="{'greyColor': item.auditStatus == 1}">编辑</span>
<span class="blueColor" (click)="unCommit(item)"
*ngIf="item.auditStatus == 1">撤销审核</span>
<span class="blueColor" (click)="details(item)">审核详情</span>
<span class="blueColor" (click)="details(item)">详情</span>
</td>
</tr>
</tbody>

9
src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.html
Unescape View File

@ -35,6 +35,15 @@
<p class="p2">默认时间： 30天</p>
</div>
</div>
<div class="explain" *ngIf="dataCopy.isYearlyCheckDefault">
<p>年检时间</p>
<nz-form-item>
<nz-form-control>
<nz-date-picker [nzFormat]="dateFormat" style="width: 100%;" formControlName="time"></nz-date-picker>
</nz-form-control>
</nz-form-item>
</div>
<div class="explain">
<p>修改说明</p>

5
src/app/pages/audit/audit-inform-time/edit-inform-time/edit-inform-time.component.ts
Unescape View File

@ -4,6 +4,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
import { NzMessageService } from 'ng-zorro-antd/message';
import * as moment from 'moment';
@Component({
selector: 'app-edit-inform-time',
templateUrl: './edit-inform-time.component.html',
@ -16,13 +17,14 @@ export class EditInformTimeComponent implements OnInit {
validateForm!: FormGroup;
constructor(private message: NzMessageService, private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { }
dateFormat = 'MM/dd';
dataCopy
ngOnInit(): void {
this.dataCopy = JSON.parse(JSON.stringify(this.data))
this.validateForm = this.fb.group({
time1: [this.dataCopy.handleRemindDays, [Validators.required]],
time2: [this.dataCopy.closingRemindDays, [Validators.required]],
time: [this.dataCopy.yearlyCheckDate, [Validators.required]],//年检时间
explain: [null]
});
@ -44,6 +46,7 @@ export class EditInformTimeComponent implements OnInit {
organizationId: this.dataCopy.organizationId,
handleRemindDays: this.validateForm.value.time1,
closingRemindDays: this.validateForm.value.time2,
yearlyCheckDate: moment(this.validateForm.value.time).format('YYYY-MM-DD'),
remark: this.validateForm.value.explain
}
console.log(body)

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

@ -7,52 +7,65 @@
</div>
<div class="content">
<p *ngIf="data.auditType != 0 && data.auditType != 1 && 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 && data.auditType != 1"></div>
<div *ngIf="data.auditType == 0"><app-gas-base-info [data]="data"></app-gas-base-info></div>
<div *ngIf="data.auditType == 0">
<app-gas-base-info [data]="data"></app-gas-base-info>
</div>
<div *ngIf="data.auditType == 1">
<p>公司名称: &nbsp;&nbsp;{{data.organization.displayName}}</p>
<div class="cutoffrule"></div>
<p>证照名称: &nbsp;&nbsp;{{data.getData.licenseType.licenseName}}</p>
<div class="cutoffrule"></div>
<p>
办理提醒时间：修改时间 &nbsp;&nbsp;{{data.getData.handleRemindDays}}天
办理提醒时间: 修改时间 &nbsp;&nbsp;{{data.getData.handleRemindDays}}天
<span style="float: right;">默认时间 {{data.getData.handleRemindDaysDefault}}天</span>
</p>
<div class="cutoffrule"></div>
<p>
临期提醒时间：修改时间 &nbsp;&nbsp;{{data.getData.closingRemindDays}}天
临期提醒时间: 修改时间 &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>
<p *ngIf="data.getData.licenseType.isYearlyCheck">年检时间: {{data.getData.yearlyCheckDate | date:"MM/dd"}}</p>
<div *ngIf="data.getData.licenseType.isYearlyCheck" 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>
<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>
<p>有效期类型: &nbsp;&nbsp;{{data.getData.validityDays || 0}}天</p>
<div class="cutoffrule"></div>
<p>是否年检: &nbsp;&nbsp;<span *ngIf="data.getData.isYearlyCheck">是</span><span *ngIf="!data.getData.isYearlyCheck">否</span></p>
<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>
<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>
<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;
<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)">
<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)">
<div class="cutoffrule" [hidden]="data.getData.imageUrl === undefined"></div>
<p>审批意见：</p>
<textarea style="background: #173350;height: 100px;width: 100%;border-radius: 0;border: 0;color: white;" cols="30" rows="10" [(ngModel)]="textarea"></textarea>
<p>审批意见: </p>
<textarea style="background: #173350;height: 100px;width: 100%;border-radius: 0;border: 0;color: white;"
cols="30" rows="10" [(ngModel)]="textarea"></textarea>
<div class="btnbox">
<button nz-button type="button" class="ok" (click)="ok(true)">通过</button>
<button nz-button type="button" class="cancel" (click)="ok(false)">驳回</button>

10
src/app/pages/audit/audit-ing/audit-ing.component.ts
Unescape View File

@ -135,18 +135,24 @@ export class AuditIngComponent implements OnInit {
}
details(item) {
let itemCopy = JSON.parse(JSON.stringify(item))
let component
if (item.auditType == 0) {
component = GasBaseInfoComponent
} else if (item.auditType == 1) {
component = AuditDetailsInformTimeComponent
} else if (item.auditType == 2) {
component = DetailsUpdateCategoryComponent
} else if (item.auditType) {
component = DetailsFileCategoryComponent
}
this.getData(item).then(res => {
this.getData(item).then((res: any) => {
// console.log('res', res)
item.getData = res
if (item.auditType == 1) {
item.getData.isYearlyCheckDefault = res.licenseType.isYearlyCheck
}
const modal = this.modal.create({
nzContent: component,
nzViewContainerRef: this.viewContainerRef,
@ -189,7 +195,7 @@ export class AuditIngComponent implements OnInit {
let params = { id: item.itemId }
this.http.get(url, { params }).subscribe((data: any) => {
let auditLog = { rejectReason: item.rejectReason }
let organization = { displayName: item.organization? item.organization.displayName : "" }
let organization = { displayName: item.organization ? item.organization.displayName : "" }
if (item.auditType == 1) {
data.result.auditLog = auditLog
data.result.organization = organization

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

@ -6,10 +6,10 @@
<div class="navitem">
<span *ngFor="let item of navList" [ngClass]="{'grey': selectedItem != item}"
(click)="selectNav(item)">{{item}}</span>
<span *ngIf="isLevel == 2" [ngClass]="{'grey': selectedItem != '通知时间'}"
(click)="selectNav('通知时间')">通知时间</span>
<span *ngIf="isLevel == 2" [ngClass]="{'grey': selectedItem != '年检设置'}"
(click)="selectNav('年检设置')">年检设置</span>
<span *ngIf="isLevel == 2" [ngClass]="{'grey': selectedItem != '预警规则'}"
(click)="selectNav('预警规则')">预警规则</span>
<!-- <span *ngIf="isLevel == 2" [ngClass]="{'grey': selectedItem != '年检设置'}"
(click)="selectNav('年检设置')">年检设置</span> -->
</div>
</div>
</div>
@ -17,7 +17,7 @@
<div class="content">
<app-audit-ing *ngIf="selectedItem == navList[0]"></app-audit-ing>
<app-audit-record *ngIf="selectedItem == navList[1]"></app-audit-record>
<app-audit-inform-time *ngIf="selectedItem == '通知时间'"></app-audit-inform-time>
<app-annual-inspection *ngIf="selectedItem == '年检设置'"></app-annual-inspection>
<app-audit-inform-time *ngIf="selectedItem == '预警规则'"></app-audit-inform-time>
<!-- <app-annual-inspection *ngIf="selectedItem == '年检设置'"></app-annual-inspection> -->
</div>
</div>

6
src/app/pages/license/histories/histories.component.html
Unescape View File

@ -5,10 +5,10 @@
<thead>
<tr>
<th [nzWidth]="'16%'">
<span style="margin-left:30px;">证件名称</span>
<span style="margin-left:30px;">证照名称</span>
</th>
<th>证件编号</th>
<th>证件有效期</th>
<th>证照编号</th>
<th>证照有效期</th>
<th>有效期类型</th>
<th>办理类型</th>
<th>通知内容</th>

6
src/app/pages/license/inform/inform.component.html
Unescape View File

@ -5,10 +5,10 @@
<thead>
<tr>
<th [nzWidth]="'16%'">
<span style="margin-left: 30px;">证件名称</span>
<span style="margin-left: 30px;">证照名称</span>
</th>
<th>证件编号</th>
<th>证件有效期</th>
<th>证照编号</th>
<th>证照有效期</th>
<th>有效期类型</th>
<th>办理类型</th>
<th>通知内容</th>

Write Preview
Loading…
Cancel
Save