diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
index 446da77d..1bc78f61 100644
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/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 @@
- 总计:{{ totalObj?.price | currency }} (运费¥{{
- totalObj?.price - attObj?.price | currency}},附加费¥{{ attObj?.price | currency }},附加费率{{i?.attPercent }}%)
+ 总计:{{ i?.totalAmount | currency }}
+ (运费{{i?.totalFreight | currency}},
+ 附加费{{ i?.totalSurcharge | currency }},附加费率{{i?.totalRate }}%)
收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
index b9bc3418..9e39743b 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/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 @@
- 总计:{{ totalObj?.price | currency }}
- (运费{{totalObj?.price - attObj?.price | currency}},
- 附加费{{ attObj?.price | currency }},附加费率{{i?.attPercent }}%)
+ 总计:{{ i?.totalAmount | currency }}
+ (运费{{i?.totalFreight | currency}},
+ 附加费{{ i?.totalSurcharge | currency }},附加费率{{i?.totalRate }}%)
- 收款人:{{ i?.payeeName }}{{ i?.payeePhone }}
+ 收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.spec.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.spec.ts
index eae95066..3e4df0bf 100644
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.spec.ts
+++ b/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', () => {
- let component: SupplyManagementVehicleDetailComponent;
- let fixture: ComponentFixture;
+describe('OrderManagementVehicleDetailComponent', () => {
+ let component: OrderManagementVehicleDetailComponent;
+ let fixture: ComponentFixture;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
- declarations: [ SupplyManagementVehicleDetailComponent ]
+ declarations: [ OrderManagementVehicleDetailComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(SupplyManagementVehicleDetailComponent);
+ fixture = TestBed.createComponent(OrderManagementVehicleDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
index 49955266..fb348ad7 100644
--- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
+++ b/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.
-->
-
+