经营类证照完善

src/app/pages/audit/audit-inform-time/audit-inform-time.component.html

@@ -9,8 +9,8 @@
                     </th>
                     <th colspan="2">办理提醒时间</th>
                     <th colspan="2">临期提醒时间</th>
-                    <th rowspan="2">提交审核时间</th>
+                    <!-- <th rowspan="2">提交审核时间</th>
-                    <th rowspan="2">审核状态</th>
+                    <th rowspan="2">审核状态</th> -->
                     <th rowspan="2">操作</th>
                 </tr>
                 <tr>
@@ -29,14 +29,12 @@
                     <td>{{item.handleRemindDays}}天</td>
                     <td>{{item.closingRemindDaysDefault}}天</td>
                     <td>{{item.closingRemindDays}}天</td>
-                    <td>{{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime  | date:"yyyy-MM-dd HH:mm:ss") : '/'}}</td>
+                    <!-- <td>{{(item.auditLog && item.auditLog.committedTime) ? (item.auditLog.committedTime  | date:"yyyy-MM-dd HH:mm:ss") : '/'}}</td>
-                    <td>{{item.auditStatus | auditStatus}}</td>
+                    <td>{{item.auditStatus | auditStatus}}</td> -->
                     <td class="operation">
-                        <span class="blueColor" (click)="edit(item)"
+                        <span class="blueColor" (click)="edit(item)" [ngClass]="{'greyColor': item.auditStatus == 1}">编辑</span>
-                            [ngClass]="{'greyColor': item.auditStatus == 1}">编辑</span>
+                        <span class="blueColor" (click)="unCommit(item)" *ngIf="item.auditStatus == 1">撤销审核</span>
-                        <span class="blueColor" (click)="unCommit(item)"
+                        <span class="blueColor" (click)="details(item)">详情</span>
-                            *ngIf="item.auditStatus == 1">撤销审核</span>
-                        <span class="blueColor" (click)="details(item)">审核详情</span>
                     </td>
                 </tr>
             </tbody>

src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.html

@@ -26,9 +26,23 @@
         </nz-form-item>
         <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="是否年检">是否年检</nz-form-label>
-            <nz-form-control nzErrorTip="请输入临期提醒时间">
+            <nz-form-control nzErrorTip="请选择是否年检">
                 <label nz-checkbox formControlName="isYearlyCheck"></label>
             </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="是否需要上传附件">是否需要上传附件</nz-form-label>
+            <nz-form-control nzErrorTip="请选择是否需要上传附件">
+                <label nz-checkbox formControlName="hasAttachment"></label>
+            </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="办理类型">办理类型</nz-form-label>
+            <nz-form-control nzErrorTip="请选择办理类型">
+                <nz-select formControlName="type" nzMode="multiple" formControlName="handleTypes">
+                    <nz-option [nzValue]="item.value" [nzLabel]="item.name" *ngFor="let item of handleTypeList"></nz-option>
+                </nz-select>
+            </nz-form-control>
+        </nz-form-item>
     </form>
 </div>

src/app/system-management/update-of-license/add-update-of-license/add-update-of-license.component.ts

@@ -2,6 +2,7 @@ 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 { handleType,handleTypeList } from 'src/app/pages/license/inform/inform.component';
 
 
 @Component({
@@ -19,10 +20,15 @@ export class AddUpdateOfLicenseComponent implements OnInit {
       name: [null, [Validators.required]],
       handleRemindDays: [90, [Validators.required]],
       closingRemindDays: [30, [Validators.required]],
-      isYearlyCheck: [true, [Validators.required]]
+      isYearlyCheck: [true, [Validators.required]],
+      hasAttachment: [false, [Validators.required]],
+      handleTypes: [[], [Validators.required]]
     });
   }
   destroyModal(): void {
     this.modal.destroy({ data: 'this the result data' });
   }
+
+  handleTypeList: handleTypeList[] = new handleType().list; //办理类型list
+
 }

src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.html

@@ -26,9 +26,23 @@
         </nz-form-item>
         <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="是否年检">是否年检</nz-form-label>
-            <nz-form-control nzErrorTip="请输入临期提醒时间">
+            <nz-form-control nzErrorTip="请选择是否年检">
                 <label nz-checkbox formControlName="isYearlyCheck"></label>
             </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="是否需要上传附件">是否需要上传附件</nz-form-label>
+            <nz-form-control nzErrorTip="请选择是否需要上传附件">
+                <label nz-checkbox formControlName="hasAttachment"></label>
+            </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="办理类型">办理类型</nz-form-label>
+            <nz-form-control nzErrorTip="请选择办理类型">
+                <nz-select formControlName="type" nzMode="multiple" formControlName="handleTypes">
+                    <nz-option [nzValue]="item.value" [nzLabel]="item.name" *ngFor="let item of handleTypeList"></nz-option>
+                </nz-select>
+            </nz-form-control>
+        </nz-form-item>
     </form>
 </div>

src/app/system-management/update-of-license/edit-update-of-license/edit-update-of-license.component.ts

@@ -2,6 +2,7 @@ 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 { handleType,handleTypeList } from 'src/app/pages/license/inform/inform.component';
 
 @Component({
   selector: 'app-edit-update-of-license',
@@ -19,11 +20,15 @@ export class EditUpdateOfLicenseComponent implements OnInit {
       name: [this.data.licenseName, [Validators.required]],
       handleRemindDays: [this.data.handleRemindDays, [Validators.required]],
       closingRemindDays: [this.data.closingRemindDays, [Validators.required]],
-      isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]]
+      isYearlyCheck: [this.data.isYearlyCheck, [Validators.required]],
+      hasAttachment: [this.data.hasAttachment, [Validators.required]],
+      handleTypes: [this.data.handleTypes, [Validators.required]]
     });
   }
   destroyModal(): void {
     this.modal.destroy({ data: 'this the result data' });
   }
 
+  handleTypeList: handleTypeList[] = new handleType().list; //办理类型list
+
 }

src/app/system-management/update-of-license/update-of-license.component.ts

@@ -48,12 +48,13 @@ export class UpdateOfLicenseComponent implements OnInit {
       nzOnOk: async () => {
         if (instance.validateForm.valid) {
           await new Promise(resolve => {
-            console.log('表单信息', instance.validateForm)
             let body = {
               licenseName: instance.validateForm.value.name,
               handleRemindDays: instance.validateForm.value.handleRemindDays,
               closingRemindDays: instance.validateForm.value.closingRemindDays,
-              isYearlyCheck: instance.validateForm.value.isYearlyCheck
+              isYearlyCheck: instance.validateForm.value.isYearlyCheck,
+              hasAttachment: instance.validateForm.value.hasAttachment,
+              handleTypes: instance.validateForm.value.handleTypes,
             }
             this.http.post('/api/services/app/ValidityLicenseType/Create', body).subscribe(data => {
               resolve(data)
@@ -93,7 +94,9 @@ export class UpdateOfLicenseComponent implements OnInit {
               licenseName: instance.validateForm.value.name,
               handleRemindDays: instance.validateForm.value.handleRemindDays,
               closingRemindDays: instance.validateForm.value.closingRemindDays,
-              isYearlyCheck: instance.validateForm.value.isYearlyCheck
+              isYearlyCheck: instance.validateForm.value.isYearlyCheck,
+              hasAttachment: instance.validateForm.value.hasAttachment,
+              handleTypes: instance.validateForm.value.handleTypes,
             }
             this.http.put('/api/services/app/ValidityLicenseType/Update', body).subscribe(data => {
               resolve(data)