From 5206b4a0c273db09576f6e0f93fc43b02c2d022b Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Sat, 7 May 2022 17:23:01 +0800
Subject: [PATCH] fix bug

---
 .../voucher-summary.component.html             | 13 ++++++++++++-
 .../bulk-publish/bulk-publish.component.html   |  4 ++--
 .../bulk-publish/bulk-publish.component.ts     | 18 ++++++++++++++++--
 .../bulk-release-publish.component.html        |  2 +-
 .../bulk-release-publish.component.ts          | 15 ++++++++++++---
 .../onecar-publish/onecar-publish.component.ts | 16 +++++++++++++---
 .../release-publish.component.ts               | 10 +++++-----
 7 files changed, 61 insertions(+), 17 deletions(-)

diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
index 7380f466..4e14b673 100644
--- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
+++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html
@@ -1,3 +1,13 @@
+<!--
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2022-04-28 20:27:07
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-05-07 16:22:32
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+-->
 <!-- <page-header-wrapper [title]="'凭证汇总'">
 </page-header-wrapper>
 
@@ -29,7 +39,8 @@
         <div class="mr-sm">
             <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
                 [acl-ability]="['FINANCIAL-VOUCHER-list']">筛选</button>
-            <button nz-button nzDanger (click)='exportList()'> 导出</button>
+            <button nz-button nzDanger acl
+            [acl-ability]="['FINANCIAL-VOUCHER-SUMMARY-export']" (click)='exportList()'> 导出</button>
         </div>
     </div>
     <st #st [data]="service.$api_get_fico_vch_page" [columns]="columns" [req]="{  process: beforeReq }" [page]="{}"
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
index 7bd237d5..17924f87 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html
@@ -39,7 +39,7 @@
                       name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" />
                   </nz-form-control>
                   <nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'">
-                    <input nz-input [(ngModel)]="data1.contractTelephone" maxlength="11"
+                    <input nz-input [(ngModel)]="data1.contractTelephone" maxlength="11" (ngModelChange)="onChangePhone(data1.contractTelephone)"
                       formControlName="loadPhone{{ idx }}" name="loadPhone{{ idx }}" placeholder="请输入联系人电话" />
                   </nz-form-control>
                 </div>
@@ -74,7 +74,7 @@
                       name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" />
                   </nz-form-control>
                   <nz-form-control [nzSpan]="12" [nzErrorTip]="'请输入联系人电话'">
-                    <input nz-input [(ngModel)]="data2.contractTelephone"
+                    <input nz-input [(ngModel)]="data2.contractTelephone" (ngModelChange)="onChangePhone(data2.contractTelephone)"
                       formControlName="unloadPhone{{ idx }}" name="unloadAddress{{ idx }}" maxlength="11"
                       placeholder="请输入联系人电话" />
                   </nz-form-control>
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
index 1229c193..a7ff5c1a 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@@ -56,6 +56,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     maxTrainNumber: 99999,
     maxFreight: 9999999
   };
+  patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
   constructor(
     private http: _HttpClient,
     fb: FormBuilder,
@@ -69,10 +70,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
     this.validateForm1 = fb.group({
       loadAddress0: [null, [Validators.required]],
       loadName0: [null, [Validators.required]],
-      loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
+      loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
       unloadAddress0: [null, [Validators.required]],
       unloadName0: [null, [Validators.required]],
-      unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]]
+      unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]]
     });
   }
   @ViewChild('sf1', { static: false }) sf1!: SFComponent;
@@ -1170,4 +1171,17 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
       }
     });
   }
+  onChangePhone(value: string): void {
+    console.log(value);
+    
+    this.updateValue(value);
+  }
+  updateValue(value: string): void {
+    const reg = /^-?(0|[1-9][0-9]*)(\.[0-9]*)?$/;
+    // if ((!isNaN(+value) && reg.test(value)) || value === '' || value === '-') {
+    //   this.value = value;
+    // }
+    // this.inputElement!.nativeElement.value = this.value;
+    // this.updateTitle();
+  }
 }
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
index a9b8a94f..cc8a2fc7 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html
@@ -17,7 +17,7 @@
     <div class="card-title">装卸货信息<span class="tip-font">预计公里数：<em>{{ totalDistance }}km</em>，预计行程耗时：<em>{{ totalTime }}小时</em></span>
     </div>
 
-    <form #ngForm="ngForm" nz-form role="form">
+    <form #ngForm="ngForm" [formGroup]="validateForm1" nz-form role="form">
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="10">
           <div *ngFor="let data1 of startInfo; let idx = index">
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
index 655daf5a..813e45bd 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import { NgForm } from '@angular/forms';
+import { FormBuilder, FormGroup, Validators, FormControl, NgForm } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 import {
   SFComponent,
@@ -28,7 +28,7 @@ import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.
   styleUrls: ['./bulk-release-publish.component.less']
 })
 export class SupplyManagementBulkReleasePublishComponent implements OnInit {
-  @ViewChild('ngForm')
+  validateForm1: FormGroup;
   ngForm!: NgForm;
   sf1data: any; // 货源单设置回显
   sf3data: any; // 货源单设置回显
@@ -50,6 +50,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
     maxFreight: 9999999
   }
   shipperName = '';
+  patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
   // // 单位
   startInfo: any[] = [];
   endInfo: any[] = [];
@@ -58,6 +59,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
   freightTypeOptions: any;
   constructor(
     private http: _HttpClient,
+    fb: FormBuilder,
     private modalService: NzModalService,
     private settingSrv: SettingsService,
     private service: SupplyManagementService,
@@ -66,7 +68,14 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
     private amapService: AmapService,
     public shipperSrv: ShipperBaseService
   ) {
-    
+    this.validateForm1 = fb.group({
+      loadAddress0: [null, [Validators.required]],
+      loadName0: [null, [Validators.required]],
+      loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
+      unloadAddress0: [null, [Validators.required]],
+      unloadName0: [null, [Validators.required]],
+      unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]]
+    });
   }
   @ViewChild('sf1', { static: false }) sf1!: SFComponent;
   schema1: SFSchema = {};
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
index 9efffd38..06631777 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
@@ -43,6 +43,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     intervalDays: 999,
     maxTimes: 5
   };
+  patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
   sf1data: any; // 货源单设置回显
   sf3data: any; // 货源单设置回显
   sf4data: any; // 货源单设置回显
@@ -78,7 +79,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   ) {
     this.validateForm1 = fb.group({
       loadingTime: [null, [Validators.required]],
-      unloadingTime: [null, [Validators.required]]
+      unloadingTime: [null, [Validators.required]],
     });
     this.envCache = this.eaCacheSrv.get(cacheConf.env);
   }
@@ -806,7 +807,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       });
       this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
-      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
+      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required,  Validators.pattern(this.patternStr)]));
     }
   }
 
@@ -862,7 +863,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(
         `unloadPhone${controlId}`,
-        new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])
+        new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])
       );
     }
   }
@@ -1370,6 +1371,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
     this.sf7.setValue('/toPay', this.sf7data.toPay);
     this.sf7.setValue('/receiptPay', this.sf7data.receiptPay);
     this.payChange();
+    // console.log('88888');
+    
+    // this.validateForm1.reset();
+    // for (const key in this.validateForm1.controls) {
+    //   if (this.validateForm1.controls.hasOwnProperty(key)) {
+    //     this.validateForm1.controls[key].markAsPristine();
+    //     this.validateForm1.controls[key].updateValueAndValidity();
+    //   }
+    // }
   }
 
   // 选择地址
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
index a457bfcd..d9ae116f 100644
--- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
+++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts
@@ -52,6 +52,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
   totalTime = 0.0; //路程总时间
   currentRate = 0; //实时计算的费率
   shipperName = '';
+  patternStr = `^((13[0-9])|(14[0-1,4-9])|(15([0-3,5-9]))|(17[0-8])|(18[0-9])|(19[0-3,5-9])|(16[2,5,6,7]))\\d{8}$`;
   constructor(
     private http: _HttpClient,
     fb: FormBuilder,
@@ -67,10 +68,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
     this.validateForm1 = fb.group({
       loadAddress0: [null, [Validators.required]],
       loadName0: [null, [Validators.required]],
-      loadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
+      loadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
       unloadAddress0: [null, [Validators.required]],
       unloadName0: [null, [Validators.required]],
-      unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]],
+      unloadPhone0: [null, [Validators.required, Validators.pattern(this.patternStr)]],
       loadingTime: [null, [Validators.required]],
       unloadingTime: [null, [Validators.required]]
     });
@@ -609,7 +610,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
         receiptUserPhone: {
           type: 'string',
           title: '联系电话',
-          format: 'mobile',
           maxLength: 11,
           ui: {
             errors: {
@@ -836,7 +836,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       });
       this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
-      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')]));
+      this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)]));
     }
   }
   // 添加 删除发货卸货地址
@@ -865,7 +865,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
       this.validateForm1.addControl(`unloadName${controlId}`, new FormControl(null, Validators.required));
       this.validateForm1.addControl(
         `unloadPhone${controlId}`,
-        new FormControl(null, [Validators.required, Validators.pattern('^[0-9]*$')])
+        new FormControl(null, [Validators.required, Validators.pattern(this.patternStr)])
       );
     }
   }