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 60108072..895ed730 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
@@ -94,8 +94,8 @@
{{ i?.unloadPlanTime }}
-->
{{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
- {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件
- {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件
+ {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方
+ {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
{
- // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
- // if (res) {
- // this.service.msgSrv.success('变更运费成功');
- // modal.destroy();
- // this.st.reload();
- // }
- // });
- // return false;
- // }
});
modal.afterClose.subscribe((result) => {
if (result) {
diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
index 186d9e9d..14065be9 100644
--- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
+++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
@@ -61,7 +61,7 @@ export class VehicleFreightPeopleComponent implements OnInit {
};
this.ui = {
'*': {
- spanLabelFixed: 100,
+ spanLabelFixed: 130,
grid: { span: 16 }
}
};
@@ -80,7 +80,7 @@ export class VehicleFreightPeopleComponent implements OnInit {
console.log(params);
this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {
if (res) {
- this.modal.destroy();
+ this.modal.destroy(true);
this.service.msgSrv.success('变更运费成功');
}
});
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 4ca6d51d..5302dbeb 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
@@ -133,13 +133,13 @@
- {{i?.goodsResource?.insuranceTypeLabel}}
+ {{i?.insuranceTypeLabel}}
- {{i?.goodsResource?.goodsValue !==null?(i?.goodsResource?.goodsValue|currency)+'元':'-'}}
+ {{i?.goodsValue !==null?(i?.goodsValue|currency)+'元':'-'}}
- {{i?.goodsResource?.insurancePremium!==null?(i?.goodsResource?.insurancePremium |currency)+'元':'-'}}
+ {{i?.insurancePremium!==null?(i?.insurancePremium |currency)+'元':'-'}}
@@ -181,28 +181,25 @@
- {{i?.receiptType == 1 ?'是':'否'}}
+ {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
-
- {{i?.receiptTypeLabel}}
+
+ {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
-
- {{i?.receiptUser}}{{ i?.receiptUserPhone ? ' /' + i?.receiptUserPhone : ''}}
+ {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }}
+
+ {{ i?.supplementaryInformationVO?.area }}
-
- {{i?.receiptPlace}}
+
+ {{ i?.supplementaryInformationVO?.address }}
-
- {{i?.receiptAddress}}
-
-
-
-
+
+
- {{i?.goodsResource?.remarks}}
+ {{ i?.supplementaryInformationVO?.remarks }}
diff --git a/src/app/routes/waybill-management/services/waybill-management.service.ts b/src/app/routes/waybill-management/services/waybill-management.service.ts
index d4b60735..aeea4f10 100644
--- a/src/app/routes/waybill-management/services/waybill-management.service.ts
+++ b/src/app/routes/waybill-management/services/waybill-management.service.ts
@@ -56,7 +56,7 @@ export class WaybillManagementServe extends BaseService {
// 获取轨迹
$api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
// 获取订单司机轨迹
- $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`;
+ $api_get_getAppDriverPosition = `/api/sdc/wayBillOperate/getAppDriverPosition`;
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
constructor(public injector: Injector) {