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-03-01 19:59:23 +08:00
parent e983ba5457
commit f2ac497c48
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -715,24 +715,33 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
const receiptPay = this.sf7.value.receiptPay || 0; const receiptPay = this.sf7.value.receiptPay || 0;
const oilCardPay = 0; const oilCardPay = 0;
const subtotal = prePay + toPay + receiptPay; const subtotal = prePay + toPay + receiptPay;
console.log(this?.sf1.value?.enterpriseInfoName)
if(this?.sf1.value?.enterpriseInfoName) {
console.log('5555');
}
console.log(this?.sf1.value?.enterpriseInfoId)
console.log(this?.sf1data?.enterpriseInfoId)
console.log(this?.sf1?.value?.enterpriseInfoName ? this?.sf1?.value?.enterpriseInfoName : this?.sf1data?.enterpriseInfoId || '')
const params = { const params = {
shipperId: this?.sf1.value?.shipperAppUserId, shipperId: this?.sf1?.value?.shipperAppUserId,
enterpriseInfoId: this?.sf1.value?.enterpriseInfoName, enterpriseInfoId: this?.sf1data?.enterpriseInfoId || '',
totalFreight: subtotal, totalFreight: subtotal,
fuelCardAmount: oilCardPay, fuelCardAmount: oilCardPay,
resourcetype: '1' resourcetype: '1'
}; };
this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => { this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => {
console.log('999');
console.log(this.envCache);
if (res) { if (res) {
console.log(res)
this.sf7.setValue('/appendFee', res.surcharge); this.sf7.setValue('/appendFee', res.surcharge);
this.sf7.setValue('/subtotal', subtotal); this.sf7.setValue('/subtotal', subtotal);
this.sf7.setValue('/total', subtotal + res.surcharge); this.sf7.setValue('/total', subtotal + res.surcharge);
let items = this?.sf1data?.enterpriseInfoId || '';
console.log(items)
this.service this.service
.request( .request(
this.service.$api_getAdditionalRate + this.service.$api_getAdditionalRate +
`?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName || ''}&resourcetype='1'` `?shipperId=${this?.sf1?.value?.shipperAppUserId || ''}&enterpriseInfoId=${items}&resourcetype='1'`
) )
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
@ -1146,6 +1155,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
} }
this.sf1data = { this.sf1data = {
enterpriseInfoName: res?.enterpriseInfoName, enterpriseInfoName: res?.enterpriseInfoName,
enterpriseInfoId: res?.enterpriseInfoId,
dispatchPhone: res?.dispatchPhone, dispatchPhone: res?.dispatchPhone,
dispatchName: res?.dispatchName, dispatchName: res?.dispatchName,
externalResourceCode: res?.externalResourceCode, externalResourceCode: res?.externalResourceCode,

2
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -747,7 +747,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
const subtotal = prePay + toPay + receiptPay; const subtotal = prePay + toPay + receiptPay;
const params = { const params = {
shipperId: this?.sf1.value?.shipperAppUserId, shipperId: this?.sf1.value?.shipperAppUserId,
enterpriseInfoId: this?.sf1.value?.enterpriseInfoName, enterpriseInfoId: this?.sf1.value?.enterpriseInfoName || '',
totalFreight: subtotal, totalFreight: subtotal,
fuelCardAmount: oilCardPay, fuelCardAmount: oilCardPay,
resourcetype: '1' resourcetype: '1'