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

'fixbug'

Browse Source
This commit is contained in:
1107302052
2022-03-18 01:19:54 +08:00
parent cadf4acd85
commit 8f4646501d
2 changed files with 41 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -56,17 +56,23 @@
<nz-card nzTitle="基本信息">
<sv-container col="3">
<sv-title>货物信息</sv-title>
<ng-container *ngFor="let item of i?.goodsInfoList">
<ng-container *ngFor="let item of i?.goodsInfoVOList">
<sv label="货物名称">
{{ item?.goodsName }}
{{item.goodsTypeName}} > {{item.goodsName}}
</sv>
<sv label="货物数量"> {{ item?.weight }}吨 | {{ item?.volume }}方 </sv>
<sv label="剩余"> {{ 10 }}吨 | {{ 10 }}方 </sv>
<sv label="用车需求"> {{ item?.carModel }} | {{ item?.carLength }}米 </sv>
<sv label="承运信息">
{{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
{{ i?.carrierInformationVO?.driverLicensePlate }}
<sv label="货物数量">
{{item.weight}}吨 / {{item.volume>=0?item.volume:'-'}}方
</sv>
<sv label="剩余">
{{i?.surplusWeight!==null?i?.surplusWeight:'--'}}吨 / {{i?.surplusVolume!==null?i?.surplusVolume:'-'}}方
</sv>
<sv label="用车需求">
{{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
</sv>
<!-- <sv label="承运信息">
{{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
{{i?.carrierInformationVO?.driverLicensePlate}}
</sv> -->
<!-- <sv label="当前指派">
<a (click)="viewCurrentAssign(i)">查看</a>
</sv> -->
@ -123,15 +129,16 @@
</div>
<nz-divider class="mb-xs mt-xs"></nz-divider>
<div class="text-right">
<label>单价：</label>
<label>运费单价：</label>
<span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{
freightType[item?.freightType] }}</span>
<span>（附加费率{{i?.rate * 100 | number: '0.2-2'}}%）</span>
</div>
</div>
</div>
</div>
</nz-card>
<nz-card nzTitle="关联运单">
<nz-card nzTitle="关联订单">
<sv-container col="5">
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)

34
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -991,9 +991,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
];
// 运费信息
const expenseList = [
{ expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay || 0, id: this.sf7data?.prePayId || '' },
{ expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay || 0, id: this.sf7data?.toPayId || '' },
{ expenseCode: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '' }
{ expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay || 0, id: this.sf7data?.prePayId || '' ,resourceId: this.sf7data?.PREresourceId || '' },
{ expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay || 0, id: this.sf7data?.toPayId || '' ,resourceId: this.sf7data?.RECEresourceId || ''},
{ expenseCode: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '' ,resourceId: this.sf7data?.BACKresourceId || ''}
];
// 从“再下一单”过来，将所有的子参数内的id都删除
if (this.PageStatus === '整车下一单') {
@ -1288,14 +1288,28 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
receiptAddress: res?.supplementaryInformationVO.address || '',
remarks: res?.supplementaryInformationVO?.remarks || ''
};
// this.sf7data = {
// prePay: res?.shippingInformationVO?.prePay,
// toPay: res?.shippingInformationVO?.toPay,
// // oilCardPay: 0,
// receiptPay: res?.shippingInformationVO?.receiptPay,
// total: res?.shippingInformationVO?.totalFee,
// appendFee: res?.shippingInformationVO?.appendFee,
// paymentDays: res?.paymentDays
// };
this.sf7data = {
prePay: res?.shippingInformationVO?.prePay,
toPay: res?.shippingInformationVO?.toPay,
// oilCardPay: 0,
receiptPay: res?.shippingInformationVO?.receiptPay,
total: res?.shippingInformationVO?.totalFee,
appendFee: res?.shippingInformationVO?.appendFee,
paymentDays: res?.paymentDays
prePay: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'PRE')[0]?.price || null,
toPay: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'RECE')[0]?.price || null,
receiptPay: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'BACK')[0]?.price || null,
appendFee: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]?.price || 0,
paymentDays: res?.paymentDays || '',
prePayId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'PRE')[0]?.id || '',
PREresourceId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'PRE')[0]?.resourceId || '',
RECEresourceId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'RECE')[0]?.resourceId || '',
BACKresourceId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'BACK')[0]?.resourceId || '',
toPayId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'RECE')[0]?.id || '',
receiptPayId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'BACK')[0]?.id || '',
appendFeeId: res?.expenseVOList?.filter((data: any) => data.expenseCode === 'ATT')[0]?.id || ''
};
this.sf7.setValue('/prePay', this.sf7data.prePay);
this.sf7.setValue('/toPay', this.sf7data.toPay);