{{ dataList?.resourceCode }}
- 待接单
- 已接单
- 已取消
+ 待接单
+ 已接单
+ 已取消
@@ -99,17 +99,18 @@
运费信息
-
-
{{'到货后15天内支付运费' }}
-
{{item.price | currency:'￥' }}
-
{{400 | currency:'￥' }}
-
+
预付：{{dataList?.expenseList?.prePay | currency: '￥' }}
+
油卡：{{dataList?.expenseList?.oilCardPay | currency: '￥'}}
+
到付：{{dataList?.expenseList?.toPay | currency: '￥'}}
+
回单付：{{dataList?.expenseList?.receiptPay | currency: '￥'}}
+
保险费：{{dataList?.expenseList?.insuranceFee | currency: '￥'}}
+
附加费保险费：{{dataList?.expenseList?.appendFee | currency: '￥'}}
-
{{400 | currency }}
+ {{dataList?.expenseList?.totalFee | currency: '￥' }}
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
index 1bafd013..c6d5ef16 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts
@@ -1,13 +1,13 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-08 10:21:11
+ * @LastEditTime: 2021-12-08 14:35:47
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle-detail\vehicle-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
@@ -33,6 +33,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
+ private router: Router,private ar: ActivatedRoute
) {
}
@@ -54,7 +55,18 @@ export class SupplyManagementVehicleDetailComponent implements OnInit {
this.dataList = res
})
}
-
+ // 修改货源
+ modification() {
+ this.router.navigate(['/supply-management/vehicle-amend', this.id], {
+ relativeTo: this.ar
+ })
+ }
+ // 再下一单
+ nextOrder() {
+ this.router.navigate(['/supply-management/vehicle-amend', this.id], {
+ relativeTo: this.ar
+ })
+ }
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
index 26cb58f6..587a4c71 100644
--- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts
@@ -121,7 +121,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
}
},
- no1: {
+ dischargePlace: {
type: 'string',
title: '卸货地',
ui: {
@@ -130,7 +130,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
}
},
- no4: {
+ shipperAppUserName: {
type: 'string',
title: '货主',
ui: {
@@ -139,7 +139,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
}
},
- sex: {
+ auditStatus: {
title: '审核状态',
type: 'string',
enum: [
@@ -155,7 +155,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
} as SFSelectWidgetSchema,
},
- appId: {
+ enterpriseInfoName: {
type: 'string',
title: '网络货运人',
ui: {
@@ -292,12 +292,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
{
text: '货源审核',
click: (_record) => this.audit(_record, 1),
- iif: item => item.status === 1,
+ // iif: item => item.auditStatus === 1,
},
{
text: '修改货源',
click: (_record) => this.amend(_record),
- iif: item => item.status === 1 || item.status === 2,
+ // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
},
{
text: '修改运费',
@@ -305,17 +305,17 @@ export class SupplyManagementVehicleComponent implements OnInit {
},
{
text: '取消货源',
- iif: item => item.status === 1 || item.status === 2,
+ // iif: item => item.auditStatus === 1 || item.auditStatus === 2,
// click: (_record) => this.delOne(_record),
},
{
text: '再下一单',
- // click: (_record) => this.editOne(_record),
+ click: (_record) => this.nextOrder(_record),
},
{
text: '重新指派',
click: (_record) => this.assignedCar(_record),
- iif: item => item.status === 2,
+ // iif: item => item.auditStatus === 2,
},
],
},
@@ -448,4 +448,9 @@ export class SupplyManagementVehicleComponent implements OnInit {
relativeTo: this.ar
})
}
+ nextOrder(item: any) {
+ this.router.navigate(['/supply-management/vehicle-amend', item.id], {
+ relativeTo: this.ar
+ })
+ }
}
diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts
index 0fee00cb..21e7cf7a 100644
--- a/src/app/shared/services/business/user.service.ts
+++ b/src/app/shared/services/business/user.service.ts
@@ -2,8 +2,8 @@
* @Description:
* @Author: wsm
* @Date: 2021-06-22 10:25:33
- * @LastEditTime: 2021-06-23 20:25:05
- * @LastEditors: Do not edit
+ * @LastEditTime: 2021-12-08 15:40:21
+ * @LastEditors: Please set LastEditors
* @Reference:
*/
import { Inject, Injectable, Injector } from '@angular/core';
@@ -25,11 +25,11 @@ export class EAUserService extends BaseService {
/**
* 账号密码登录
*/
- $api_login_by_account = `/api/mdc/cuc/user/login?_allow_anonymous=true`;
+ $api_login_by_account = `api/mdc/cuc/user/login?_allow_anonymous=true`;
/**
* 手机号登录
*/
- $api_login_by_mobile = `/api/mdc/cuc/user/sms/login?_allow_anonymous=true`;
+ $api_login_by_mobile = `api/mdc/cuc/user/sms/login?_allow_anonymous=true`;
// 登录路径
private $api_login = `/scce/cuc/cuc/user/login?_allow_anonymous=true`;
private $api_captcha_login = `/scce/cuc/cuc/user/sms/login?_allow_anonymous=true`;