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-07 16:23:33 +08:00
parent ef1f8e98e7
commit e61ba7f25e
4 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -698,7 +698,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
...this.sf1.value,
...this.sf7.value,
unLoadingPlaceDTOList: LoadingList,
goodsInfoDTOList: goodsInfoDTOList
goodsInfoDTOList: goodsInfoDTOList,
estimatedKilometers: this.totalDistance,
estimatedTravelTime: this.totalTime,
};
params.freightPrice = this.totalFees;
const modalRef = this.modalService.create({
@ -885,6 +887,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
if (res?.enterpriseProjectId) {
this.enterpriseProjectIds = res.enterpriseProjectId;
}
this.totalDistance = res?.estimatedKilometers;
this.totalTime = res?.estimatedTravelTime;
this.sf1data = {
dispatchPhone: res?.dispatchPhone,
dispatchName: res?.dispatchName,

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

@ -619,7 +619,9 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
...this.sf1.value,
unLoadingPlaceDTOList: LoadingList,
goodsInfoDTOList: goodsInfoList,
...this.sf6.value
...this.sf6.value,
estimatedKilometers: this.totalDistance,
estimatedTravelTime: this.totalTime,
};
const modalRef = this.modalService.create({
nzTitle: '运输协议',

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

@ -657,19 +657,16 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
prePay: {
type: 'number',
title: '预付',
default: 0,
ui: { widget: 'custom' }
},
toPay: {
type: 'number',
title: '到付',
default: 0,
ui: { widget: 'custom' }
},
receiptPay: {
type: 'number',
title: '回单付',
default: 0,
ui: { widget: 'custom' }
},
subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
@ -1001,7 +998,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
...this.sf5.value,
...this.sf6.value,
expenseDTOList: expenseList,
paymentDays: this.sf7.value.paymentDays
paymentDays: this.sf7.value.paymentDays,
estimatedKilometers: this.totalDistance,
estimatedTravelTime: this.totalTime,
};
const modalRef = this.modalService.create({
nzTitle: '运输协议',
@ -1126,6 +1125,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
if (res?.enterpriseProjectId) {
this.enterpriseProjectIds = res.enterpriseProjectId;
}
this.totalDistance = res?.estimatedKilometers;
this.totalTime = res?.estimatedTravelTime;
this.sf1data = {
enterpriseInfoName: res?.enterpriseInfoName,
enterpriseInfoId: res?.enterpriseInfoId,

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

@ -614,19 +614,16 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
prePay: {
type: 'number',
title: '预付',
default: 0,
ui: { widget: 'custom' }
},
toPay: {
type: 'number',
title: '到付',
default: 0,
ui: { widget: 'custom' }
},
receiptPay: {
type: 'number',
title: '回单付',
default: 0,
ui: { widget: 'custom' }
},
subtotal: { type: 'number', title: '小计', default: 0, ui: { widget: 'custom' } as SFNumberWidgetSchema },
@ -924,20 +921,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
{ 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 || '' }
];
console.log(this.sf55?.value);
// const params = {
// id: '',
// ...this.sf1.value,
// unLoadingPlaceDTOList: LoadingList,
// unloadingTime: format(this.validateForm1.value?.unloadingTime, 'yyyy-MM-dd HH:mm:ss'),
// loadingTime: format(this.validateForm1.value?.loadingTime, 'yyyy-MM-dd HH:mm:ss'),
// goodsInfoDTOList: goodsInfoList,
// ...this.sf5.value,
// ...this.sf6.value,
// expenseDTOList: expenseList,
// paymentDays: this.sf7.value?.paymentDays,
// insuranceType:this.sf55?.value?.insuranceType,
// };
const params = {
id: '',
...this.sf1.value,
@ -948,7 +931,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
...this.sf5.value,
...this.sf6.value,
expenseDTOList: expenseList,
paymentDays: this.sf7.value.paymentDays
paymentDays: this.sf7.value.paymentDays,
estimatedKilometers: this.totalDistance,
estimatedTravelTime: this.totalTime,
};
console.log(params);
const modalRef = this.modalService.create({