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

merge partner

Browse Source
This commit is contained in:
Taric Xin
2022-03-23 14:24:21 +08:00
parent 106e32189a 5dfe804a17
commit ff99a1dfb7
226 changed files with 15751 additions and 993 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,26 +23,26 @@ export class PaymentOrderComponent implements OnInit {
_$expand = false;
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) => {
if (this.sf) {
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;
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.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;
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 );
Object.assign(requestOptions.body, params);
}
return requestOptions;
};
@ -123,7 +123,7 @@ export class PaymentOrderComponent implements OnInit {
title: '付款类型',
ui: {
widget: 'dict-select',
containsAllLable: true,
containsAllLabel: true,
params: { dictKey: 'pay:type' },
placeholder: '请选择',
}
@ -133,7 +133,7 @@ export class PaymentOrderComponent implements OnInit {
title: '付款方式',
ui: {
widget: 'dict-select',
containsAllLable: true,
containsAllLabel: true,
params: { dictKey: 'pay:mode' },
placeholder: '请选择',
visibleIf: {

6
src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts
View File

@ -28,8 +28,9 @@ export class WithdrawalsRecordComponent {
refundStatus: any = '';
msg = '';
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) { }
constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
ngOnInit(): void { }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@ -42,6 +43,7 @@ export class WithdrawalsRecordComponent {
refundStatus: this.refundStatus || null
});
}
delete requestOptions?.body?.expand;
return requestOptions;
};
@ -81,7 +83,7 @@ export class WithdrawalsRecordComponent {
disabled: () => this.service.http.loading,
type: 'default',
onClick: () => {
if (!this.msg) {
if (!this.msg || this.msg.trim().length === 0) {
this.service.msgSrv.warning('请填写拒绝原因 ');
return false;
}

4
src/app/routes/financial-management/services/freight-account.service.ts
View File

@ -128,8 +128,8 @@ export class FreightAccountService extends ShipperBaseService {
// 根据预收款ID获取核销信息明细
$api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId';
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
constructor(public injector: Injector) {
super(injector);
}
getReceiptUrl(url: string, params: any) {