fix bug
This commit is contained in:
@ -27,7 +27,7 @@ export class BillingOrderComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
|
||||
@ -39,13 +39,13 @@ export class CancellationInvoiceComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
if (this.sf.value.createTime) {
|
||||
if (this.sf?.value.createTime) {
|
||||
Object.assign(requestOptions.body, {
|
||||
createTime: {
|
||||
start: this.sf.value.createTime?.[0] || '',
|
||||
end: this.sf.value.createTime?.[1] || ''
|
||||
start: this.sf?.value.createTime?.[0] || '',
|
||||
end: this.sf?.value.createTime?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -47,7 +47,7 @@ export class AddCartComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
|
||||
@ -63,7 +63,7 @@ export class AddOwnerComponent implements OnInit {
|
||||
});
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
|
||||
@ -45,7 +45,7 @@ export class ETCBlacklistComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
this.selectedRows = [];
|
||||
|
||||
@ -27,7 +27,7 @@ export class ETCInvoicedListComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
|
||||
@ -27,14 +27,14 @@ export class ETCInvoicedLogsComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
exTime: {
|
||||
start: this.sf.value.exTime?.[0] || '',
|
||||
end: this.sf.value.exTime?.[1] || ''
|
||||
start: this.sf?.value.exTime?.[0] || '',
|
||||
end: this.sf?.value.exTime?.[1] || ''
|
||||
},
|
||||
invoiceMakeTime: {
|
||||
start: this.sf.value.invoiceMakeTime?.[0] || '',
|
||||
end: this.sf.value.invoiceMakeTime?.[1] || ''
|
||||
start: this.sf?.value.invoiceMakeTime?.[0] || '',
|
||||
end: this.sf?.value.invoiceMakeTime?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -66,7 +66,7 @@ export class ETCInvoicedLogsComponent implements OnInit {
|
||||
const params = { listSource: 1, pageSize: -1 };
|
||||
if (this.sf) {
|
||||
Object.assign(params, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
this.service.downloadFile(this.service.$api_export_invoice_logs_page, params);
|
||||
|
||||
@ -30,7 +30,7 @@ export class ETCInvoicedRequestedComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
this.selectedRows = [];
|
||||
|
||||
@ -94,10 +94,10 @@ export class ExpressDetailModalComponent implements OnInit {
|
||||
Object.assign(requestOptions.body, { expressno: this.expressCode });
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
createTime: {
|
||||
start: this.sf.value.createTime?.[0] || null,
|
||||
end: this.sf.value.createTime?.[1] || null
|
||||
start: this.sf?.value.createTime?.[0] || null,
|
||||
end: this.sf?.value.createTime?.[1] || null
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -86,10 +86,10 @@ export class ExpressInfoComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
createTime: {
|
||||
start: this.sf.value.createTime?.[0] || '',
|
||||
end: this.sf.value.createTime?.[1] || ''
|
||||
start: this.sf?.value.createTime?.[0] || '',
|
||||
end: this.sf?.value.createTime?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -86,7 +86,7 @@ export class AddCollectionInvoiceModalComponent implements OnInit {
|
||||
|
||||
sure() {
|
||||
const params: any = {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
};
|
||||
// this.service.request(this.service.$api_add_staff, params).subscribe(res => {
|
||||
// if (res) {
|
||||
|
||||
@ -24,7 +24,7 @@ export class AddCostDetailComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value
|
||||
...this.sf?.value
|
||||
});
|
||||
}
|
||||
return requestOptions;
|
||||
|
||||
@ -42,14 +42,14 @@ export class InputInvoiceDetailComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
billTime: {
|
||||
start: this.sf.value.billTime?.[0] || null,
|
||||
end: this.sf.value.billTime?.[1] || null
|
||||
start: this.sf?.value.billTime?.[0] || null,
|
||||
end: this.sf?.value.billTime?.[1] || null
|
||||
},
|
||||
feedate: {
|
||||
start: this.sf.value.feedate?.[0] || null,
|
||||
end: this.sf.value.feedate?.[1] || null
|
||||
start: this.sf?.value.feedate?.[0] || null,
|
||||
end: this.sf?.value.feedate?.[1] || null
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -31,14 +31,14 @@ export class InputInvoiceComponent implements OnInit {
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
createtime: {
|
||||
start: this.sf.value.createtime?.[0] || '',
|
||||
end: this.sf.value.createtime?.[1] || ''
|
||||
start: this.sf?.value.createtime?.[0] || '',
|
||||
end: this.sf?.value.createtime?.[1] || ''
|
||||
},
|
||||
invdate: {
|
||||
start: this.sf.value.invdate?.[0] || '',
|
||||
end: this.sf.value.invdate?.[1] || ''
|
||||
start: this.sf?.value.invdate?.[0] || '',
|
||||
end: this.sf?.value.invdate?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@ -54,7 +54,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
|
||||
this.selectedRows = [];
|
||||
Object.assign(requestOptions.body, { vatappHId: this.id });
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, { ...this.sf.value });
|
||||
Object.assign(requestOptions.body, { ...this.sf?.value });
|
||||
}
|
||||
return requestOptions;
|
||||
};
|
||||
|
||||
@ -42,7 +42,7 @@ export class InvoiceRequestedComponent {
|
||||
}
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
createTime: {
|
||||
start: this.sf?.value?.createTime?.[0] || '',
|
||||
end: this.sf?.value?.createTime?.[1] || ''
|
||||
|
||||
@ -42,10 +42,10 @@ export class InvoicedListComponent implements OnInit {
|
||||
Object.assign(requestOptions.body,{sts: '3'})
|
||||
if (this.sf) {
|
||||
Object.assign(requestOptions.body, {
|
||||
...this.sf.value,
|
||||
...this.sf?.value,
|
||||
invoicedate: {
|
||||
start: this.sf.value.invoicedate?.[0] || '',
|
||||
end: this.sf.value.invoicedate?.[1] || ''
|
||||
start: this.sf?.value.invoicedate?.[0] || '',
|
||||
end: this.sf?.value.invoicedate?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user