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

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-01-20 19:07:55
+ * @LastEditTime : 2022-02-10 10:30:22
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -142,8 +142,9 @@
   </st>
   <div>
     <div>
-      总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price  | currency }}</span> （运费￥{{
+      总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
-        totalObj?.price - attObj?.price  | currency}}，附加费￥{{ attObj?.price  | currency }}，附加费率{{i?.attPercent }}%）
+       （运费{{i?.totalFreight | currency}}，
+       附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate }}%）
     </div>
   </div>
   <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>

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-01-20 20:09:13
+ * @LastEditTime : 2022-02-10 10:30:23
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -130,11 +130,11 @@
 <nz-card nzTitle="运费信息" #distannce3>
   <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
   <div>
-    总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span>
+    总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
-     （运费{{totalObj?.price - attObj?.price | currency}}，
+     （运费{{i?.totalFreight | currency}}，
-     附加费{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%）
+     附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate }}%）
   </div>
-  <div>收款人：{{ i?.payeeName }}{{ i?.payeePhone }}</div>
+  <div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
 
 <nz-card nzTitle="附件信息"  #distannce4>

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

@@ -1,19 +1,29 @@
+/*
+ * @Description  : 
+ * @Version      : 1.0
+ * @Author       : Shiming
+ * @Date         : 2021-12-03 15:31:52
+ * @LastEditors  : Shiming
+ * @LastEditTime : 2022-02-10 09:53:00
+ * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.spec.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SupplyManagementVehicleDetailComponent } from './vehicle-detail.component';
+import { OrderManagementVehicleDetailComponent } from './vehicle-detail.component';
 
-describe('SupplyManagementVehicleDetailComponent', () => {
+describe('OrderManagementVehicleDetailComponent', () => {
-  let component: SupplyManagementVehicleDetailComponent;
+  let component: OrderManagementVehicleDetailComponent;
-  let fixture: ComponentFixture<SupplyManagementVehicleDetailComponent>;
+  let fixture: ComponentFixture<OrderManagementVehicleDetailComponent>;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [ SupplyManagementVehicleDetailComponent ]
+      declarations: [ OrderManagementVehicleDetailComponent ]
     })
     .compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SupplyManagementVehicleDetailComponent);
+    fixture = TestBed.createComponent(OrderManagementVehicleDetailComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
   });

src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html

@@ -4,11 +4,11 @@
  * @Author       : Shiming
  * @Date         : 2021-12-29 14:51:07
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 17:23:25
+ * @LastEditTime : 2022-02-10 10:19:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
+<nz-alert nzType="info" [nzMessage]="'已选择'+ data?.ids?.length + '条订单'" nzShowIcon></nz-alert>
 <sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
 <div class="modal-footer">
   <button nz-button type="button" (click)="close()">关闭</button>

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -233,7 +233,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             }
           }
         },
-        contactName2: {
+        name: {
           title: '管理员',
           type: 'string',
           ui: {