[新增]新增年审时间页面

src/app/pages/audit/annual-inspection/annual-inspection.component.html

@@ -0,0 +1,28 @@
+<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>审批类型</th>
+                    <th>是否年检</th>
+                    <th>年检时间</th>
+                    <th>操作</th>
+                </tr>
+            </thead>
+            <tbody id="table">
+                <tr *ngFor="let item of headerTable.data;let key = index">
+                    <td>{{item.licenseName}}</td>
+                    <td>
+                        {{item.isYearlyCheck ? '是' : '否'}}
+                    </td>
+                    <td>{{item.yearlyCheckDate | date:"MM/dd"}}</td>
+                    <td class="operation">
+                        <span [ngClass]="{'greyColor': !item.isYearlyCheck}" class="blueColor" (click)="edit(item)">编辑</span>
+                    </td>
+                </tr>
+            </tbody>
+        </nz-table>
+
+    </div>
+</div>

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;
+    }
+  }
+}

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 => { });
+  }
+}

src/app/pages/audit/annual-inspection/edit-annual-inspection/edit-annual-inspection.component.html

@@ -0,0 +1,33 @@
+<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-date-picker [nzFormat]="dateFormat" style="width: 100%;" formControlName="time"></nz-date-picker>
+                    </nz-form-control>
+                </nz-form-item>
+                <!-- 
+                <p class="p2">默认时间： 90天</p> -->
+            </div>
+        </div>
+
+
+        <div class="btnbox">
+            <button nz-button type="submit" class="ok" (click)="ok()" [nzLoading]="isLoading">保存</button>
+            <button nz-button type="button" class="cancel" (click)="destroyModal()">取消</button>
+        </div>
+    </form>
+</div>

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;
+      }
+    }
+  }
+
+}

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';
+}

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

@@ -5,7 +5,7 @@
             <thead>
                 <tr>
                     <th [nzWidth]="'16%'">
-                        <span style="margin-left: 25%;">审批类型</span>
+                        <span style="margin-left: 30px;">审批类型</span>
                     </th>
                     <th>审批信息</th>
                     <th>加油站名称</th>
@@ -19,7 +19,7 @@
             <tbody id="table">
                 <tr *ngFor="let item of headerTable.data;let key = index">
                     <td>
-                        <span style="margin-left: 25%;">{{item.auditTitle || ''}}</span>
+                        <span style="margin-left: 30px;">{{item.auditTitle || ''}}</span>
                     </td>
                     <td>
                         <span *ngIf="item.auditType == 0">油站信息</span>

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

@@ -8,6 +8,8 @@
                         (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>
                 </div>
             </div>
         </div>
@@ -16,5 +18,6 @@
         <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>
     </div>
 </div>

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

@@ -89,7 +89,7 @@
             <thead>
                 <tr>
                     <th [nzWidth]="'16%'">
-                        <span style="margin-left: 25%;">审批类型</span>
+                        <span style="margin-left: 30px;">审批类型</span>
                     </th>
                     <th>审批信息</th>
                     <th>加油站名称</th>
@@ -103,7 +103,7 @@
             <tbody id="table">
                 <tr *ngFor="let item of headerTable.data;let key = index">
                     <td>
-                        <span style="margin-left: 25%;">{{item.auditTitle || ''}}</span>
+                        <span style="margin-left: 30px;">{{item.auditTitle || ''}}</span>
                     </td>
                     <td>
                         <span *ngIf="item.auditType == 0">油站信息</span>

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() {

src/app/pages/home/home.component.ts

@@ -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)

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]
 
 })

src/theme.less

@@ -8,7 +8,6 @@
 .greyColor {
   color: #5D687A;
   cursor: not-allowed;
-  // pointer-events: none;
 }
 
 .yellowColor {