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 4650790..b36aa5e 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 @@ -23,14 +23,14 @@ - 营业执照 + {{item.licenseName}} - 90天 - 90天 - 90天 - 90天 - 时间 - 审批状态 + {{item.handleRemindDaysDefault}}天 + {{item.handleRemindDays}}天 + {{item.closingRemindDaysDefault}}天 + {{item.closingRemindDays}}天 + {{item.commitTime ? (item.commitTime | date:"yyyy-MM-dd HH:mm:ss") : '/'}} + {{item.auditStatus | auditStatus}} 编辑 审核详情 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 310cda6..15b00ca 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,5 @@ -import { Component, OnInit, ViewContainerRef } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core'; import { NzModalService } from 'ng-zorro-antd/modal'; import { Observable, fromEvent } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; @@ -13,19 +14,49 @@ import { EditInformTimeComponent } from './edit-inform-time/edit-inform-time.com }) export class AuditInformTimeComponent implements OnInit { - constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef) { } + constructor(private http: HttpClient, private element: ElementRef, 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] + list = [] tableScrollHeight ngOnInit(): void { - this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 85) + 'px' // 页面监听 + this.tableScrollHeight = '0px' fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { - this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - 85) + 'px' + let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader) + 'px' }); + + this.getTimeList() } + SkipCount: string = '0' + MaxResultCount: string = '100' + async getTimeList() { + let params = { + OrganizationUnitId: JSON.parse(sessionStorage.getItem('userdata')).organization.id, + IsContainsChildren: 'true', + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount, + } + this.tableSpin = true + await new Promise((resolve, reject) => { + this.http.get('/api/services/app/OrganizationValidityLicenseRule/GetCurOrgRules', { + params: params + }).subscribe((data: any) => { + this.list = this.list.concat(data.result); + this.list = [...this.list] + console.log('时间表格', data) + this.tableSpin = false + + setTimeout(() => { + let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader) + 'px' + }, 0); + resolve(data) + }) + }) + } edit(item) { diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.html b/src/app/pages/audit/audit-nav/audit-nav.component.html index 509ec51..e9c2dbc 100644 --- a/src/app/pages/audit/audit-nav/audit-nav.component.html +++ b/src/app/pages/audit/audit-nav/audit-nav.component.html @@ -6,6 +6,8 @@
{{item}} + 通知时间
@@ -13,6 +15,6 @@
- +
\ No newline at end of file diff --git a/src/app/pages/audit/audit-nav/audit-nav.component.ts b/src/app/pages/audit/audit-nav/audit-nav.component.ts index e787789..08f23b6 100644 --- a/src/app/pages/audit/audit-nav/audit-nav.component.ts +++ b/src/app/pages/audit/audit-nav/audit-nav.component.ts @@ -10,12 +10,16 @@ export class AuditNavComponent implements OnInit { constructor() { } - navList = ['审批', '历史纪录', '通知时间'] + navList = ['审批', '历史纪录'] selectedItem = '审批' selectNav(item) { this.selectedItem = item } + + + isLevel ngOnInit(): void { + this.isLevel = JSON.parse(sessionStorage.getItem('userdata')).organization.level } } diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html index 7f0f14f..03619c9 100644 --- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.html +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.html @@ -1 +1,63 @@ -

file-license-list works!

+
+
+
+
+ +
+
+ + + + 序号 + + {{item.name}} + + + + + + + {{key + 1}} + + + + + + {{i.value.validityType}} + + + + {{i.value}} + + + + / + + + + + + + +
+
\ No newline at end of file diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.scss b/src/app/pages/plan-admin/file-license-list/file-license-list.component.scss index e69de29..06cfc17 100644 --- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.scss +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.scss @@ -0,0 +1,79 @@ +.search { + box-sizing: border-box; + padding-left: 38px; + padding-right: 35px; + width: 100%; + height: 32px; + margin: 12px 0; + display: flex; + justify-content: space-between; + align-items: center; + + .legendbox { + display: flex; + align-items: center; + color: #FFFFFF; + flex: 1; + + .legendItem { + display: flex; + align-items: center; + margin-right: 12px; + + div { + width: 8px; + height: 8px; + margin-right: 3px; + } + } + } + + form { + flex: 1; + height: 32px; + display: flex; + justify-content: flex-end; + + input { + background: none; + border: 1px solid #91ccff; + color: #fff; + } + + .searchParams { + width: 35%; + } + + .btn { + margin-left: 16px; + } + } +} + +.box { + width: 100%; + height: 100%; + display: flex; + flex-direction: column; +} + +.tablebox { + flex: 1; + display: flex; + flex-direction: column; + align-items: center; + overflow: hidden; +} + + +.green { + color: #4BFFD4; +} + +.yellow { + color: #FFBD4B; +} + +.red { + color: #FF4B65; +} diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts index 78c6d9d..0418bb0 100644 --- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts @@ -1,4 +1,16 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild, ElementRef, ViewContainerRef } from '@angular/core'; +import { HttpClient } from '@angular/common/http'; +import { TreeService } from 'src/app/service/tree.service'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { NzContextMenuService, NzDropdownMenuComponent } from 'ng-zorro-antd/dropdown'; +import { NzFormatEmitEvent, NzTreeComponent, NzTreeNode } from 'ng-zorro-antd/tree'; +import { Router } from '@angular/router'; +import { NavChangeService } from 'src/app/service/navChange.service'; +import { fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import 'linqjs'; +import { DetailsUpdateCategoryComponent } from '../../license/update-category/details-update-category/details-update-category.component'; +import { NzModalService } from 'ng-zorro-antd/modal'; @Component({ selector: 'app-file-license-list', @@ -7,9 +19,166 @@ import { Component, OnInit } from '@angular/core'; }) export class FileLicenseListComponent implements OnInit { - constructor() { } + validateForm!: FormGroup; + constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router) { } + + tableScrollHeight ngOnInit(): void { + this.tableScrollHeight = '100px' + console.log('tableScrollHeight', this.tableScrollHeight) + // 页面监听 + fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { + let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px' + }); + this.validateForm = this.fb.group({ + name: [null] + }); + + this.tableSpin = true + } + ngAfterViewInit(): void { + + + fromEvent(this.element.nativeElement.querySelector(`.ant-table-body`) as HTMLCanvasElement, 'scroll').pipe(debounceTime(100)).subscribe(async (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) + await this.getStationLicenses() + } + } + }); + } + + 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.getStationLicenses() + } + 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.list = [] + this.SkipCount = '0' + this.getStationLicenses() + } + + tableSpin: boolean + totalCount: any //总数 + //获取点击组织机构的所有加油站 + SkipCount: string = '0' + MaxResultCount: string = '100' + + orId + list: any = [] + async getStationLicenses() { + let params = { + StationName: this.validateForm.value.name, + OrganizationUnitId: String(sessionStorage.getItem('planAdminOrid')), + IsContainsChildren: 'true', + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount, + // Sorting: ' BuildingBasicInfo.Id asc' + } + this.tableSpin = true + await new Promise((resolve, reject) => { + this.http.get('/api/services/app/StationFileLicense/GetStationLicenses', { + params: params + }).subscribe((data: any) => { + this.totalCount = data.result.totalCount + let arr = [] + data.result.data.forEach(element => { + let keyArr = Object.keys(element); + let valueArr = Object.values(element); + let newElement = (keyArr as any).zip(valueArr, (a, b) => { return { name: a, value: b } }); + + //修改排头 + let newArr = [] + for (let index = 0; index < newElement.length; index++) { + const item = newElement[index]; + if (item.name == '省公司') { + newArr[0] = item + newElement.splice(index--, 1) + } + if (item.name == '区域') { + newArr[1] = item + newElement.splice(index--, 1) + } + if (item.name == '油站名称') { + newArr[2] = item + newElement.splice(index--, 1) + } + } + let atLastArr = newArr.concat(newElement); + arr.push(atLastArr) + + }); + + + this.list = this.list.concat(arr); + this.list = [...this.list] + console.log('证照表格', this.list) + this.tableSpin = false + + setTimeout(() => { + let tableHeader = this.element.nativeElement.querySelector(`.ant-table-header`).clientHeight + this.tableScrollHeight = (document.getElementById('tablebox').clientHeight - tableHeader - 30) + 'px' + }, 0); + + + + resolve(data) + }) + }) } + //父组件调用子组件方法 + public onChildMethod() { + this.getStationLicenses() + } + + + lookDetails(i) { + // console.log(i) + // let params = { + // Id: i.licenseId + // } + // this.http.get('/api/services/app/StationValidityLicense/Get', { params: params }).subscribe((data: any) => { + // console.log('证照信息', data) + // const modal = this.modal.create({ + // nzContent: DetailsUpdateCategoryComponent, + // nzViewContainerRef: this.viewContainerRef, + // nzWidth: 450, + // 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: data.result + // }, + // nzFooter: null, + // nzClosable: false, + // nzOnOk: async () => { + + // } + // }); + // const instance = modal.getContentComponent(); + // modal.afterClose.subscribe(result => { }); + // }) + + + } } diff --git a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html index ad0cf83..da7d4ac 100644 --- a/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html +++ b/src/app/pages/plan-admin/oil-station-list/oil-station-list.component.html @@ -1,5 +1,6 @@
+