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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-28 20:26:30 +08:00
parent 6cc12ff451
commit 2aeaa09e14
112 changed files with 339 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts
View File

@ -38,7 +38,7 @@ export class AbnormalGoldComponent extends BasicTableComponent implements OnInit
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus });
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
Object.assign(requestOptions.body, { ...this.sf?.value });
}
return requestOptions;
};

2
src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
View File

@ -36,7 +36,7 @@ export class AdvanceCollectionComponent extends BasicTableComponent {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
Object.assign(requestOptions.body, { ...this.sf?.value });
}
return requestOptions;
};

2
src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts
View File

@ -125,7 +125,7 @@ export class CwcBankCardManagementBindComponent implements OnInit {
submit() {
if (this.sf.valid) {
this.service.request(this.service.$api_bank_card_add, { ...this.sf.value }).subscribe(res => {
this.service.request(this.service.$api_bank_card_add, { ...this.sf?.value }).subscribe(res => {
if (res) {
this.modalRef.destroy(true);
}

10
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -42,14 +42,14 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
feedate: {
start: this.sf.value.feedate?.[0] || '',
end: this.sf.value.feedate?.[1] || ''
start: this.sf?.value.feedate?.[0] || '',
end: this.sf?.value.feedate?.[1] || ''
},
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] || ''
}
});
}

12
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
View File

@ -40,10 +40,10 @@ export class DriverAccountDetailComponent implements OnInit {
});
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] || ''
}
});
}
@ -78,7 +78,7 @@ export class DriverAccountDetailComponent implements OnInit {
exportList() {
this.service.exportStart(
{
...this.sf.value,
...this.sf?.value,
pageSize: -1,
ltdId: this.params.ltdId,
projectId: this.params.projectId,
@ -86,8 +86,8 @@ export class DriverAccountDetailComponent implements OnInit {
roleId: this.params.roleId,
bankType: this.params.bankType,
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] || ''
}
},
this.service.$api_get_exportAccountBalanceDriverByOperatorPage

8
src/app/routes/financial-management/components/driver-account/driver-account.component.ts
View File

@ -38,12 +38,12 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { accountType: 2 });
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
if (this.sf.value.createTime) {
Object.assign(requestOptions.body, { ...this.sf?.value });
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] || ''
}
});
}

4
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
View File

@ -39,7 +39,7 @@ export class FreightAccountDetailComponent implements OnInit {
});
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] || ''
@ -85,7 +85,7 @@ export class FreightAccountDetailComponent implements OnInit {
exportList() {
this.service.exportStart(
{
...this.sf.value,
...this.sf?.value,
pageSize: -1,
ltdId: this.params.ltdId,
projectId: this.params.projectId,

8
src/app/routes/financial-management/components/freight-account/freight-account.component.ts
View File

@ -44,12 +44,12 @@ export class FreightAccountComponent extends BasicTableComponent implements OnIn
beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { accountType: 1 });
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
if (this.sf.value.createTime) {
Object.assign(requestOptions.body, { ...this.sf?.value });
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] || ''
}
});
}

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

@ -44,29 +44,29 @@ export class PayableOrderDetailComponent implements OnInit {
Object.assign(requestOptions.body, { phxHId: this.billHId });
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
}
});
if (this.sf.value.billTime) {
if (this.sf?.value.billTime) {
Object.assign(requestOptions.body, {
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
}
});
}
if (this.sf.value.feedate) {
if (this.sf?.value.feedate) {
Object.assign(requestOptions.body, {
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
}
});
}

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

@ -45,21 +45,21 @@ export class PayableOrderComponent 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] || ''
}
});
}
if (this.sf.value?.phxdate) {
if (this.sf?.value?.phxdate) {
Object.assign(requestOptions.body, {
phxdate: {
start: this.sf.value.phxdate?.[0] || '',
end: this.sf.value.phxdate?.[1] || ''
start: this.sf?.value.phxdate?.[0] || '',
end: this.sf?.value.phxdate?.[1] || ''
}
});
}

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

@ -39,15 +39,15 @@ export class PaymentOrderDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
payHId: this.id,
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
}
});
} else {

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

@ -38,7 +38,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
let params = { ...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;

10
src/app/routes/financial-management/components/payment-record/payment-record.component.ts
View File

@ -38,14 +38,14 @@ export class PaymentRecordComponent extends BasicTableComponent implements OnIni
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
applyDate: {
start: this.sf.value.applyDate?.[0] || '',
end: this.sf.value.applyDate?.[1] || ''
start: this.sf?.value.applyDate?.[0] || '',
end: this.sf?.value.applyDate?.[1] || ''
},
handlerDate: {
start: this.sf.value.handlerDate?.[0] || '',
end: this.sf.value.handlerDate?.[1] || ''
start: this.sf?.value.handlerDate?.[0] || '',
end: this.sf?.value.handlerDate?.[1] || ''
}
});
}

14
src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
View File

@ -34,13 +34,13 @@ export class PlatformAccountDetailComponent implements OnInit {
Object.assign(requestOptions.body, { ...this.params });
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] || ''
}
});
}
@ -68,11 +68,11 @@ export class PlatformAccountDetailComponent implements OnInit {
exportList() {
this.service.exportStart(
{
...this.sf.value,
...this.sf?.value,
...this.params,
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] || ''
},
pageSize: -1
},

4
src/app/routes/financial-management/components/platform-account/platform-account.component.ts
View File

@ -36,7 +36,7 @@ export class PlatformAccountComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
Object.assign(requestOptions.body, { ...this.sf?.value });
}
this.loadStatistics(requestOptions.body);
return requestOptions;
@ -45,7 +45,7 @@ export class PlatformAccountComponent implements OnInit {
loadInfo() {
const params = {};
if (this.sf) {
Object.assign(params, { ...this.sf.value });
Object.assign(params, { ...this.sf?.value });
}
this.service.request(this.service.$api_get_platform_account_header, params).subscribe(res => {
if (res) {

16
src/app/routes/financial-management/components/platform-account/setting-financial/setting-financial.component.ts
View File

@ -64,13 +64,13 @@ export class SettingFinancialComponent implements OnInit {
}
sure() {
if (!this.sf.value.roleIds || this.sf.value.roleIds.length === 0) {
if (!this.sf?.value.roleIds || this.sf?.value.roleIds.length === 0) {
this.service.msgSrv.error('员工角色不能为空！');
return;
}
this.roleNames = [];
this.roleList.forEach((item: { id: any; roleName: string }) => {
this.sf.value.roleIds.forEach((ele: any) => {
this.sf?.value.roleIds.forEach((ele: any) => {
if (ele === item.id) {
this.roleNames.push(item.roleName);
}
@ -78,11 +78,11 @@ export class SettingFinancialComponent implements OnInit {
});
if (this.i.id === 0) {
const params: any = {
...this.sf.value,
roleId: this.sf.value.roleIds,
...this.sf?.value,
roleId: this.sf?.value.roleIds,
roleNames: this.roleNames.join(','),
telephone: this.sf.value.phone,
staffName: this.sf.value.name
telephone: this.sf?.value.phone,
staffName: this.sf?.value.name
};
// this.service.request(this.service.$api_addStaff, params).subscribe((res) => {
// if (res) {
@ -95,8 +95,8 @@ export class SettingFinancialComponent implements OnInit {
} else {
const params: any = {
appUserId: this.i.appUserId,
staffName: this.sf.value.name,
roleId: this.sf.value.roleIds,
staffName: this.sf?.value.name,
roleId: this.sf?.value.roleIds,
telephone: this.i.telephone
};
// this.service.request(this.service.$api_editorStaff, params).subscribe((res) => {

14
src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts
View File

@ -37,21 +37,21 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value.brmdate) {
if (this.sf?.value.brmdate) {
Object.assign(requestOptions.body, {
brmdate: {
start: this.sf.value.brmdate?.[0] || '',
end: this.sf.value.brmdate?.[1] || ''
start: this.sf?.value.brmdate?.[0] || '',
end: this.sf?.value.brmdate?.[1] || ''
}
});
}
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] || ''
}
});
}

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

@ -45,13 +45,13 @@ export class ReceivableOrderDetailComponent implements OnInit {
Object.assign(requestOptions.body, { ahxHId: this.id });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value.feedate?.[0]) {
if (this.sf?.value.feedate?.[0]) {
Object.assign(requestOptions.body, {
feedate: {
start: this.sf.value.feedate?.[0] || '',
end: this.sf.value.feedate?.[1] || ''
start: this.sf?.value.feedate?.[0] || '',
end: this.sf?.value.feedate?.[1] || ''
}
});
}

14
src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts
View File

@ -47,21 +47,21 @@ export class ReceivableOrderComponent 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] || ''
}
});
}
if (this.sf.value?.ahxdate) {
if (this.sf?.value?.ahxdate) {
Object.assign(requestOptions.body, {
ahxdate: {
start: this.sf.value.ahxdate?.[0] || '',
end: this.sf.value.ahxdate?.[1] || ''
start: this.sf?.value.ahxdate?.[0] || '',
end: this.sf?.value.ahxdate?.[1] || ''
}
});
}

8
src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
View File

@ -33,12 +33,12 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
if (this.sf.value.createTime) {
Object.assign(requestOptions.body, { ...this.sf?.value });
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] || ''
}
});
}

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

@ -41,10 +41,10 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit
Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
refundExecuteTime: {
start: this.sf.value.refundExecuteTime?.[0] || '',
end: this.sf.value.refundExecuteTime?.[1] || ''
start: this.sf?.value.refundExecuteTime?.[0] || '',
end: this.sf?.value.refundExecuteTime?.[1] || ''
}
});
}

6
src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts
View File

@ -30,10 +30,10 @@ export class TransactionFlowComponent extends BasicTableComponent {
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] || ''
}
});
}

14
src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
View File

@ -34,21 +34,21 @@ export class VoucherManagementComponent extends BasicTableComponent implements O
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] || null,
end: this.sf.value.createTime?.[1] || null
start: this.sf?.value.createTime?.[0] || null,
end: this.sf?.value.createTime?.[1] || null
}
});
}
if (this.sf.value.vctime) {
if (this.sf?.value.vctime) {
Object.assign(requestOptions.body, {
vctime: {
start: this.sf.value.vctime?.[0] || null,
end: this.sf.value.vctime?.[1] || null
start: this.sf?.value.vctime?.[0] || null,
end: this.sf?.value.vctime?.[1] || null
}
});
}

14
src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts
View File

@ -34,21 +34,21 @@ export class VoucherListComponent implements OnInit {
Object.assign(requestOptions.body, { vc2code: this.vc2code });
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] || null,
end: this.sf.value.createTime?.[1] || null
start: this.sf?.value.createTime?.[0] || null,
end: this.sf?.value.createTime?.[1] || null
}
});
}
if (this.sf.value.vctime) {
if (this.sf?.value.vctime) {
Object.assign(requestOptions.body, {
vctime: {
start: this.sf.value.vctime?.[0] || null,
end: this.sf.value.vctime?.[1] || null
start: this.sf?.value.vctime?.[0] || null,
end: this.sf?.value.vctime?.[1] || null
}
});
}

10
src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts
View File

@ -42,14 +42,14 @@ export class VoucherSummaryComponent extends BasicTableComponent implements OnIn
Object.assign(requestOptions.body, { isvc2: 1 });
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] || ''
},
vctime: {
start: this.sf.value.vctime?.[0] || '',
end: this.sf.value.vctime?.[1] || ''
start: this.sf?.value.vctime?.[0] || '',
end: this.sf?.value.vctime?.[1] || ''
}
});
}

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

@ -44,10 +44,10 @@ export class WithdrawalsRecordComponent extends BasicTableComponent {
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] || ''
},
});
}