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

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

Browse Source
This commit is contained in:
Taric Xin
2022-05-05 17:50:03 +08:00
parent c195d8abf9 7ed30159ac
commit 69041b829b
7 changed files with 28 additions and 21 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) {
if (item.orderType === '1') {
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}`);
} 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') {
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}`);
} 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) {
if (item.billType === '1') {
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}`);
} 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') {
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}`);
} else if (item.billType === '3') {
window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`);
}
}

8
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -174,15 +174,11 @@
<!--
结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
[hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
-->
<nz-card #distannce3
[hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
[nzBorderless]="true" class="mb0">
<!-- <ng-template #priceTitel>
<span>运费信息</span><span
style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
</ng-template> -->
[nzBorderless]="true" class="mb0">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>运费信息</span>

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

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

8
src/app/routes/sys-setting/components/announcement-message/announcement-message.component.ts
View File

@ -131,10 +131,10 @@ export class AnnouncementMessageComponent implements OnInit {
// { label: '运营后台', value: this.envSrv.env.appId },
// { label: '货主后台', value: this.envSrv.env.HzappId },
// { label: '司机端', value: this.envSrv.env.sjappId }
{ label: '全平台', value: 0},
{ label: '运营后台', value: 3},
{ label: '货主后台', value: 2 },
{ label: '司机端', value: 1 },
{ label: '全平台', value: '0'},
{ label: '运营后台', value: '3'},
{ label: '货主后台', value: '2' },
{ label: '司机端', value: '1' },
],
ui: {
widget: 'select',

5
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -339,7 +339,8 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
enum: [
{ label: '全部', value: '' },
{ label: '货主注册', value: 1 },
{ label: '平台添加', value: 2 }
{ label: '平台添加', value: 2 },
{ label: '数据迁移', value: 4 },
],
default: '',
ui: {
@ -411,7 +412,7 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
className: 'text-center',
index: 'source',
type: 'enum',
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加', 4: '数据迁移' },
width: 130
},
{ title: '申请时间', className: 'text-center', index: 'createTime', width: 180, type: 'date' },

1
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -190,7 +190,6 @@
{{detailData?.carOwner }}
</ng-template>
</sv>
<<<<<<< HEAD=======>>>>>>> 6d503f57e2434e5c0a0baa406ac42fe2b7a8a9b5
</sv-container>
<sv-container col="1">
<sv label="行驶证照片">