fix bug

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

@@ -32,7 +32,7 @@
           <button
             nz-button
             (click)="updateGoodsSource(i)"
-            *ngIf="i?.resourceStatus === '1'"
+            *ngIf="i?.resourceStatus === '1' && i.insurancePayment !== 'Y'"
             acl
             [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']"
             >修改货源</button

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-10 15:58:18
+ * @LastEditTime : 2022-03-10 16:36:29
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@@ -51,18 +51,18 @@
    </div>
   </ng-template>
 </page-header-wrapper>
-<nz-card nzTitle="运单进度">
+<nz-card nzTitle="运单进度" #distannce1>
   <div class="approval-status">
     <div style="width: 60%; margin: 0 auto">
-        <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
+       
-           <nz-step
+      <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
-                  *ngFor="let item of i?.scheduleVOList"
+        <nz-step
-             [nzTitle]="item.state"
+          *ngFor="let item of i?.scheduleVOList"
-             [nzSubtitle]="item.stateTime"
+          [nzTitle]="item.state"
-             [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
+          [nzSubtitle]="item.stateTime"
-           >
+          [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
-          </nz-step>
+        ></nz-step>
-         </nz-steps>
+      </nz-steps>
     </div>
   </div>
 </nz-card>
@@ -140,7 +140,7 @@
   </div>
 </div>
 </nz-card>
-<nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
+<!-- <nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
   <div style="margin-bottom: 18px">
     <span style="color: #da001b; font-size: 18px"> {{ i?.goodsInfos?.[0]?.freightPrice | currency }}{{ i?.goodsInfos?.[0]?.freightTypeLabel }} </span>（{{ i?.goodsInfos?.[0]?.settlementBasisLabel }}，{{
       i?.goodsInfos?.[0]?.ruleLabel
@@ -157,6 +157,27 @@
     }}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
   </div>
   <div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
+</nz-card> -->
+<nz-card  [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'"  #distannce3>
+  <div  *ngIf="(i?.billStatus == '3' && i.goodsInfoList?.[0].settlementBasis == '2') || (i?.billStatus == '4' && i.goodsInfoList?.[0].settlementBasis == '1')" >
+  <h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（{{ i?.goodsInfoList?.[0]?.settlementBasisLabel ? i?.goodsInfoList?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfoList?.[0]?.ruleLabel}}）</h2>
+  <st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    <ng-template st-row="PriceType" let-item let-index="index"> 到付 </ng-template>
+    <ng-template st-row="price" let-item let-index="index">
+      {{ item.price | currency }}
+    </ng-template>
+    <ng-template st-row="surcharge" let-item let-index="index">
+      {{ item.surcharge | currency }}
+    </ng-template>
+  </st>
+  <div>
+    <div>
+      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
+      附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
+    </div>
+  </div>
+  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
+</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息" #distannce4>

src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-10 16:00:17
+ * @LastEditTime : 2022-03-10 16:31:54
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.ts
@@ -33,6 +33,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   trajectory = 'car';
   mapList:any[] = [];  //地图点位数据组
   addressItems:any[] = [];  //打点地址数据组
+  billExpenses: any[] = []; //运费信息表格信息
   imges: any;
   unLoadingPlaceVOList: any = [];
   logColumns2: STColumn[] = [
@@ -83,8 +84,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
       this.unLoadingPlaceVOList.push(...res.dischargePlace)
       console.log(this.unLoadingPlaceVOList)
       this.i = res;
-      this.attObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'ATT')[0];
+      this.billExpenses = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TRA');
-      this.totalObj = this.i?.billExpenseDetailVOList?.filter((data: any) => data.expenseCode === 'TOTAL')[0];
+        this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE");
     })
   }
 

src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime : 2022-03-10 16:10:51
+ * @LastEditTime : 2022-03-10 16:26:01
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts