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-04-01 11:04:42 +08:00
parent 846d321151 d960d9f1fb
commit ffede3caf1
18 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -275,7 +275,7 @@
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
</div>
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
<div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>

2
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -532,7 +532,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
}
],
// 运费信息
// 收款人
// 车队长
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间

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

@ -156,7 +156,7 @@
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
</div>
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
<div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

2
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -506,7 +506,7 @@ export class OrderManagementBulkComponent implements OnInit {
render: 'driverName'
},
{
title: '收款人',
title: '车队长',
className: 'text-left',
width: '180px',
index: 'payeeName',

2
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -353,7 +353,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
render: 'driverName'
},
{
title: '收款人',
title: '车队长',
className: 'text-left',
width: '180px',
index: 'payeeName',

2
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -364,7 +364,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
render: 'driverName'
},
{
title: '收款人',
title: '车队长',
className: 'text-left',
width: '180px',
index: 'payeeName',

4
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -182,7 +182,7 @@ export class OrderManagementRiskComponent implements OnInit {
},
payeeName: {
type: 'string',
title: '收款人',
title: '车队长',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
@ -314,7 +314,7 @@ export class OrderManagementRiskComponent implements OnInit {
render: 'driverName'
},
{
title: '收款人',
title: '车队长',
className: 'text-left',
width: '200px',
render: 'payeeName'

2
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -251,7 +251,7 @@
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
<div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

2
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -520,7 +520,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
],
// 运费信息
billExpenseDetailDTOList: this.st._data,
// 收款人
// 车队长
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间

2
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -163,7 +163,7 @@
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
<div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

1
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -765,6 +765,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
if (res) {
this.resetSF;
this.st.load();
this.getGoodsSourceStatistical();
}
});
}

4
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-03-31 14:20:41
* @LastEditTime : 2022-04-01 10:39:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -28,7 +28,7 @@
{{item.BACK | currency}}
</ng-template>
<ng-template st-row="traiPrice" let-item let-index="index">
{{item.surcharge + item.traiPrice | currency}}
{{ item.traiPrice | currency}}
</ng-template>
<ng-template st-row="surcharge" let-item let-index="index">
{{item.surcharge | currency}}

2
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -190,7 +190,7 @@
</span>
<span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
</h3>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
<div>车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
</div>
</div>
</nz-card>

4
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
View File

@ -154,7 +154,7 @@
totalObj?.price - attObj?.price | currency
}}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
<div>车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
</nz-card> -->
<nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
<h2>{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
@ -176,7 +176,7 @@
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
</div>
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
<div>车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

2
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -302,7 +302,7 @@ export class WaybillManagementBulkComponent implements OnInit {
render: 'driverName'
},
{
title: '收款人',
title: '车队长',
className: 'text-left',
width: '200px',
render: 'payeeName',

2
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -157,7 +157,7 @@
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
<div>车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>

2
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime : 2022-03-23 14:49:13
* @LastEditTime : 2022-04-01 10:49:30
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts

2
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -322,7 +322,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
render: 'driverName'
},
{
title: '收款人',
title: '车队长',
className: 'text-left',
width: '200px',
render: 'payeeName'