From 0dde51a145f28436f5eacb23df61a4e1178a1ff8 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Tue, 11 Jan 2022 16:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-publish/bulk-publish.component.html  | 72 ++++++++++++-------
 .../bulk-publish/bulk-publish.component.ts    |  2 -
 .../freight/list/new/new.component.ts         |  2 +-
 3 files changed, 46 insertions(+), 30 deletions(-)

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 b10983c7..99b00b53 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
@@ -14,10 +14,11 @@
   <div class="card-title"
     >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
   >
+
   <form nz-form [formGroup]="validateForm1" role="form">
     <div nz-row [nzGutter]="24">
-      <div nz-col [nzSpan]="8">
-        <div *ngFor="let data of startInfo; let idx = index">
+      <div nz-col [nzSpan]="10">
+        <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
             <nz-form-label [nzSpan]="4" nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
@@ -25,42 +26,51 @@
                 <nz-input-group [nzSuffix]="endInconTemp1">
                   <input
                     nz-input
-                    [(ngModel)]="data.detailedAddress"
+                    [(ngModel)]="data1.detailedAddress"
                     (click)="openMap('start', idx)"
                     formControlName="loadAddress{{ idx }}"
                     placeholder="请输入装货地"
                   />
                 </nz-input-group>
                 <span style="padding: 0 10px"
-                ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></i
-              ></span>
+                  ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'start')"></i
+                ></span>
               </div>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
             <nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
-            <nz-form-control [nzErrorTip]="'请输入联系人信息'">
-              <div class="align-center">
-                <input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
+            <div class="align-center">
+              <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
+                <input
+                  nz-input
+                  [(ngModel)]="data1.appUserName"
+                  formControlName="loadName{{ idx }}"
+                  maxlength="30"
+                  placeholder="请输入联系人姓名"
+                />
+              </nz-form-control>
+              <nz-form-control [nzErrorTip]="'请输入联系人电话'">
                 <input
                   style="margin-left: 12px"
                   nz-input
-                  [(ngModel)]="data.contractTelephone"
-                  [ngModelOptions]="{ standalone: true }"
+                  [(ngModel)]="data1.contractTelephone"
                   maxlength="11"
+                  formControlName="loadPhone{{ idx }}"
+                  placeholder="请输入联系人电话"
                 />
-              </div>
-            </nz-form-control>
+              </nz-form-control>
+            </div>
           </nz-form-item>
         </div>
       </div>
-      <div nz-col [nzSpan]="8">
+      <div nz-col [nzSpan]="4">
         <div style="display: flex; justify-content: center">
           <span style="padding: 24 px; font-size: 30px; color: #7d7d7d"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
         </div>
       </div>
-      <div nz-col [nzSpan]="8">
-        <div *ngFor="let data of endInfo; let idx = index">
+      <div nz-col [nzSpan]="10">
+        <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
             <nz-form-label [nzSpan]="4" nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
@@ -68,38 +78,46 @@
                 <nz-input-group [nzSuffix]="endInconTemp1">
                   <input
                     nz-input
-                    [(ngModel)]="data.detailedAddress"
+                    [(ngModel)]="data2.detailedAddress"
                     (click)="openMap('end', idx)"
                     formControlName="unloadAddress{{ idx }}"
                     placeholder="请输入卸货地"
                   />
                 </nz-input-group>
                 <span style="padding: 0 10px"
-                ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'end')"></i
-              ></span>
+                  ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="chooseAddress(idx, 'end')"></i
+                ></span>
               </div>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
             <nz-form-label [nzSpan]="4" nzRequired>联系人</nz-form-label>
-            <nz-form-control [nzErrorTip]="'请输入联系人信息'">
-              <div class="align-center">
-                <input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
+            <div class="align-center">
+              <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
+                <input
+                  nz-input
+                  [(ngModel)]="data2.appUserName"
+                  maxlength="30"
+                  formControlName="unloadName{{ idx }}"
+                  placeholder="请输入联系人姓名"
+                />
+              </nz-form-control>
+              <nz-form-control [nzErrorTip]="'请输入联系人电话'">
                 <input
                   style="margin-left: 12px"
                   nz-input
-                  [(ngModel)]="data.contractTelephone"
-                  [ngModelOptions]="{ standalone: true }"
+                  [(ngModel)]="data2.contractTelephone"
+                  formControlName="unloadPhone{{ idx }}"
                   maxlength="11"
+                  placeholder="请输入联系人电话"
                 />
-              </div>
-            </nz-form-control>
+              </nz-form-control>
+            </div>
           </nz-form-item>
         </div>
       </div>
     </div>
-
-    <ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
+    <ng-template #endInconTemp1><i nz-icon nzType="environment" nzTheme="outline"></i></ng-template>
   </form>
 </nz-card>
 
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 d3dfcb0b..01e7091e 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
@@ -648,7 +648,6 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
     this.sf3.validator({ emitError: true });
     this.sf4.validator({ emitError: true });
     this.sf7.validator({ emitError: true });
-    console.log(this.sf1.valid)
     if (this.validateForm1.invalid || !this.sf3.valid || !this.sf1.valid|| !this.sf4.valid || !this.sf7.valid) {
       return;
     }
@@ -687,7 +686,6 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
     }  else if(this.PageStatus === '大宗下一单') {
       this.requests(this.service.$api_set_saveAnotherBulkOrder, params);
     }
-   
   }
   
   requests(url: any, params: any) {
diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts
index bdaed9da..6797f395 100644
--- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts
@@ -649,7 +649,7 @@ export class FreightComponentsListNewComponent implements OnInit {
           maxLength: 18,
           ui: {
             grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
-            placeholder: '请输入法定代表人身份证号码'
+            placeholder: '请输入企业管理员身份证号'
           }
         },
         tipsD: { title: '企业授权函', type: 'string', ui: { widget: 'custom' }, default: 1 },