This commit is contained in:
wangshiming
2022-05-11 09:40:29 +08:00
parent 478e9717aa
commit 8030dc4e78
2 changed files with 10 additions and 13 deletions

View File

@ -46,27 +46,27 @@ export class PayableOrderDetailComponent implements OnInit {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...this.sf?.value, ...this.sf?.value,
billTime: { billTime: {
start: this.sf?.value.billTime?.[0] || null, start: this.sf?.value.billTime?.[0] || '',
end: this.sf?.value.billTime?.[1] || null end: this.sf?.value.billTime?.[1] || ''
}, },
feedate: { feedate: {
start: this.sf?.value.feedate?.[0] || null, start: this.sf?.value.feedate?.[0] || '',
end: this.sf?.value.feedate?.[1] || null end: this.sf?.value.feedate?.[1] || ''
} }
}); });
if (this.sf?.value.billTime) { if (this.sf?.value.billTime) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
billTime: { billTime: {
start: this.sf?.value.billTime?.[0] || null, start: this.sf?.value.billTime?.[0] || '',
end: this.sf?.value.billTime?.[1] || null end: this.sf?.value.billTime?.[1] || ''
} }
}); });
} }
if (this.sf?.value.feedate) { if (this.sf?.value.feedate) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
feedate: { feedate: {
start: this.sf?.value.feedate?.[0] || null, start: this.sf?.value.feedate?.[0] || '',
end: this.sf?.value.feedate?.[1] || null end: this.sf?.value.feedate?.[1] || ''
} }
}); });
} }
@ -134,9 +134,6 @@ export class PayableOrderDetailComponent implements OnInit {
ui: { ui: {
widget: 'sl-from-to-search', widget: 'sl-from-to-search',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
billTime: { billTime: {

View File

@ -403,8 +403,8 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
enum: { 10: '整车发货', 20: '大宗发货' }, enum: { 10: '整车发货', 20: '大宗发货' },
width: 140 width: 140
}, },
{ title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 150 }, { title: '渠道销售', className: 'text-center', render: 'promotersTelephone', width: 200 },
{ title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, { title: '合伙人', className: 'text-center', render: 'partnerName', width: 200 },
{ title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 }, { title: '客服人员', className: 'text-center', render: 'customerServiceIdLabel', width: 150 },
{ title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
{ {