From d6cbe09cc78052b616d06bc0e9b275b04eed6e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Wed, 13 Apr 2022 09:54:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=9D=E7=A6=81=E7=89=A9?=
 =?UTF-8?q?=E5=93=81=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-publish/bulk-publish.component.html  | 143 +++++--------
 .../bulk-publish/bulk-publish.component.less  |  31 ++-
 .../bulk-publish/bulk-publish.component.ts    |  14 ++
 .../onecar-publish.component.html             | 190 +++++++-----------
 .../onecar-publish.component.less             |  32 ++-
 .../onecar-publish.component.ts               |  14 ++
 6 files changed, 215 insertions(+), 209 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 7e3d5937..3adadeab 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
@@ -11,52 +11,33 @@
 </nz-card>
 
 <nz-card>
-  <div class="card-title"
-    >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
-  >
+  <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]="10">
         <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label  nzRequired>装货地</nz-form-label>
+            <nz-form-label nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
-                    nz-input
-                    [(ngModel)]="data1.detailedAddress"
-                    (click)="openMap('start', idx)"
-                    formControlName="loadAddress{{ idx }}"
-                    placeholder="请输入装货地"
-                    readonly="true"
-                  />
+                  <input nz-input [(ngModel)]="data1.detailedAddress" (click)="openMap('start', idx)"
+                    formControlName="loadAddress{{ idx }}" placeholder="请输入装货地" readonly="true" />
                 </nz-input-group>
               </div>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label  nzRequired>联系人</nz-form-label>
+            <nz-form-label nzRequired>联系人</nz-form-label>
             <div style="display: flex ;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
-                  nz-input
-                  [(ngModel)]="data1.appUserName"
-                  formControlName="loadName{{ idx }}"
-                  maxlength="30"
-                  placeholder="请输入联系人姓名"
-                />
+                <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)]="data1.contractTelephone"
-                  maxlength="11"
-                  formControlName="loadPhone{{ idx }}"
-                  placeholder="请输入联系人电话"
-                />
+                <input style="margin-left: 12px" nz-input [(ngModel)]="data1.contractTelephone" maxlength="11"
+                  formControlName="loadPhone{{ idx }}" placeholder="请输入联系人电话" />
               </nz-form-control>
             </div>
           </nz-form-item>
@@ -64,50 +45,32 @@
       </div>
       <div nz-col [nzSpan]="4">
         <div style="display: flex; justify-content: center">
-          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
-              nzTheme="outline"></i></span>
+          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
         </div>
       </div>
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label  nzRequired>卸货地</nz-form-label>
+            <nz-form-label nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
-                    nz-input
-                    [(ngModel)]="data2.detailedAddress"
-                    (click)="openMap('end', idx)"
-                    formControlName="unloadAddress{{ idx }}"
-                    placeholder="请输入卸货地"
-                    readonly="true"
-                  />
+                  <input nz-input [(ngModel)]="data2.detailedAddress" (click)="openMap('end', idx)"
+                    formControlName="unloadAddress{{ idx }}" placeholder="请输入卸货地" readonly="true" />
                 </nz-input-group>
               </div>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label  nzRequired>联系人</nz-form-label>
+            <nz-form-label nzRequired>联系人</nz-form-label>
             <div style="display: flex;width: 86%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
-                  nz-input
-                  [(ngModel)]="data2.appUserName"
-                  maxlength="30"
-                  formControlName="unloadName{{ idx }}"
-                  placeholder="请输入联系人姓名"
-                />
+                <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)]="data2.contractTelephone"
-                  formControlName="unloadPhone{{ idx }}"
-                  maxlength="11"
-                  placeholder="请输入联系人电话"
-                />
+                <input style="margin-left: 12px" nz-input [(ngModel)]="data2.contractTelephone"
+                  formControlName="unloadPhone{{ idx }}" maxlength="11" placeholder="请输入联系人电话" />
               </nz-form-control>
             </div>
           </nz-form-item>
@@ -122,16 +85,26 @@
   <div class="card-title">货物信息</div>
   <div nz-row>
     <div nz-col nzSpan="24">
-      <sf #sf3 [schema]="schema3" [formData]="sf3data" [button]="'none'" [ui]="ui3"></sf>
+      <sf #sf3 [schema]="schema3" class="sf3" [formData]="sf3data" [button]="'none'" [ui]="ui3">
+        <ng-template class="1" sf-template="goodsTips" let-i let-ui="ui">
+          <nz-alert class="goods_tips" nzType="warning" [nzMessage]="tpl" nzShowIcon></nz-alert>
+        </ng-template>
+        <ng-template #tpl>
+          <span> 国家法规及行政命令禁限运货物不能托运
+            <a target="_blank" [queryParams]="{ type: 15 }" [routerLink]="['/agreement']">《禁运物品说明》</a>
+          </span>
+        </ng-template>
+      </sf>
       <sf #sf4 [schema]="schema4" [formData]="sf4data" [button]="'none'" [ui]="ui4">
         <ng-template sf-template="freightPrice" let-i let-ui="ui">
           <nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
-            <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="请输入" type="number" [ngModel]="i.value"
-            (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
+            <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="请输入" type="number" [ngModel]="i.value"
+              (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
           </nz-input-group>
           <ng-template #addOnAfterTemplate>
             <nz-select [ngModel]="sf4.value.freightType" (ngModelChange)="sf4.setValue('/freightType', $event)">
-              <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of freightTypeOptions"> </nz-option>
+              <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of freightTypeOptions">
+              </nz-option>
             </nz-select>
           </ng-template>
         </ng-template>
@@ -142,9 +115,8 @@
               <nz-option nzLabel="抹除小数" nzValue="2"></nz-option>
               <nz-option nzLabel="抹除个数" nzValue="3"></nz-option>
             </nz-select>
-            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"
-              ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
-            ></span>
+            <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2" nzTooltipPlacement="bottom"><i nz-icon
+                nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i></span>
             <ng-template #template2>
               <p>例如 付司机运费 = 重量*单价 = 999.99</p>
               <p>保留小数，即 999.99</p>
@@ -155,35 +127,20 @@
         </ng-template>
         <ng-template sf-template="weight" let-i let-ui="ui">
           <nz-input-group [nzAddOnAfter]="'吨'">
-            <nz-input-number
-              placeholder="总重量，必填"
-              [ngModel]="i.value"
-              (ngModelChange)="i.setValue($event)"
-              [nzMin]="1"
-              style="width: 100%"
-            ></nz-input-number>
+            <nz-input-number placeholder="总重量，必填" [ngModel]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1"
+              style="width: 100%"></nz-input-number>
           </nz-input-group>
         </ng-template>
         <ng-template sf-template="volume" let-i let-ui="ui">
           <nz-input-group [nzAddOnAfter]="'方'">
-            <nz-input-number
-              placeholder="总体积"
-              [ngModel]="i.value"
-              (ngModelChange)="i.setValue($event)"
-              [nzMin]="1"
-              style="width: 100%"
-            ></nz-input-number>
+            <nz-input-number placeholder="总体积" [ngModel]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1"
+              style="width: 100%"></nz-input-number>
           </nz-input-group>
         </ng-template>
         <ng-template sf-template="number" let-i let-ui="ui">
           <nz-input-group [nzAddOnAfter]="'车'">
-            <nz-input-number
-              placeholder="总车次"
-              [ngModel]="i.value"
-              (ngModelChange)="i.setValue($event)"
-              [nzMin]="1"
-              style="width: 100%"
-            ></nz-input-number>
+            <nz-input-number placeholder="总车次" [ngModel]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1"
+              style="width: 100%"></nz-input-number>
           </nz-input-group>
         </ng-template>
       </sf>
@@ -198,15 +155,10 @@
       <sf #sf7 [schema]="schema7" [formData]="sf7data" [button]="'none'" [ui]="ui7">
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center" >
+            <div class="align-center">
               <div nz-col nzSpan="12">
-                <nz-input-number
-                  [(ngModel)]="i.value"
-                  (ngModelChange)="i.setValue($event)"
-                  [nzMin]="1"
-                  [nzMax]="30"
-                  [nzStep]="1"
-                ></nz-input-number>
+                <nz-input-number [(ngModel)]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1" [nzMax]="30"
+                  [nzStep]="1"></nz-input-number>
               </div>
               <div nz-col nzSpan="12">
                 <span>&nbsp;天内支付运费</span>
@@ -220,9 +172,12 @@
 </nz-card>
 <nz-card>
   <div class="align-center">
-    <button nz-button nzType="primary"  (click)="submitConfirm('qrcode')"  acl  [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER- QRCode']">生成二维码</button>
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')"  acl  [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkDesignate']">指派熟车</button>
+    <button nz-button nzType="primary" (click)="submitConfirm('qrcode')" acl
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER- QRCode']">生成二维码</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('assign')" acl
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkDesignate']">指派熟车</button>
     <!-- <button nz-button nzType="primary"    (click)="choose()">取消</button> -->
-    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')"  acl  [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkAnotherOrder']">司机抢单</button>
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')" acl
+      [acl-ability]="['SUPPLY-VEHICLE-PLACEORDER-bulkAnotherOrder']">司机抢单</button>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
index 193ba9aa..6afafe32 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less
@@ -3,10 +3,35 @@
     nz-input-number {
       width: 100%;
     }
+
     nz-date-picker {
       width: 100%;
     }
+
+    .sf3 {
+      .goods_Tips_item {
+        .goods_tips {
+          width: calc(50% - 60px);
+
+          .ant-alert {
+            padding: 4px;
+          }
+
+        }
+
+        nz-form-item {
+          margin-bottom: 8px;
+        }
+
+        // .ant-form-item-control-input-content {
+        //   display: flex;
+        //   justify-content: end;
+        // }
+      }
+    }
   }
+
+
   i {
     cursor: pointer;
   }
@@ -34,7 +59,10 @@
   padding: 24px;
   color: #7d7d7d;
   font-size: 30px;
-  :hover{color: #52acff;}
+
+  :hover {
+    color: #52acff;
+  }
 }
 
 #container {
@@ -45,6 +73,7 @@
 input[type='number'] {
   -moz-appearance: textfield;
 }
+
 input[type='number']::-webkit-inner-spin-button,
 input[type='number']::-webkit-outer-spin-button {
   margin: 0;
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 bc5f0bf6..abcbe7da 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
@@ -210,6 +210,17 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
   initSF3() {
     this.schema3 = {
       properties: {
+        goodsTips: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom',
+            class: 'goods_Tips_item',
+            // visibleIf: {
+            //   goodsTypeName: (value: any) => value && value === '其它'
+            // }
+          }
+        },
         goodsTypeId: {
           type: 'string',
           title: '货物名称',
@@ -284,6 +295,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
       '*': {
         spanLabelFixed: 90,
         grid: { span: 12 }
+      },
+      $goodsTips: {
+        grid: { span: 24 }
       }
     };
   }
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
index 7eb10959..f2dc8e3b 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
@@ -11,60 +11,37 @@
 </nz-card>
 
 <nz-card>
-  <div class="card-title"
-    >装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
-  >
+  <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]="10">
         <div *ngFor="let data1 of startInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label  nzRequired>装货地</nz-form-label>
+            <nz-form-label nzRequired>装货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入装货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
-                    nz-input
-                    [(ngModel)]="data1.detailedAddress"
-                    (click)="openMap('start', idx)"
-                    formControlName="loadAddress{{ idx }}"
-                    placeholder="请输入装货地"
-                    readonly="true"
-                  />
+                  <input nz-input [(ngModel)]="data1.detailedAddress" (click)="openMap('start', idx)"
+                    formControlName="loadAddress{{ idx }}" placeholder="请输入装货地" readonly="true" />
                 </nz-input-group>
-                <span *ngIf="idx !== 0" style="padding: 0 10px"
-                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
-                ></span>
-                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
-                ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
-              ></span>
+                <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline"
+                    style="color: #d9001b" (click)="subStartInfo($event, idx)"></i></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"><i nz-icon nzType="minus-circle"
+                    nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i></span>
               </div>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label  nzRequired>联系人</nz-form-label>
+            <nz-form-label nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
-                  nz-input
-                  [(ngModel)]="data1.appUserName"
-                  formControlName="loadName{{ idx }}"
-                  name="loadName{{ idx }}"
-                  maxlength="30"
-                  placeholder="请输入联系人姓名"
-                />
+                <input nz-input [(ngModel)]="data1.appUserName" formControlName="loadName{{ idx }}"
+                  name="loadName{{ idx }}" maxlength="30" placeholder="请输入联系人姓名" />
               </nz-form-control>
               <nz-form-control [nzErrorTip]="'请输入联系人电话'">
-                <input
-                  style="margin-left: 12px"
-                  nz-input
-                  [(ngModel)]="data1.contractTelephone"
-                  maxlength="11"
-                  formControlName="loadPhone{{ idx }}"
-                  name="loadPhone{{ idx }}"
-                  placeholder="请输入联系人电话"
-                />
+                <input style="margin-left: 12px" nz-input [(ngModel)]="data1.contractTelephone" maxlength="11"
+                  formControlName="loadPhone{{ idx }}" name="loadPhone{{ idx }}" placeholder="请输入联系人电话" />
               </nz-form-control>
             </div>
           </nz-form-item>
@@ -81,59 +58,38 @@
       </div>
       <div nz-col [nzSpan]="4">
         <div style="display: flex; justify-content: center">
-          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap"
-              nzTheme="outline"></i></span>
+          <span class="swap-icon" (click)="swapAddress()"><i nz-icon nzType="swap" nzTheme="outline"></i></span>
         </div>
       </div>
       <div nz-col [nzSpan]="10">
         <div *ngFor="let data2 of endInfo; let idx = index">
           <nz-form-item>
-            <nz-form-label  nzRequired>卸货地</nz-form-label>
+            <nz-form-label nzRequired>卸货地</nz-form-label>
             <nz-form-control [nzErrorTip]="'请输入卸货地'">
               <div class="align-center">
                 <nz-input-group [nzSuffix]="endInconTemp1">
-                  <input
-                    nz-input
-                    [(ngModel)]="data2.detailedAddress"
-                    (click)="openMap('end', idx)"
-                    formControlName="unloadAddress{{ idx }}"
-                    placeholder="请输入卸货地"
-                    name="unloadAddress{{ idx }}"
-                    readonly="true"
-                  />
+                  <input nz-input [(ngModel)]="data2.detailedAddress" (click)="openMap('end', idx)"
+                    formControlName="unloadAddress{{ idx }}" placeholder="请输入卸货地" name="unloadAddress{{ idx }}"
+                    readonly="true" />
                 </nz-input-group>
-                <span *ngIf="idx !== 0" style="padding: 0 10px"
-                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
-                ></span>
-                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
-                ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
-              ></span>
+                <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline"
+                    style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"><i nz-icon nzType="minus-circle"
+                    nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i></span>
               </div>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label  nzRequired>联系人</nz-form-label>
+            <nz-form-label nzRequired>联系人</nz-form-label>
             <div style="display: flex; width: 80.7%">
               <nz-form-control [nzErrorTip]="'请输入联系人姓名'">
-                <input
-                  nz-input
-                  [(ngModel)]="data2.appUserName"
-                  maxlength="30"
-                  formControlName="unloadName{{ idx }}"
-                  name="unloadAddress{{ idx }}"
-                  placeholder="请输入联系人姓名"
-                />
+                <input nz-input [(ngModel)]="data2.appUserName" maxlength="30" formControlName="unloadName{{ idx }}"
+                  name="unloadAddress{{ idx }}" placeholder="请输入联系人姓名" />
               </nz-form-control>
               <nz-form-control [nzErrorTip]="'请输入联系人电话'">
-                <input
-                  style="margin-left: 12px"
-                  nz-input
-                  [(ngModel)]="data2.contractTelephone"
-                  formControlName="unloadPhone{{ idx }}"
-                  name="unloadAddress{{ idx }}"
-                  maxlength="11"
-                  placeholder="请输入联系人电话"
-                />
+                <input style="margin-left: 12px" nz-input [(ngModel)]="data2.contractTelephone"
+                  formControlName="unloadPhone{{ idx }}" name="unloadAddress{{ idx }}" maxlength="11"
+                  placeholder="请输入联系人电话" />
               </nz-form-control>
             </div>
           </nz-form-item>
@@ -152,24 +108,20 @@
     <div nz-row [nzGutter]="24" style="margin-top: 24px">
       <div nz-col nzXs="2" nzSm="4" nzMd="8" nzLg="8" nzXl="10">
         <nz-form-item>
-          <nz-form-label  nzRequired>装货时间</nz-form-label>
+          <nz-form-label nzRequired>装货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入装货时间'">
-            <nz-date-picker
-            [nzShowTime]="{ nzFormat: 'HH' }"
-            nzFormat="yyyy-MM-dd HH:00前"
-            formControlName="loadingTime"
-            [nzDisabledDate]="disabledDateStart"
-          ></nz-date-picker>
+            <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }" nzFormat="yyyy-MM-dd HH:00前" formControlName="loadingTime"
+              [nzDisabledDate]="disabledDateStart"></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
       <div nz-col nzXs="20" nzSm="16" nzMd="12" nzLg="8" nzXl="4"></div>
       <div nz-col nzXs="2" nzSm="4" nzMd="8" nzLg="8" nzXl="10">
         <nz-form-item>
-          <nz-form-label  nzRequired>卸货时间</nz-form-label>
+          <nz-form-label nzRequired>卸货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入卸货时间'">
-            <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }"
-            nzFormat="yyyy-MM-dd HH:00前" formControlName="unloadingTime"></nz-date-picker>
+            <nz-date-picker [nzShowTime]="{ nzFormat: 'HH' }" nzFormat="yyyy-MM-dd HH:00前"
+              formControlName="unloadingTime"></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -182,31 +134,40 @@
   <div class="card-title">货物信息</div>
   <div nz-row>
     <div nz-col nzSpan="16">
-      <sf #sf3 [schema]="schema3" [button]="'none'" [ui]="ui3" [formData]="sf3data"></sf>
+      <sf #sf3 [schema]="schema3" class="sf3" [button]="'none'" [ui]="ui3" [formData]="sf3data">
+        <ng-template class="1" sf-template="goodsTips" let-i let-ui="ui">
+          <nz-alert class="goods_tips" nzType="warning" [nzMessage]="tpl" nzShowIcon></nz-alert>
+        </ng-template>
+        <ng-template #tpl>
+          <span> 国家法规及行政命令禁限运货物不能托运
+            <a target="_blank" [queryParams]="{ type: 15 }" [routerLink]="['/agreement']">《禁运物品说明》</a>
+          </span>
+        </ng-template>
+      </sf>
     </div>
   </div>
   <sf #sf4 [schema]="schema4" [button]="'none'" [ui]="ui4" [formData]="sf4data">
     <ng-template sf-template="weight" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'吨'">
-        <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="总重量，必填" type="number" [ngModel]="i.value"
-        (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
+        <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="总重量，必填" type="number" [ngModel]="i.value"
+          (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="volume" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'方'">
-          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="体积" type="number" [ngModel]="i.value"
-        (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
+        <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="体积" type="number" [ngModel]="i.value"
+          (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="number" let-i let-ui="ui">
       <nz-input-group [nzAddOnAfter]="'件'">
-          <nz-input-number [nzMax]="99999" [nzMin] ="0" nzPlaceHolder="件数" type="number" [ngModel]="i.value"
-          (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>  
+        <nz-input-number [nzMax]="99999" [nzMin]="0" nzPlaceHolder="件数" type="number" [ngModel]="i.value"
+          (ngModelChange)="i.setValue($event)" [nzPrecision]="2" style="width: 100%;"></nz-input-number>
       </nz-input-group>
     </ng-template>
     <ng-template sf-template="goodsValue" let-i let-ui="ui">
       <div class="align-center">
-        <nz-input-number [ngModel]="i.value" [nzMin] = "0" [nzMax]="2000000" [nzStep]="0.01"
+        <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="2000000" [nzStep]="0.01"
           (ngModelChange)="i.setValue($event);getInsurersPrice()" nzPlaceHolder="请输入0-2000000之间数值">
         </nz-input-number>
       </div>
@@ -233,8 +194,8 @@
         <ng-template sf-template="freeInsurance2" let-i let-ui="ui">
           <nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
         </ng-template>
-        <ng-template #template1>①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见<a target="_blank" [queryParams]="{ type: 10 }"
-            [routerLink]="['/agreement']">《保险告知函》</a></ng-template>
+        <ng-template #template1>①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见<a target="_blank"
+            [queryParams]="{ type: 10 }" [routerLink]="['/agreement']">《保险告知函》</a></ng-template>
       </sf>
     </div>
   </div>
@@ -256,18 +217,21 @@
     <div nz-col nzSpan="8">
       <sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data">
         <ng-template sf-template="prePay" let-i let-ui="ui">
-          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2"
+            nzPlaceHolder="请输入0-99999" (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb"
+            [nzParser]="parserRmb">
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="toPay" let-i let-ui="ui">
-          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2"
+            nzPlaceHolder="请输入0-99999" (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb"
+            [nzParser]="parserRmb">
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="receiptPay" let-i let-ui="ui">
-          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2" nzPlaceHolder="请输入0-99999"
-            (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb" [nzParser]="parserRmb">
+          <nz-input-number [ngModel]="i.value" [nzMin]="0" [nzMax]="99999" [nzStep]="0.01" [nzPrecision]="2"
+            nzPlaceHolder="请输入0-99999" (ngModelChange)="priceChange($event,i)" [nzFormatter]="formatterRmb"
+            [nzParser]="parserRmb">
           </nz-input-number>
         </ng-template>
         <ng-template sf-template="subtotal" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
@@ -276,14 +240,14 @@
         <ng-template sf-template="total" let-i let-ui="ui">{{ i.value | currency }}</ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row class="align-center">
-              <div nz-col nzSpan="16">
-                <nz-input-number [ngModel]="i.value" [nzMin]="1" [nzMax]="30" [nzStep]="1"
-                  (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30" [nzPrecision]="0"
-                  [nzPrecisionMode]="'cut'"></nz-input-number>
-              </div>
-              <div nz-col nzSpan="8">
-                <span>&nbsp;天内支付运费</span>
-              </div>
+            <div nz-col nzSpan="16">
+              <nz-input-number [ngModel]="i.value" [nzMin]="1" [nzMax]="30" [nzStep]="1"
+                (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30" [nzPrecision]="0"
+                [nzPrecisionMode]="'cut'"></nz-input-number>
+            </div>
+            <div nz-col nzSpan="8">
+              <span>&nbsp;天内支付运费</span>
+            </div>
           </div>
         </ng-template>
       </sf>
@@ -293,12 +257,12 @@
 <nz-card>
   <div class="align-center">
     <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车修改'" (click)="goBack()">取消</button>
-    <button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm()"
-    acl  [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交修改</button
-    >
-    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')" acl  [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleDesignate']">指派熟车</button>
-    <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px" (click)="submitConfirm('publish')"
-    acl  [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder']">司机抢单</button
-    >
+    <button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px"
+      (click)="submitConfirm()" acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交修改</button>
+    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="submitConfirm('assign')" acl
+      [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleDesignate']">指派熟车</button>
+    <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px"
+      (click)="submitConfirm('publish')" acl
+      [acl-ability]="['SUPPLY-BULK-PLACEORDER-vehicleAnotherOrder']">司机抢单</button>
   </div>
 </nz-card>
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
index 35b08935..a29c4d5b 100644
--- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
+++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less
@@ -3,10 +3,35 @@
     nz-input-number {
       width: 100%;
     }
+
     nz-date-picker {
       width: 94.3%;
     }
+
+    .sf3 {
+      .goods_Tips_item {
+        .goods_tips {
+          width: calc(50% - 60px);
+
+          .ant-alert {
+            padding: 4px;
+          }
+
+        }
+
+        nz-form-item {
+          margin-bottom: 8px;
+        }
+
+        // .ant-form-item-control-input-content {
+        //   display: flex;
+        //   justify-content: end;
+        // }
+      }
+    }
+
   }
+
   i {
     cursor: pointer;
   }
@@ -34,7 +59,10 @@
   padding: 24px;
   color: #7d7d7d;
   font-size: 30px;
-  :hover{color: #52acff;}
+
+  :hover {
+    color: #52acff;
+  }
 }
 
 #container {
@@ -45,11 +73,13 @@
 input[type='number'] {
   -moz-appearance: textfield;
 }
+
 input[type='number']::-webkit-inner-spin-button,
 input[type='number']::-webkit-outer-spin-button {
   margin: 0;
   -webkit-appearance: none;
 }
+
 .hides {
   margin-left: 10px;
   color: aqua;
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 84d2dba4..c10c6566 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
@@ -262,6 +262,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
   initSF3() {
     this.schema3 = {
       properties: {
+        goodsTips: {
+          type: 'string',
+          title: '',
+          ui: {
+            widget: 'custom',
+            class: 'goods_Tips_item',
+            // visibleIf: {
+            //   goodsTypeName: (value: any) => value && value === '其它'
+            // }
+          }
+        },
         goodsTypeId: {
           type: 'string',
           title: '货物名称',
@@ -336,6 +347,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
       '*': {
         spanLabelFixed: 90,
         grid: { span: 12 }
+      },
+      $goodsTips: {
+        grid: { span: 24 }
       }
     };
   }