返佣

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

@@ -262,6 +262,9 @@
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
+    <ng-template st-row="prices" let-item let-index="index">
+      {{ item.price + item.surcharge  | currency }}
+    </ng-template>
     <ng-template st-row="surcharge" let-item let-index="index">
       {{ item.surcharge | currency }}
     </ng-template>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-24 16:58:02
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 17:51:15
+ * @LastEditTime : 2022-03-21 14:44:18
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -79,7 +79,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
-    { title: '小计（元）', render: 'price' },
+    { title: '小计（元）', render: 'prices' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 16:40:33
+ * @LastEditTime : 2022-03-21 14:43:04
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -141,6 +141,9 @@
   <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="prices" let-item let-index="index">
+      {{ item.price + item.surcharge  | currency }}
+    </ng-template>
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-06 20:20:26
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 14:31:47
+ * @LastEditTime : 2022-03-21 14:43:06
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -39,7 +39,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit {
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
-    { title: '小计（元）', render: 'price' },
+    { title: '小计（元）', render: 'prices' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },

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

@@ -240,6 +240,9 @@
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
+    <ng-template st-row="prices" let-item let-index="index">
+      {{ item.price + item.surcharge  | currency }}
+    </ng-template>
     <ng-template st-row="surcharge" let-item let-index="index">
       {{ item.surcharge | currency }}
     </ng-template>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-23 13:39:58
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 17:58:28
+ * @LastEditTime : 2022-03-21 14:44:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -74,7 +74,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
   ui: SFUISchema = {};
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
-    { title: '小计（元）', render: 'price' },
+    { title: '小计（元）', render: 'prices' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-28 14:42:03
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-11 16:09:47
+ * @LastEditTime : 2022-03-21 14:43:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -152,6 +152,9 @@
     <ng-template st-row="price" let-item let-index="index">
       {{ item.price | currency }}
     </ng-template>
+    <ng-template st-row="prices" let-item let-index="index">
+      {{ item.price + item.surcharge  | currency }}
+    </ng-template>
     <ng-template st-row="surcharge" let-item let-index="index">
       {{ item.surcharge | currency }}
     </ng-template>

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

@@ -45,7 +45,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'expenseCodeLabel' },
-    { title: '小计（元）', render: 'price' },
+    { title: '小计（元）', render: 'prices' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },

src/app/routes/waybill-management/components/vehicle/vehicle.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-03-02 14:59:17
+ * @LastEditTime : 2022-03-21 14:50:07
  * @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\\vehicle.component.html
@@ -77,20 +77,20 @@
         <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
-        <div *ngIf="item.billExpenseDetailVOList.length > 0">
-          <p *ngFor="let data of item.billExpenseDetailVOList"> {{ data.costCodeLabel }}：{{ data.price | currency }} </p>
+        <div *ngIf="item?.billExpenseDetailVOList?.length > 0">
+          <p *ngFor="let data of item?.billExpenseDetailVOList"> {{ data?.costName }}：{{ data?.price | currency }} </p>
         </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
-        <div *ngIf="item.billExpenseDetailVOList.length > 0">
-          <p *ngFor="let data of item.billExpenseDetailVOList">
-            {{ data.costCodeLabel }}：{{ data.price | currency }}
-            <span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
+        <div *ngIf="item?.billExpenseDetails?.length > 0">
+          <p *ngFor="let data of item?.billExpenseDetails">
+            {{ data?.costName }}：{{ data?.price | currency }}
+            <span style="color: #f59a63">{{ data?.paymentStatusLabel }}</span>
           </p>
         </div>
       </ng-template>
       <ng-template st-row="wayBillCode" let-item let-index="index">
-        <a [routerLink]="'vehicle-detail/' + item.id">{{ item.wayBillCode }}</a>
+        <a [routerLink]="'vehicle-detail/' + item?.id">{{ item?.wayBillCode }}</a>
         <div>
           <span>{{item?.wayBillStatusLabel}}</span>
         </div>
@@ -99,7 +99,7 @@
         </div>
       </ng-template>
       <ng-template st-row="wayBill" let-item let-index="index">
-        <a [routerLink]="'/vehicle-detail/' + item.id">{{ item.billCode }}</a>
+        <a [routerLink]="'/vehicle-detail/' + item?.id">{{ item?.billCode }}</a>
       </ng-template>
       <ng-template st-row="goodsInfos" let-item let-index="index">
         <div>{{ item?.goodsInfos?.goodsName }}</div>