fix bug
This commit is contained in:
@ -153,7 +153,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
searchDebounceTime: 300,
|
searchDebounceTime: 300,
|
||||||
searchLoadingText: '搜索中...',
|
searchLoadingText: '搜索中...',
|
||||||
onSearch: (q: any) => {
|
onSearch: (q: any) => {
|
||||||
console.log(q === ' ');
|
|
||||||
let str = q.replace(/^\s+|\s+$/g, '');
|
let str = q.replace(/^\s+|\s+$/g, '');
|
||||||
if (str) {
|
if (str) {
|
||||||
return this.service
|
return this.service
|
||||||
@ -690,7 +689,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
getRegionCode(regionCode: any) {
|
getRegionCode(regionCode: any) {
|
||||||
console.log(regionCode);
|
|
||||||
return this.service
|
return this.service
|
||||||
.request(this.service.$api_get_enterprise_project, { id: regionCode })
|
.request(this.service.$api_get_enterprise_project, { id: regionCode })
|
||||||
.pipe(
|
.pipe(
|
||||||
@ -715,13 +713,6 @@ 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?.sf1data?.enterpriseInfoId || '',
|
enterpriseInfoId: this?.sf1data?.enterpriseInfoId || '',
|
||||||
@ -731,12 +722,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
};
|
};
|
||||||
this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => {
|
this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => {
|
||||||
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 || '';
|
let items = this?.sf1data?.enterpriseInfoId || '';
|
||||||
console.log(items);
|
|
||||||
this.service
|
this.service
|
||||||
.request(
|
.request(
|
||||||
this.service.$api_getAdditionalRate +
|
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: '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: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '' }
|
||||||
];
|
];
|
||||||
|
|
||||||
// 从“再下一单”过来,将所有的子参数内的id都删除
|
// 从“再下一单”过来,将所有的子参数内的id都删除
|
||||||
if ((this.PageStatus = '整车下一单')) {
|
if ((this.PageStatus === '整车下一单')) {
|
||||||
LoadingList.forEach((ele: any) => {
|
LoadingList.forEach((ele: any) => {
|
||||||
delete ele.id;
|
delete ele.id;
|
||||||
});
|
});
|
||||||
@ -1010,7 +998,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
expenseDTOList: expenseList,
|
expenseDTOList: expenseList,
|
||||||
paymentDays: this.sf7.value.paymentDays
|
paymentDays: this.sf7.value.paymentDays
|
||||||
};
|
};
|
||||||
|
|
||||||
const modalRef = this.modalService.create({
|
const modalRef = this.modalService.create({
|
||||||
nzTitle: '运输协议',
|
nzTitle: '运输协议',
|
||||||
nzContent: TranAgreementComponent,
|
nzContent: TranAgreementComponent,
|
||||||
@ -1026,24 +1013,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
|||||||
}
|
}
|
||||||
// 提交
|
// 提交
|
||||||
submit(submitType?: string, params?: any): void {
|
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) {
|
||||||
if (submitType == 'assign') {
|
if (submitType == 'assign') {
|
||||||
this.chooseFamifiar(params);
|
this.chooseFamifiar(params);
|
||||||
|
|||||||
Reference in New Issue
Block a user