fix bug

src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html

@@ -13,9 +13,25 @@
       <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
-          <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
+            nz-button
-          <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)"  acl  [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</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>
@@ -44,14 +60,16 @@
             nzIcon="solution"
             [nzDescription]="i?.createAt"
             nzTitle="下单"
+            [nzSubtitle]="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' ? '已完结' : '完结'"
+            [nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'" [nzSubtitle]="i?.endTime"
           ></nz-step>
-          <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
+            
+            <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'" [nzSubtitle]="i?.endTime"></nz-step>
         </nz-steps>
       </div>
     </div>

src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html

@@ -13,16 +13,40 @@
       <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
-          <button nz-button (click)="assignedCar(i)"
+            nz-button
-            *ngIf="i?.resourceStatus  === '1' && i?.serviceType === '2'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
+            (click)="cancleGoodsSource()"
-          <button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'"  acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
+            *ngIf="i?.resourceStatus === '1'"
-          <button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl  [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
+            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>
         <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,17 +63,32 @@
     <div class="approval-status">
       <div style="width: 60%; margin: 0 auto">
         <nz-steps [nzLabelPlacement]="'vertical'">
-          <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
+          <nz-step
-            [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
+            [nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
-          <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
+            nzIcon="solution"
-            [nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
+            [nzDescription]="i?.createAt"
-          <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
+            nzTitle="下单"
+            [nzSubtitle]="i?.createTime"
+          ></nz-step>
+          <nz-step
+            *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
+            [nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
+            nzIcon="file-done"
+            [nzTitle]="'接单'"
+            [nzSubtitle]="i?.endTime"
+          ></nz-step>
+          <nz-step
+            nzStatus="finish"
+            nzIcon="close-circle"
+            nzTitle="取消货源"
+            *ngIf="i?.resourceStatus === '3'"
+            [nzSubtitle]="i?.endTime"
+          ></nz-step>
         </nz-steps>
       </div>
     </div>
   </nz-card>
 
-
   <nz-card nzTitle="基本信息">
     <sv-container col="2">
       <sv-title>货物信息</sv-title>
@@ -57,9 +96,7 @@
         <sv label="货物名称">
           {{ item.goodsName }}
         </sv>
-        <sv label="货物数量">
+        <sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
-          {{item.weight}}吨,{{item.volume}}方,{{item.number}}件
-        </sv>
       </ng-container>
     </sv-container>
     <sv-container class="mt-md">
@@ -75,8 +112,10 @@
       </sv>
     </sv-container>
     <div class="mt-md">
-      <h4 class="text-md">装货卸货信息
+      <h4 class="text-md"
-        <span class="ml-sm text-sm">(
+        >装货卸货信息
+        <span class="ml-sm text-sm"
+          >(
           <label>{{ i?.loadingCount }}装</label>
           <label>{{ i?.unloadingCount }}卸</label>
           )
@@ -123,9 +162,7 @@
       <sv label="货物价值">
         {{ i?.goodsValue | currency }}
       </sv>
-      <sv label="保价费金额">
+      <sv label="保价费金额"> {{ i?.insurancePremium | currency }} 元 </sv>
-        {{i?.insurancePremium |currency}} 元
-      </sv>
     </sv-container>
   </nz-card>
   <nz-card [nzTitle]="'运费信息（到货后' + i?.paymentDays + '天内支付运费）'">
@@ -147,7 +184,7 @@
         <h3>
           <label>总计 :</label>
           <span class="text-error-dark text-xl">
-            {{(i?.totalAmount) | currency}}
+            {{ i?.totalAmount | currency }}
           </span>
           <span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
         </h3>
@@ -175,7 +212,6 @@
     </sv-container>
   </nz-card>
   <nz-card nzTitle="操作日志">
-    <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
-    </st>
   </nz-card>
 </div>