diff --git a/src/app/pages/audit/annual-inspection/annual-inspection.component.html b/src/app/pages/audit/annual-inspection/annual-inspection.component.html new file mode 100644 index 0000000..b43c909 --- /dev/null +++ b/src/app/pages/audit/annual-inspection/annual-inspection.component.html @@ -0,0 +1,28 @@ +
+
+ + + + 审批类型 + 是否年检 + 年检时间 + 操作 + + + + + {{item.licenseName}} + + {{item.isYearlyCheck ? '是' : '否'}} + + {{item.yearlyCheckDate | date:"MM/dd"}} + + 编辑 + + + + + +
+
\ No newline at end of file diff --git a/src/app/pages/audit/annual-inspection/annual-inspection.component.scss b/src/app/pages/audit/annual-inspection/annual-inspection.component.scss new file mode 100644 index 0000000..aaca580 --- /dev/null +++ b/src/app/pages/audit/annual-inspection/annual-inspection.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/annual-inspection/annual-inspection.component.ts b/src/app/pages/audit/annual-inspection/annual-inspection.component.ts new file mode 100644 index 0000000..9cd5035 --- /dev/null +++ b/src/app/pages/audit/annual-inspection/annual-inspection.component.ts @@ -0,0 +1,84 @@ +import { HttpClient } from '@angular/common/http'; +import { Component, ElementRef, OnInit, ViewContainerRef } from '@angular/core'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { Observable, fromEvent } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; +import { EditAnnualInspectionComponent } from './edit-annual-inspection/edit-annual-inspection.component'; +@Component({ + selector: 'app-annual-inspection', + templateUrl: './annual-inspection.component.html', + styleUrls: ['./annual-inspection.component.scss'] +}) +export class AnnualInspectionComponent implements OnInit { + + constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private http: HttpClient, private message: NzMessageService, private element: ElementRef) { } + tableSpin = false + + tableScrollHeight + ngOnInit(): void { + 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.getAnnualInspectionList() + } + + + + list = [] + totalCount;//列表总数 + SkipCount: string = '0'; + MaxResultCount: string = '100'; + //获取当前油站档案类证照 + getAnnualInspectionList() { + this.tableSpin = true + let data = JSON.parse(sessionStorage.getItem('userdata')); + let params = { + OrganizationUnitId: data.organization.id || "", + IsContainsChildren: "true", + SkipCount: this.SkipCount, + MaxResultCount: this.MaxResultCount, + } + this.http.get(`/api/services/app/OrganizationValidityLicenseRule/GetCurOrgYearlyCheckRules`, { params }).subscribe((data: any) => { + + this.list = data.result + this.list = [...this.list] + this.tableSpin = false + console.log(data) + }) + } + + + edit(item) { + console.log('item', item) + if (!item.isYearlyCheck) { + this.message.create('warning', '不需要年检'); + return + } + + const modal = this.modal.create({ + nzContent: EditAnnualInspectionComponent, + 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: item + }, + nzFooter: null, + nzClosable: false, + nzOnOk: async () => { + this.getAnnualInspectionList() + } + }); + const instance = modal.getContentComponent(); + modal.afterClose.subscribe(result => { }); + } +} diff --git a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html new file mode 100644 index 0000000..e0eb4d0 --- /dev/null +++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html @@ -0,0 +1,33 @@ +
+
+
+ 编辑 +
+ +
+
+ +
+
+

请选择年检日期

+ + + + + + + + +
+
+ + +
+ + +
+
+
\ No newline at end of file diff --git a/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss new file mode 100644 index 0000000..4be1a5b --- /dev/null +++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.scss @@ -0,0 +1,105 @@ +.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; + box-sizing: border-box; + padding: 0 7px; + + 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/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts new file mode 100644 index 0000000..3667e5c --- /dev/null +++ b/src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.ts @@ -0,0 +1,63 @@ +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'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import * as moment from 'moment'; + +@Component({ + selector: 'app-edit-annual-inspection', + templateUrl: './edit-annual-inspection.component.html', + styleUrls: ['./edit-annual-inspection.component.scss'] +}) +export class EditAnnualInspectionComponent implements OnInit { + + + @Input() data?: any; + + validateForm!: FormGroup; + constructor(private message: NzMessageService, private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { } + + + dataCopy + ngOnInit(): void { + this.dataCopy = JSON.parse(JSON.stringify(this.data)) + this.validateForm = this.fb.group({ + time: [null, [Validators.required]], + }); + + } + + + destroyModal() { + this.modal.destroy({ data: 'this the result data' }); + + } + + + isLoading = false + ok() { + if (this.validateForm.valid) { + this.isLoading = true + let params = { + id: this.dataCopy.licenseTypeId, + date: moment(this.validateForm.value.time).format('YYYY-MM-MM')//开业时间格式化 + } + this.http.put('/api/services/app/OrganizationValidityLicenseRule/UpdateYearlyCheckDate', null, { params: params }).subscribe((data) => { + this.message.create('success', '修改成功'); + this.isLoading = false + this.modal.triggerOk() + }, err => { + this.message.create('error', '修改失败'); + this.isLoading = false + }) + } else { + this.message.create('warning', '请填写完整！'); + } + + + } + + dateFormat = 'MM/dd'; +} diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.html b/src/app/pages/audit/audit-ing/audit-ing.component.html index 6f32b7c..558691e 100644 --- a/src/app/pages/audit/audit-ing/audit-ing.component.html +++ b/src/app/pages/audit/audit-ing/audit-ing.component.html @@ -5,7 +5,7 @@ - 审批类型 + 审批类型 审批信息 加油站名称 @@ -19,7 +19,7 @@ - {{item.auditTitle || ''}} + {{item.auditTitle || ''}} 油站信息 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 e9c2dbc..49f53ab 100644 --- a/src/app/pages/audit/audit-nav/audit-nav.component.html +++ b/src/app/pages/audit/audit-nav/audit-nav.component.html @@ -8,6 +8,8 @@ (click)="selectNav(item)">{{item}} 通知时间 + 年检设置 @@ -16,5 +18,6 @@ + \ No newline at end of file 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 86d42a5..a2c5cad 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.html +++ b/src/app/pages/audit/audit-record/audit-record.component.html @@ -89,7 +89,7 @@ - 审批类型 + 审批类型 审批信息 加油站名称 @@ -103,7 +103,7 @@ - {{item.auditTitle || ''}} + {{item.auditTitle || ''}} 油站信息 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 3627804..584be47 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.ts +++ b/src/app/pages/audit/audit-record/audit-record.component.ts @@ -154,7 +154,7 @@ export class AuditRecordComponent implements OnInit { //历史记录列表 totalCount//列表总数 - tableSpin = false + tableSpin = true SkipCount: string = '0' MaxResultCount: string = '100' getRecordList() { diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 432761a..ee6b0e1 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -61,7 +61,7 @@ export class HomeComponent implements OnInit { if (sessionStorage.getItem('isGasStation') == 'true') { this.isGasStation = true this.isGasStationNav = true - } + } this.router.events.pipe( filter(event => event instanceof NavigationEnd) @@ -147,6 +147,8 @@ export class HomeComponent implements OnInit { SignalRAspNetCoreHelper.initSignalR(); abp.event.on('abp.notifications.received', this.reloadPage); } + + //右下角消息弹窗 messageId = [] receiptOfNotification(userNotification) { let obj = { @@ -302,7 +304,6 @@ export class HomeComponent implements OnInit { }) } close(item) { - // console.log(item) this.messageId.forEach((element) => { if (element.id == item.notification.entityId) { this.notificationService.remove(element.messageId) diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts index 86730fd..0a0279e 100644 --- a/src/app/pages/pages.module.ts +++ b/src/app/pages/pages.module.ts @@ -83,11 +83,13 @@ import { EditInformTimeComponent } from './audit/audit-inform-time/edit-inform-t import { AuditDetailsInformTimeComponent } from './audit/audit-inform-time/audit-details-inform-time/audit-details-inform-time.component'; import { auditStatusPipe, handleState, licenseViolationType, notificationContent } from '../pipes/type.pipe'; import { GasBaseInfoComponent } from './audit/gas-base-info/gas-base-info.component'; +import { AnnualInspectionComponent } from './audit/annual-inspection/annual-inspection.component'; +import { EditAnnualInspectionComponent } from './audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component'; @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, EditInformTimeComponent, AuditDetailsInformTimeComponent,auditStatusPipe, GasBaseInfoComponent,notificationContent,licenseViolationType,handleState], + 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, GasBaseInfoComponent, notificationContent, licenseViolationType, handleState, AnnualInspectionComponent, EditAnnualInspectionComponent], imports: [ @@ -131,7 +133,7 @@ import { GasBaseInfoComponent } from './audit/gas-base-info/gas-base-info.compon NzToolTipModule, NzTimelineModule ], - entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, GasBaseInfoComponent], + entryComponents: [AddequipmentComponent, EditequipmentComponent, GetOutOfLineDetailsComponent, DispositionComponent, OilUnloadingProcessComponent, ChangePasswordComponent, DisposeequipmentComponent, EditUpdateCategoryComponent, DetailsUpdateCategoryComponent, EditFileCategoryComponent, DetailsFileCategoryComponent, PdfWordLookComponent, AuditDisposeComponent, EditInformTimeComponent, AuditDetailsInformTimeComponent, GasBaseInfoComponent, EditAnnualInspectionComponent], schemas: [CUSTOM_ELEMENTS_SCHEMA] }) diff --git a/src/theme.less b/src/theme.less index 3c9c6d8..286d270 100644 --- a/src/theme.less +++ b/src/theme.less @@ -8,7 +8,6 @@ .greyColor { color: #5D687A; cursor: not-allowed; - // pointer-events: none; } .yellowColor {