Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-05 17:32:41 +08:00
parent 6d503f57e2
commit 3929eb58cf
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -468,8 +468,10 @@ export class DatatableFundReportingComponent implements OnInit {
routeToOrder(item: any) { routeToOrder(item: any) {
if (item.orderType === '1') { if (item.orderType === '1') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} else { } else if (item.orderType === '2') {
window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
} else if (item.orderType === '3'){
this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.orderId]);
} }
} }
@ -477,9 +479,11 @@ export class DatatableFundReportingComponent implements OnInit {
if (item.orderType === '1') { if (item.orderType === '1') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`); window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`);
} else { } else if (item.orderType === '2') {
window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`); window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`);
} else if (item.orderType === '3') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`);
} }
} }

8
src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts
View File

@ -599,8 +599,10 @@ export class DatatableOrderReportingComponent implements OnInit {
routeToOrder(item: any) { routeToOrder(item: any) {
if (item.billType === '1') { if (item.billType === '1') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} else { } else if (item.billType === '2') {
window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`);
} else if (item.billType === '3') {
window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`);
} }
} }
@ -608,8 +610,10 @@ export class DatatableOrderReportingComponent implements OnInit {
if (item.billType === '1') { if (item.billType === '1') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`); window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
} else { } else if (item.billType === '2') {
window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`); window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`);
} else if (item.billType === '3') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
} }
} }

11
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -281,10 +281,13 @@ export class PartnerListComponent {
approvalStatus: { approvalStatus: {
type: 'string', type: 'string',
title: '认证审核状态', title: '认证审核状态',
enum: [
{ value: '', label: '全部' },
{ value: 1, label: '企业' },
{ value: 2, label: '个人' }
],
ui: { ui: {
widget: 'dict-select', widget: 'select',
containsAllLabel: true,
params: { dictKey: 'pay:mode' },
placeholder: '请选择', placeholder: '请选择',
visibleIf: { visibleIf: {
expand: (value: boolean) => value expand: (value: boolean) => value
@ -350,7 +353,7 @@ export class PartnerListComponent {
title: '合伙人状态', title: '合伙人状态',
enum: [ enum: [
{ value: '', label: '全部' }, { value: '', label: '全部' },
{ value: 0, label: '启用' }, { value: 0, label: '正常' },
{ value: 1, label: '冻结' } { value: 1, label: '冻结' }
], ],
ui: { ui: {