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-02 18:59:43 +08:00
parent 69ba80fd81
commit 8e8dac953c
1 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -153,7 +153,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
console.log(q === ' ');
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
@ -690,7 +689,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
};
}
getRegionCode(regionCode: any) {
console.log(regionCode);
return this.service
.request(this.service.$api_get_enterprise_project, { id: regionCode })
.pipe(
@ -715,13 +713,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
const receiptPay = this.sf7.value.receiptPay || 0;
const oilCardPay = 0;
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 = {
shipperId: this?.sf1?.value?.shipperAppUserId,
enterpriseInfoId: this?.sf1data?.enterpriseInfoId || '',
@ -731,12 +722,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
};
this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => {
if (res) {
console.log(res);
this.sf7.setValue('/appendFee', res.surcharge);
this.sf7.setValue('/subtotal', subtotal);
this.sf7.setValue('/total', subtotal + res.surcharge);
let items = this?.sf1data?.enterpriseInfoId || '';
console.log(items);
this.service
.request(
this.service.$api_getAdditionalRate +
@ -985,9 +974,8 @@ export class SupplyManagementOnecarPublishComponent 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 || '' }
];
// 从“再下一单”过来，将所有的子参数内的id都删除
if ((this.PageStatus = '整车下一单')) {
if ((this.PageStatus === '整车下一单')) {
LoadingList.forEach((ele: any) => {
delete ele.id;
});
@ -1010,7 +998,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
expenseDTOList: expenseList,
paymentDays: this.sf7.value.paymentDays
};
const modalRef = this.modalService.create({
nzTitle: '运输协议',
nzContent: TranAgreementComponent,
@ -1026,24 +1013,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
// 提交
submit(submitType?: string, params?: any): void {
// const params: any = {
// ...this.sf1.value,
// ...this.sf5.value,
// ...this.sf6.value,
// paymentDays: this.sf7.value.paymentDays,
// loadingTime: this.loadingTime,
// unloadingTime: this.unloadingTime,
// unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
// goodsInfoDTOList: [
// {
// ...this.sf4.value,
// ...this.sf3.value,
// carModel: this.sf4.value.carModel.join(','),
// carLength: this.sf4.value.carLength.join(',')
// }
// ]
// };
console.log(params);
if (submitType) {
if (submitType == 'assign') {
this.chooseFamifiar(params);