完善

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

@@ -18,14 +18,14 @@
             <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>
             <div class="cutoffrule"></div>
-            <p>办理类型: &nbsp;&nbsp;{{data.getData.handleType || ''}}</p>
+            <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(item.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>
         </div>
         <div *ngIf="data.auditType == 3">
-            <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 class="cutoffrule"></div>
         </div>
         <div class="cutoffrule"></div>

src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.ts

@@ -5,6 +5,7 @@ import { HttpClient } from '@angular/common/http';
 import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
 import Viewer from 'viewerjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { handleType, handleTypeList } from 'src/app/pages/license/update-category/edit-update-category/edit-update-category.component';
 
 
 @Component({
@@ -33,6 +34,23 @@ export class AuditDisposeComponent implements OnInit {
     this.modal.triggerOk()
   }
 
+  //获取办理类型
+  getHandleTypes(handleTypes: any[]):string {
+    if (!handleTypes || !handleTypes.length) {
+      return
+    }
+    let name
+    let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
+    let list: handleTypeList[] = new handleType().list;
+    handleTypeList.forEach(item=>{
+      list.find(element=>{
+        item == element.value? item = element.name : null
+      })
+    })
+    name = handleTypeList.join(',')
+    return name
+  }
+
   //获取文件格式
   getFileType(name: string):string {
     let suffix

src/app/pages/license/file-category/details-file-category/details-file-category.component.html

@@ -9,7 +9,7 @@
     <div class="content">
         <p>证件名称: &nbsp;&nbsp;{{data.licenseTypeName}}</p>
         <div class="cutoffrule"></div>
-        <p>有效期类型: &nbsp;&nbsp;<span *ngIf="data.validatyType == 0">有</span><span *ngIf="data.validatyType == 1">无</span><span *ngIf="data.validatyType == 2">不适用</span></p>
+        <p>有效期类型: &nbsp;&nbsp;<span *ngIf="data.validatyType == 0">不适用</span><span *ngIf="data.validatyType == 1">无</span><span *ngIf="data.validatyType == 2">有</span></p>
         <div class="cutoffrule"></div>
         <!-- <p>是否年检: &nbsp;&nbsp;是</p>
         <div class="cutoffrule"></div> -->

src/app/pages/license/file-category/details-file-category/details-file-category.component.ts

@@ -22,7 +22,7 @@ export class DetailsFileCategoryComponent implements OnInit {
   auditList: any[] = [];
   //获取审核记录
   getAuditLogging() {
-    if (this.data.auditLogId == 0) {
+    if (!this.data.auditLogId) {
       return
     }
     let params = { id: this.data.auditLogId }

src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html

@@ -15,9 +15,9 @@
         <nz-form-item>
             <nz-form-control>
                 <nz-select formControlName="type" [(ngModel)]="validatyType">
-                    <nz-option nzValue="0" 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-option nzValue="2" nzLabel="有"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/pages/license/file-category/file-category.component.html

@@ -20,9 +20,9 @@
                         <span style="margin-left: 25%;">{{item.licenseTypeName || ''}}</span>
                     </td>
                     <td>
-                        <span *ngIf="item.validatyType == 0">有</span>
+                        <span *ngIf="item.validatyType == 0">不适用</span>
                         <span *ngIf="item.validatyType == 1">无</span>
-                        <span *ngIf="item.validatyType == 2">不适用</span>
+                        <span *ngIf="item.validatyType == 2">有</span>
                     </td>
                     <td>
                         <img *ngIf="item.imageUrl" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">

src/app/pages/license/file-category/file-category.component.ts

@@ -122,6 +122,9 @@ export class FileCategoryComponent implements OnInit {
 
   //提交审核
   submitReview(item){
+    if (!item.id) {
+      return
+    }
     let params = { id: item.id }
     this.http.post('/api/services/app/StationFileLicense/Commit', {},{params}).subscribe(data => {
       this.message.create('success', '提交审核成功！');

src/app/pages/license/update-category/details-update-category/details-update-category.component.html

@@ -13,7 +13,7 @@
         <div class="cutoffrule"></div>
         <p>证件有效期: &nbsp;&nbsp;<span *ngIf="!data.isLongTerm">{{data.validityStartTime | date:"yyyy/MM/dd"}} - </span>{{data.validityEndTime | date:"yyyy/MM/dd"}}</p>
         <div class="cutoffrule"></div>
-        <p>办理类型: &nbsp;&nbsp;{{data.handleType || ''}}</p>
+        <p>办理类型: &nbsp;&nbsp;{{getHandleTypes(item.handleTypes)}}</p>
         <div class="cutoffrule"></div>
         <p>有效期类型: &nbsp;&nbsp;{{data.validityDays || 0}}天</p>
         <div class="cutoffrule"></div>

src/app/pages/license/update-category/details-update-category/details-update-category.component.ts

@@ -5,6 +5,7 @@ import { HttpClient } from '@angular/common/http';
 import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
 import Viewer from 'viewerjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
+import { handleType, handleTypeList } from '../edit-update-category/edit-update-category.component';
 
 @Component({
   selector: 'app-details-update-category',
@@ -23,7 +24,7 @@ export class DetailsUpdateCategoryComponent implements OnInit {
   auditList: any[] = [];
   //获取审核记录
   getAuditLogging() {
-    if (this.data.auditLogId == 0) {
+    if (!this.data.auditLogId) {
       return
     }
     let params = { id: this.data.auditLogId }
@@ -48,6 +49,23 @@ export class DetailsUpdateCategoryComponent implements OnInit {
     this.modal.destroy({ data: 'this the result data' });
   }
 
+  //获取办理类型
+  getHandleTypes(handleTypes: any[]):string {
+    if (!handleTypes || !handleTypes.length) {
+      return
+    }
+    let name
+    let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
+    let list: handleTypeList[] = new handleType().list;
+    handleTypeList.forEach(item=>{
+      list.find(element=>{
+        item == element.value? item = element.name : null
+      })
+    })
+    name = handleTypeList.join(',')
+    return name
+  }
+
   //获取文件格式
   getFileType(name: string):string {
     let suffix

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.html

@@ -38,16 +38,8 @@
 
         <nz-form-item>
             <nz-form-control>
-                <nz-select formControlName="type" nzMode="multiple" [(ngModel)]="typeList">
-                    <nz-option nzValue="年检" nzLabel="年检"></nz-option>
-                    <nz-option nzValue="年度公示" nzLabel="年度公示"></nz-option>
-                    <nz-option nzValue="年度复训" nzLabel="年度复训"></nz-option>
-                    <nz-option nzValue="年度检测" nzLabel="年度检测"></nz-option>
-                    <nz-option nzValue="年度执行报告" nzLabel="年度执行报告"></nz-option>
-                    <nz-option nzValue="到期换证" nzLabel="到期换证"></nz-option>
-                    <nz-option nzValue="到期检测" nzLabel="到期检测"></nz-option>
-                    <nz-option nzValue="到期评价" nzLabel="到期评价"></nz-option>
-                    <nz-option nzValue="到期备案" nzLabel="到期备案"></nz-option>
+                <nz-select formControlName="type" nzMode="multiple" [(ngModel)]="data2.handleTypes">
+                    <nz-option [nzValue]="item.value" [nzLabel]="item.name" *ngFor="let item of handleTypeList"></nz-option>
                 </nz-select>
             </nz-form-control>
         </nz-form-item>

src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts

@@ -18,11 +18,10 @@ export class EditUpdateCategoryComponent implements OnInit {
   validateForm!: FormGroup;
   constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService,private message: NzMessageService,) { }
 
-
+  handleTypeList: handleTypeList[] = new handleType().list;
   data2: any; //深拷贝data
   isLongTermTime: Date = null; // 限期 日期
   isNoLongTermTime: Date[] = []; //长期 日期
-  typeList: string[] = []; //办理类型 select多选 data
 
   ngOnInit(): void {
     this.validateForm = this.fb.group({
@@ -41,10 +40,6 @@ export class EditUpdateCategoryComponent implements OnInit {
       this.isNoLongTermTime.push(new Date(this.data2.validityStartTime))
       this.isNoLongTermTime.push(new Date(this.data2.validityEndTime))
     }
-    // 办理类型
-    if (this.data2.handleType) {
-      this.typeList = (this.data2.handleType).split('/')
-    }
 
     console.log(this.data2)
   }
@@ -197,3 +192,23 @@ export class EditUpdateCategoryComponent implements OnInit {
   }
 
 }
+
+//办理类型
+export class handleType {
+  list: handleTypeList[] =[
+    { value: 0, name: "无" },
+    { value: 1, name: "年度公示" },
+    { value: 2, name: "年检" },
+    { value: 3, name: "到期换证" },
+    { value: 4, name: "年度执行报告" },
+    { value: 5, name: "到期检测" },
+    { value: 6, name: "年度复训" },
+    { value: 7, name: "年度检测" },
+    { value: 8, name: "到期备案" },
+    { value: 9, name: "到期评价" },
+  ]
+}
+export class handleTypeList {
+  value: number
+  name: string
+}

src/app/pages/license/update-category/update-category.component.html

@@ -32,7 +32,7 @@
                         <img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
                     </td>
                     <td>{{item.validityDays || 0}}天</td>
-                    <td>{{item.handleType}}</td>
+                    <td>{{getHandleTypes(item.handleTypes)}}</td>
                     <td><span *ngIf="item.isYearlyCheck">是</span><span *ngIf="!item.isYearlyCheck">否</span></td>
                     <td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
                     <td>

src/app/pages/license/update-category/update-category.component.ts

@@ -3,7 +3,7 @@ import { NzModalService } from 'ng-zorro-antd/modal';
 import { Observable, fromEvent } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import Viewer from 'viewerjs';
-import { EditUpdateCategoryComponent } from './edit-update-category/edit-update-category.component';
+import { EditUpdateCategoryComponent, handleType, handleTypeList } from './edit-update-category/edit-update-category.component';
 import * as moment from 'moment';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { HttpClient } from '@angular/common/http';
@@ -40,6 +40,23 @@ export class UpdateCategoryComponent implements OnInit {
     })
   }
 
+  //获取办理类型
+  getHandleTypes(handleTypes: any[]):string {
+    if (!handleTypes || !handleTypes.length) {
+      return
+    }
+    let name
+    let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
+    let list: handleTypeList[] = new handleType().list;
+    handleTypeList.forEach(item=>{
+      list.find(element=>{
+        item == element.value? item = element.name : null
+      })
+    })
+    name = handleTypeList.join(',')
+    return name
+  }
+
   //获取文件格式
   getFileType(name: string):string {
     let suffix
@@ -121,10 +138,6 @@ export class UpdateCategoryComponent implements OnInit {
               body.validityStartTime = instance.isNoLongTermTime[0] || new Date()
               body.validityEndTime = instance.isNoLongTermTime[1] || new Date()
             }
-            // 办理类型
-            if (instance.typeList.length) {
-              body.handleType = instance.typeList.join("/")
-            }
             this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe(data => {
               resolve(data);
               this.getStationList();
@@ -169,6 +182,9 @@ export class UpdateCategoryComponent implements OnInit {
 
   //提交审核
   submitReview(item){
+    if (!item.id) {
+      return
+    }
     let params = { id: item.id }
     this.http.post('/api/services/app/StationValidityLicense/Commit', {},{params}).subscribe(data => {
       this.message.create('success', '提交审核成功！');