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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-04-11 10:15:16 +08:00
parent 6e5b2fd9b5
commit d2c5eedfce
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -40,16 +40,16 @@ export class PayableOrderComponent implements OnInit {
if (this.sf.value?.createTime) { if (this.sf.value?.createTime) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
createTime: { createTime: {
start: this.sf.value.createTime?.[0] || null, start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || null end: this.sf.value.createTime?.[1] || ''
} }
}); });
} }
if (this.sf.value?.phxdate) { if (this.sf.value?.phxdate) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
phxdate: { phxdate: {
start: this.sf.value.phxdate?.[0] || null, start: this.sf.value.phxdate?.[0] || '',
end: this.sf.value.phxdate?.[1] || null end: this.sf.value.phxdate?.[1] || ''
} }
}); });
} }

16
src/app/routes/financial-management/components/payment-order/payment-order.component.ts
View File

@ -23,23 +23,23 @@ export class PaymentOrderComponent implements OnInit {
_$expand = false; _$expand = false;
selectedRows: any[] = []; selectedRows: any[] = [];
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { } constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void { } ngOnInit(): void {}
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) { if (this.sf) {
let params = { ...this.sf.value }; let params = { ...this.sf.value };
if (params.payDate) { if (params.payDate) {
const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] } const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] };
params.payDate = payDate; params.payDate = payDate;
} }
if (params.payDate2) { if (params.payDate2) {
const payDate2 = { start: this.sf?.value?.payDate2?.[0], end: this.sf?.value?.payDate2?.[1] } const payDate2 = { start: this.sf?.value?.payDate2?.[0], end: this.sf?.value?.payDate2?.[1] };
params.payDate2 = payDate2; params.payDate2 = payDate2;
} }
if (params.createTime) { if (params.createTime) {
const createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] } const createTime = { start: this.sf?.value?.createTime?.[0] || '', end: this.sf?.value?.createTime?.[1] || '' };
params.createTime = createTime; params.createTime = createTime;
} }
Object.assign(requestOptions.body, params); Object.assign(requestOptions.body, params);
@ -95,7 +95,7 @@ export class PaymentOrderComponent implements OnInit {
}, },
paycode: { paycode: {
type: 'string', type: 'string',
title: '付款单号', title: '付款单号'
}, },
ltdId: { ltdId: {
type: 'string', type: 'string',
@ -125,7 +125,7 @@ export class PaymentOrderComponent implements OnInit {
widget: 'dict-select', widget: 'dict-select',
containsAllLabel: true, containsAllLabel: true,
params: { dictKey: 'pay:type' }, params: { dictKey: 'pay:type' },
placeholder: '请选择', placeholder: '请选择'
} }
}, },
paymode: { paymode: {
@ -264,7 +264,7 @@ export class PaymentOrderComponent implements OnInit {
{ {
text: '浏览', text: '浏览',
click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id]) click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
}, }
// { // {
// text: '修改', // text: '修改',
// } // }