From f4e924e3149d69d1d0b01c3516e029b9304b9703 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 5 Jan 2022 20:24:23 +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  | 56 ++++++-----
 .../bulk-publish/bulk-publish.component.ts    |  3 +
 .../bulk-release-publish.component.html       |  7 +-
 .../bulk-release-publish.component.ts         |  3 +
 .../onecar-publish.component.html             | 98 +++++++++++++------
 5 files changed, 106 insertions(+), 61 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 49066ebe..d9be3fa8 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
@@ -7,7 +7,7 @@
 </page-header-wrapper>
 <nz-card>
   <div class="card-title">货源单设置</div>
-  <sf #sf1 [schema]="schema1"  [formData]="sf1data" [button]="'none'" [ui]="ui1"></sf>
+  <sf #sf1 [schema]="schema1" [formData]="sf1data" [button]="'none'" [ui]="ui1"></sf>
 </nz-card>
 
 <nz-card>
@@ -39,7 +39,13 @@
             <nz-form-control [nzErrorTip]="'请输入联系人信息'">
               <div class="align-center">
                 <input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
-                <input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
+                <input
+                  style="margin-left: 12px"
+                  nz-input
+                  [(ngModel)]="data.contractTelephone"
+                  [ngModelOptions]="{ standalone: true }"
+                  maxlength="11"
+                />
               </div>
             </nz-form-control>
           </nz-form-item>
@@ -73,31 +79,20 @@
             <nz-form-control [nzErrorTip]="'请输入联系人信息'">
               <div class="align-center">
                 <input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
-                <input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
+                <input
+                  style="margin-left: 12px"
+                  nz-input
+                  [(ngModel)]="data.contractTelephone"
+                  [ngModelOptions]="{ standalone: true }"
+                  maxlength="11"
+                />
               </div>
             </nz-form-control>
           </nz-form-item>
         </div>
       </div>
     </div>
-    <!-- <div *ngIf="npp" nz-row [nzGutter]="24" style="margin-top: 24px">
-      <div nz-col [nzSpan]="9">
-        <nz-form-item>
-          <nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label>
-          <nz-form-control [nzErrorTip]="'请输入装货时间'">
-            <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="createTime"  [(ngModel)]="creatTime"></nz-date-picker>
-          </nz-form-control>
-        </nz-form-item>
-      </div>
-      <div nz-col [nzSpan]="8">
-        <nz-form-item>
-          <nz-form-label [nzSpan]="9" nzRequired>卸货时间</nz-form-label>
-          <nz-form-control [nzErrorTip]="'请输入卸货时间'">
-            <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="modifyTime"  [(ngModel)]="modifyTime"></nz-date-picker>
-          </nz-form-control>
-        </nz-form-item>
-      </div>
-    </div> -->
+
     <ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
   </form>
 </nz-card>
@@ -186,15 +181,21 @@
   <div class="card-title">补充信息</div>
   <div nz-row>
     <div nz-col nzSpan="12">
-      <sf #sf7 [schema]="schema7"  [formData]="sf7data" [button]="'none'" [ui]="ui7">
+      <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 nz-col nzSpan="16">
-                <!-- <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" /> -->
-                <nz-input-number [(ngModel)]="i.value" (ngModelChange)="i.setValue($event)" [nzMin]="1" [nzMax]="30" [nzStep]="1"></nz-input-number>
+            <div class="align-center" style="width: 350px;">
+              <div nz-col nzSpan="12">
+                <nz-input-number
+                  [(ngModel)]="i.value"
+                  (ngModelChange)="i.setValue($event)"
+                  [nzMin]="1"
+                  [nzMax]="30"
+                  [nzStep]="1"
+                  style="width: 150px;"
+                ></nz-input-number>
               </div>
-              <div nz-col nzSpan="8">
+              <div nz-col nzSpan="6">
                 <span>天内支付运费</span>
               </div>
             </div>
@@ -208,6 +209,7 @@
   <div class="align-center">
     <!-- <button nz-button nzType="primary" (click)="chooseFamifiar()">生成二维码</button>
     <button nz-button nzType="primary" style="margin-left: 48px" (click)="chooseFamifiar()">指派熟车</button> -->
+    <button nz-button nzType="primary"    (click)="choose()">取消</button>
     <button nz-button nzType="primary" style="margin-left: 48px" (click)="submit()">司机抢单</button>
   </div>
 </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 0201c9e8..5154f830 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
@@ -801,4 +801,7 @@ export class  SupplyManagementBulkPublishComponent implements OnInit {
       remarks: res?.remarks || ''
     };
   }
+  choose(){
+    window.history.go(-1);
+  }
 }
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 b7bc1c75..91d46074 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
@@ -212,11 +212,11 @@
       <sf #sf6 [schema]="schema6" [button]="'none'" [ui]="ui6" [formData]="sf6data">
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center" style="width: 500px;">
+            <div class="align-center" style="width: 350px;">
               <div nz-col nzSpan="12">
                 <nz-input-number
                   [ngModel]="i.value"
-                  
+                  style="width: 150px;"
                   [nzMin]="1"
                   [nzMax]="30"
                   [nzStep]="1"
@@ -237,7 +237,8 @@
 
 <nz-card>
   <div class="align-center">
-    <button nz-button nzType="primary" (click)="submit('assign')">指派熟车</button>
+    <!-- <button nz-button nzType="primary" (click)="submit('assign')">指派熟车</button> -->
+    <button nz-button nzType="primary"    (click)="choose()">取消</button>
     <button nz-button nzType="primary" style="margin-left: 48px" (click)="submit('publish')">司机抢单</button>
   </div>
 </nz-card>
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 09a51693..289c50ae 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
@@ -654,4 +654,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
         }
       });
   }
+  choose(){
+    window.history.go(-1);
+  }
 }
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 23b82acd..1fcb8d51 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
@@ -7,7 +7,7 @@
 </page-header-wrapper>
 <nz-card>
   <div class="card-title">货源单设置</div>
-  <sf #sf1 [schema]="schema1"  [formData]="sf1data" [button]="'none'" [ui]="ui1"></sf>
+  <sf #sf1 [schema]="schema1" [formData]="sf1data" [button]="'none'" [ui]="ui1"></sf>
 </nz-card>
 
 <nz-card>
@@ -31,10 +31,10 @@
                     placeholder="请输入装货地"
                   />
                 </nz-input-group>
-                <span  style="padding: 0 10px"
+                <span style="padding: 0 10px"
                   ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
                 ></span>
-                <span 
+                <span
                   ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
                 ></span>
               </div>
@@ -45,12 +45,18 @@
             <nz-form-control [nzErrorTip]="'请输入联系人信息'">
               <div class="align-center">
                 <input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
-                <input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
+                <input
+                  style="margin-left: 12px"
+                  nz-input
+                  [(ngModel)]="data.contractTelephone"
+                  [ngModelOptions]="{ standalone: true }"
+                  maxlength="11"
+                />
               </div>
             </nz-form-control>
           </nz-form-item>
         </div>
-        <button  nz-button nzType="primary" (click)="addStartInfo($event)">
+        <button nz-button nzType="primary" (click)="addStartInfo($event)">
           <i nz-icon nzType="plus"></i>
           添加装货地
         </button>
@@ -75,10 +81,8 @@
                     placeholder="请输入卸货地"
                   />
                 </nz-input-group>
-                <span  style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
-                <span 
-                  ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
-                ></span>
+                <span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
+                <span><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
               </div>
             </nz-form-control>
           </nz-form-item>
@@ -87,23 +91,34 @@
             <nz-form-control [nzErrorTip]="'请输入联系人信息'">
               <div class="align-center">
                 <input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
-                <input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
+                <input
+                  style="margin-left: 12px"
+                  nz-input
+                  [(ngModel)]="data.contractTelephone"
+                  [ngModelOptions]="{ standalone: true }"
+                  maxlength="11"
+                />
               </div>
             </nz-form-control>
           </nz-form-item>
         </div>
-        <button  nz-button nzType="primary" (click)="addEndInfo($event)">
+        <button nz-button nzType="primary" (click)="addEndInfo($event)">
           <i nz-icon nzType="plus"></i>
           添加卸货地
         </button>
       </div>
     </div>
-    <div  nz-row [nzGutter]="24" style="margin-top: 24px">
+    <div nz-row [nzGutter]="24" style="margin-top: 24px">
       <div nz-col [nzSpan]="9">
         <nz-form-item>
           <nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入装货时间'">
-            <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadingTime"  [(ngModel)]="loadingTime"></nz-date-picker>
+            <nz-date-picker
+              nzShowTime
+              nzFormat="yyyy-MM-dd HH:mm:ss"
+              formControlName="loadingTime"
+              [(ngModel)]="loadingTime"
+            ></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -111,7 +126,12 @@
         <nz-form-item>
           <nz-form-label [nzSpan]="9" nzRequired>卸货时间</nz-form-label>
           <nz-form-control [nzErrorTip]="'请输入卸货时间'">
-            <nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="unloadingTime"  [(ngModel)]="unloadingTime"></nz-date-picker>
+            <nz-date-picker
+              nzShowTime
+              nzFormat="yyyy-MM-dd HH:mm:ss"
+              formControlName="unloadingTime"
+              [(ngModel)]="unloadingTime"
+            ></nz-date-picker>
           </nz-form-control>
         </nz-form-item>
       </div>
@@ -190,13 +210,15 @@
             <span style="padding: 0 12px" nz-tooltip [nzTooltipTitle]="template2"
               ><i nz-icon nzType="exclamation-circle" nzTheme="outline" style="color: #1890ff"></i
             ></span>
-            <ng-template #template2>注意事项：<br/>
+            <ng-template #template2
+              >注意事项：<br />
 
-              ①请仔细阅读《投保告知》<br/>
-              
-              ②港澳台、西藏不在投保范围内，不予承保<br/>
-              
-              ③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。</ng-template>
+              ①请仔细阅读《投保告知》<br />
+
+              ②港澳台、西藏不在投保范围内，不予承保<br />
+
+              ③保价费最低收费2元，请按真实货值填写，录入的所有信息必须确保真实，不如实录入的内容，不承担对应赔偿责任。</ng-template
+            >
           </div>
         </ng-template>
       </sf>
@@ -210,8 +232,13 @@
     <div nz-col nzSpan="12">
       <sf #sf6 [schema]="schema6" [formData]="sf6data" [button]="'none'" [ui]="ui6">
         <ng-template sf-template="receiptAddressId" let-i let-ui="ui">
-          <input nz-input [ngModel]="i.value" (ngModelChange)="i.setValue($event)" placeholder="请点击选择收回单地址"
-            (click)="backBillChange()" />
+          <input
+            nz-input
+            [ngModel]="i.value"
+            (ngModelChange)="i.setValue($event)"
+            placeholder="请点击选择收回单地址"
+            (click)="backBillChange()"
+          />
         </ng-template>
       </sf>
     </div>
@@ -222,15 +249,22 @@
   <div nz-row>
     <div nz-col nzSpan="12">
       <sf #sf7 [schema]="schema7" [button]="'none'" [ui]="ui7" [formData]="sf7data">
-        <ng-template sf-template="subtotal" let-i let-ui="ui">￥{{i.value}}</ng-template>
-        <ng-template sf-template="appendFee" let-i let-ui="ui">￥{{i.value}}（费率：{{currentRate | number: '0.2-4' }}%）</ng-template>
-        <ng-template sf-template="total" let-i let-ui="ui">￥{{i.value}}</ng-template>
+        <ng-template sf-template="subtotal" let-i let-ui="ui">￥{{ i.value }}</ng-template>
+        <ng-template sf-template="appendFee" let-i let-ui="ui">￥{{ i.value }}（费率：{{ currentRate | number: '0.2-4' }}%）</ng-template>
+        <ng-template sf-template="total" let-i let-ui="ui">￥{{ i.value }}</ng-template>
         <ng-template sf-template="paymentDays" let-i let-ui="ui">
           <div nz-row>
-            <div class="align-center">
+            <div class="align-center" style="width: 300px;">
               <div nz-col nzSpan="16">
-                <nz-input-number [ngModel]="i.value" [nzMin]="1" [nzMax]="30" [nzStep]="1"
-                  (ngModelChange)="i.setValue($event)" nzPlaceHolder="请输入1-30"></nz-input-number>
+                <nz-input-number
+                  [ngModel]="i.value"
+                  [nzMin]="1"
+                  [nzMax]="30"
+                  [nzStep]="1"
+                  style="width: 150px;"
+                  (ngModelChange)="i.setValue($event)"
+                  nzPlaceHolder="请输入1-30"
+                ></nz-input-number>
               </div>
               <div nz-col nzSpan="8">
                 <span>天内支付运费</span>
@@ -244,9 +278,11 @@
 </nz-card>
 <nz-card>
   <div class="align-center">
-    <button nz-button nzType="primary"  *ngIf="this.PageStatus == '整车修改'"  (click)="choose()">取消</button>
+    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车修改'" (click)="choose()">取消</button>
     <button *ngIf="this.PageStatus == '整车修改'" nz-button nzType="primary" style="margin-left: 48px" (click)="submit()">提交修改</button>
-    <button nz-button nzType="primary"  *ngIf="this.PageStatus == '整车下一单'"  (click)="chooseFamifiar()">指派熟车</button>
-    <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px" (click)="submit()">司机抢单</button>
+    <button nz-button nzType="primary" *ngIf="this.PageStatus == '整车下一单'" (click)="chooseFamifiar()">指派熟车</button>
+    <button *ngIf="this.PageStatus == '整车下一单'" nz-button nzType="primary" style="margin-left: 48px" (click)="submit()"
+      >司机抢单</button
+    >
   </div>
 </nz-card>