diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
index e9f144f7..6f4f8781 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@@ -300,14 +300,6 @@ export class InvoiceRequestedComponent {
         otherremarks: {
           type: 'string',
           title: '其他需求',
-<<<<<<< HEAD
-=======
-          enum: [
-            { label: '全部', value: '' },
-            { label: '是', value: true },
-            { label: '否', value: false }
-          ],
->>>>>>> ace758617fd29baf5826fe50da26dfa1b86ae71e
           ui: {
             visibleIf: {
               expand: (value: boolean) => value
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
index bda12764..13710e4c 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@@ -164,6 +164,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>
diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
index 2345b5b4..3a6ddbe1 100644
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
+++ b/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-11 15:54:52
+ * @LastEditTime : 2022-03-21 14:56:00
  * @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
@@ -42,7 +42,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
   ];
   logColumns: STColumn[] = [
     { title: '款项', index: 'costCodeLabel' },
-    { title: '小计（元）', render: 'price' },
+    { title: '小计（元）', render: 'prices' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
index c3aa6526..0395a748 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
@@ -148,6 +148,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>
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
index 861a7995..18b300f9 100644
--- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/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:26:01
+ * @LastEditTime : 2022-03-21 14:55:34
  * @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
@@ -42,7 +42,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro
   billExpenses: any[] = []; //运费信息表格信息
   logColumns: STColumn[] = [
     { title: '款项', index: 'costCodeLabel' },
-    { title: '小计（元）', render: 'price' },
+    { title: '小计（元）', render: 'prices' },
     { title: '运输费（元）', render: 'price' },
     { title: '附加费（元）', render: 'surcharge' },
     { title: '支付时间', index: 'paymentTime' },
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
index bb6339c8..dbad08c7 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html
+++ b/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-21 14:52:24
+ * @LastEditTime : 2022-03-21 14:53:06
  * @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