Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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

@@ -83,12 +83,6 @@
           <span>{{ item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
         </div>
       </ng-template>
-      <!-- 我的出价 -->
-      <ng-template st-row="mybidInfo" let-item let-index="index" class="temp_p">
-        <div *ngIf="item.mybidInfo.length > 0">
-          <p *ngFor="let data of item.mybidInfo"> {{ data.expenseName }}：￥{{ data.price | number: '0.2-2' }} </p>
-        </div>
-      </ng-template>
       <ng-template st-row="mybidDetailInfo" let-item let-index="index">
         <div *ngIf="item.mybidDetailInfo.length > 0">
           <p *ngFor="let data of item.mybidDetailInfo">

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

@@ -353,12 +353,6 @@ resourceStatus: any;
         className: 'text-left',
         render: 'billCode'
       },
-      {
-        title: '我的出价',
-        width: '200px',
-        className: 'text-right',
-        render: 'mybidInfo'
-      },
       {
         title: '运费明细',
         width: '250px',

src/app/routes/supply-management/services/supply-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 11:10:14
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-24 16:23:02
+ * @LastEditTime : 2022-02-28 11:31:44
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -53,7 +53,7 @@ export class SupplyManagementService extends BaseService {
   // 整车计算附加费
   $api_getCalculatedSurcharge = `/api/sdc/expense/getCalculatedSurcharge`;
   // 整车计算附加费率
-  $api_getcalculatedServiceRate = `/api/sdc/expense/getcalculatedServiceRate`;
+  $api_getcalculatedServiceRate = `/api/sdc/expense/getAdditionalRate`;
   // 代发整车货源
   $api_consignWhole = `/api/sdc/goodsResourceOperate/consignWhole`;
   // 代发大宗货源