From ea2b5eec189d95a95347cbc863a3fb41654dc2de 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, 2 Mar 2022 15:51:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A7=E6=BA=90=E8=AF=A6=E6=83=85=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=E6=9D=A1=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-detail/bulk-detail.component.html    | 53 ++++++++-----------
 .../vehicle-detail.component.html             | 21 +++++---
 2 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index fb4c2eb6..9af9096c 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -13,16 +13,17 @@
       <div nz-row>
         <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
         <div nz-col nzSpan="10">
-          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
-          <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
-          <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
+          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
+            [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
+          <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
+            [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
+          <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
+            [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>
         <div>
-          <b
-            >总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b
-          >
+          <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
         </div>
       </div>
       <nz-divider></nz-divider>
@@ -39,19 +40,13 @@
     <div class="approval-status">
       <div style="width: 60%; margin: 0 auto">
         <nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
-          <nz-step
-            [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
-            nzIcon="solution"
-            [nzDescription]="i?.createAt"
-            nzTitle="下单"
-          ></nz-step>
-          <nz-step
-            *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
-            [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
-            nzIcon="file-done"
-            [nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'"
-          ></nz-step>
-          <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
+          <nz-step [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'" nzIcon="solution" nzTitle="下单"
+            [nzDescription]="i?.createTime"></nz-step>
+          <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
+            [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'" nzIcon="file-done"
+            [nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'" [nzDescription]="i?.endTime"></nz-step>
+          <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"
+            [nzDescription]="i?.endTime"></nz-step>
         </nz-steps>
       </div>
     </div>
@@ -77,10 +72,8 @@
       </ng-container>
     </sv-container>
     <div class="mt-md">
-      <h4 class="text-md"
-        >装货卸货信息
-        <span class="ml-sm text-sm"
-          >(
+      <h4 class="text-md">装货卸货信息
+        <span class="ml-sm text-sm">(
           <label>{{ i?.loadingCount || '一' }}装</label>
           <label>{{ i?.unloadingCount || '一' }}卸</label>
           )
@@ -130,7 +123,8 @@
           <nz-divider class="mb-xs mt-xs"></nz-divider>
           <div class="text-right">
             <label>单价：</label>
-            <span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }}</span>
+            <span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{
+              freightType[item?.freightType] }}</span>
           </div>
         </div>
       </div>
@@ -139,8 +133,7 @@
   <nz-card nzTitle="关联运单">
     <sv-container col="5">
       <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
-        (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span
-        >)
+        (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
       </sv>
       <!-- <sv label="运输中">
         (<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)
@@ -176,14 +169,10 @@
     </sv-container>
   </nz-card>
   <nz-card nzTitle="操作日志">
-    <st
-      #st
-      [data]="service.$api_getOperationLogRecordsList"
-      [columns]="logColumns"
+    <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns"
       [page]="{ show: false, showSize: false }"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    >
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }">
     </st>
   </nz-card>
 </div>
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index f03c553c..9a5bf663 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -13,11 +13,14 @@
       <div nz-row>
         <div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.enterpriseInfoName}}</div>
         <div nz-col nzSpan="10">
-          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
-          <button nz-button (click)="assignedCar(i)"
-            *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
-          <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
-          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
+          <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus  === '1'" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
+          <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
+          <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
+          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl
+            [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
         </div>
       </div>
       <div class="mt-sm mb-sm" nz-row>
@@ -40,10 +43,12 @@
       <div style="width: 60%; margin: 0 auto">
         <nz-steps [nzLabelPlacement]="'vertical'">
           <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
-            [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
+            [nzDescription]="i?.createTime" nzTitle="下单"></nz-step>
           <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
-            [nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
-          <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
+            [nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"
+            [nzDescription]="i?.orderReceivingTime"></nz-step>
+          <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"
+            [nzDescription]="i?.endTime"></nz-step>
         </nz-steps>
       </div>
     </div>