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

666

Browse Source
This commit is contained in:
heqinghang
2022-01-27 17:17:05 +08:00
parent 3a37e012a6
commit b8e2d21f4b
3 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
View File

@ -32,7 +32,7 @@
{{headerInfo?.payMoney}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
<se label="要求付款日期" required>
{{headerInfo?.payDate}}
</se>
@ -46,7 +46,7 @@
{{headerInfo?.payRemarks}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="150" col="1">
<se label="付款方式" required>
{{headerInfo?.payModeLabel}}
</se>

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

@ -29,9 +29,20 @@ export class PaymentOrderComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
});
let params = {...this.sf.value};
if(params.payDate){
const payDate = {start:this.sf?.value?.payDate?.[0],end:this.sf?.value?.payDate?.[1]}
params.payDate = payDate;
}
if(params.payDate2){
const payDate2 = {start:this.sf?.value?.payDate2?.[0],end:this.sf?.value?.payDate2?.[1]}
params.payDate2 = payDate2;
}
if(params.createTime){
const createTime = {start:this.sf?.value?.createTime?.[0],end:this.sf?.value?.createTime?.[1]}
params.createTime = createTime;
}
Object.assign(requestOptions.body,params );
}
return requestOptions;
};
@ -82,7 +93,7 @@ export class PaymentOrderComponent implements OnInit {
hidden: true
}
},
paycodes: {
paycode: {
type: 'string',
title: '付款单号',
},
@ -111,9 +122,10 @@ export class PaymentOrderComponent implements OnInit {
type: 'string',
title: '付款类型',
ui: {
widget: 'select',
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'pay:type' },
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
}
@ -123,9 +135,10 @@ export class PaymentOrderComponent implements OnInit {
type: 'string',
title: '付款方式',
ui: {
widget: 'select',
widget: 'dict-select',
containsAllLable: true,
params: { dictKey: 'pay:mode' },
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
}
@ -143,7 +156,7 @@ export class PaymentOrderComponent implements OnInit {
}
}
},
billHCodes: {
billCode: {
type: 'string',
title: '订单号',
ui: {
@ -155,7 +168,7 @@ export class PaymentOrderComponent implements OnInit {
}
}
},
paydate: {
payDate: {
title: '要求付款日期',
type: 'string',
ui: {
@ -166,7 +179,7 @@ export class PaymentOrderComponent implements OnInit {
}
} as SFDateWidgetSchema
},
createTi1me: {
payDate2: {
title: '确认日期',
type: 'string',
ui: {
@ -177,25 +190,19 @@ export class PaymentOrderComponent implements OnInit {
}
} as SFDateWidgetSchema
},
waybillHCodes: {
waybillCode: {
type: 'string',
title: '运单号',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
}
}
},
feeHCodes: {
feeCode: {
type: 'string',
title: '费用号',
ui: {
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
expand: (value: boolean) => value
}
@ -212,7 +219,7 @@ export class PaymentOrderComponent implements OnInit {
}
} as SFDateWidgetSchema
},
remarks: {
payRemarks: {
type: 'string',
title: '付款备注',
ui: {
@ -240,7 +247,7 @@ export class PaymentOrderComponent implements OnInit {
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) }
},
{ title: '付款类型', index: 'payType', width: 130 },
{ title: '付款类型', index: 'payTypeLabel', width: 130 },
{ title: '付款方式', index: 'payModeLabel', width: 130 },
{ title: '结算客户', index: 'cnoName', width: 160 },
{ title: '收款人', index: 'hrToLabel', width: 150 },

8
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -252,7 +252,7 @@ export class InvoiceRequestedComponent implements OnInit {
placeholder: '请输入'
}
},
orderSn3: {
feeHCode: {
type: 'string',
title: '费用号',
ui: {
@ -271,7 +271,7 @@ export class InvoiceRequestedComponent implements OnInit {
asyncData: () => this.service.getEnterpriseProject()
}
},
ltd: {
ltdId: {
type: 'string',
title: '网络货运人',
ui: {
@ -285,7 +285,7 @@ export class InvoiceRequestedComponent implements OnInit {
},
default: ''
},
otherReq: {
otherremarks: {
type: 'string',
title: '其他需求',
enum: [{ label: '全部', value: '' }],
@ -396,7 +396,7 @@ export class InvoiceRequestedComponent implements OnInit {
{ title: '注册地址', index: 'registerAddr', width: 140 },
{ title: '注册电话', index: 'registerPhone', width: 120 },
{ title: '服务名称', index: 'vatname', width: 100 },
{ title: '销货清单', index: 'isdetail', width: 100 },
{ title: '销货清单', index: 'isdetail', width: 100,format:(item)=>{return item.isdetail === 0 ? '不需要':'需要'} },
{ title: '其他要求', index: 'otherremarks', width: 100 },
{ title: '申请人', index: 'applyName', width: 90 },
{ title: '申请时间', index: 'applyTime', type: 'date', width: 150 },