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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-25 15:36:58 +08:00
parent da6bf03ad8
commit deb9848fb7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -653,13 +653,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
const prePay = this.sf7.value.prePay || 0; const prePay = this.sf7.value.prePay || 0;
const toPay = this.sf7.value.toPay || 0 const toPay = this.sf7.value.toPay || 0
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;
const params = { const params = {
shipperId: this.envCache?.enterpriseId, shipperId: this.envCache?.enterpriseId,
enterpriseInfoId: this.envCache?.networkTransporterId, enterpriseInfoId: this.envCache?.networkTransporterId,
totalFreight:subtotal, totalFreight:subtotal,
fuelCardAmount:oilCardPay, // fuelCardAmount:oilCardPay,
resourcetype:'1' resourcetype:'1'
} }
this.service this.service
@ -1146,7 +1146,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.sf7data = { this.sf7data = {
prePay: res?.shippingInformationVO?.prePay, prePay: res?.shippingInformationVO?.prePay,
toPay: res?.shippingInformationVO?.toPay, toPay: res?.shippingInformationVO?.toPay,
oilCardPay: 0, // oilCardPay: 0,
receiptPay: res?.shippingInformationVO?.receiptPay, receiptPay: res?.shippingInformationVO?.receiptPay,
total: res?.shippingInformationVO?.totalFee, total: res?.shippingInformationVO?.totalFee,
appendFee: res?.shippingInformationVO?.appendFee, appendFee: res?.shippingInformationVO?.appendFee,

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

@ -664,13 +664,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
const prePay = this.sf7.value.prePay || 0; const prePay = this.sf7.value.prePay || 0;
const toPay = this.sf7.value.toPay || 0 const toPay = this.sf7.value.toPay || 0
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;
const params = { const params = {
shipperId: this.envCache?.enterpriseId, shipperId: this.envCache?.enterpriseId,
enterpriseInfoId: this.envCache?.networkTransporterId, enterpriseInfoId: this.envCache?.networkTransporterId,
totalFreight:subtotal, totalFreight:subtotal,
fuelCardAmount:oilCardPay, // fuelCardAmount:oilCardPay,
resourcetype:'1' resourcetype:'1'
} }
this.service this.service