From b7fdd5ea57ae4b99e2d3a4239688a4fe3b40b092 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 20:11:53 +0800 Subject: [PATCH 1/4] fix bug --- .../busiindex/busiindex.component.html | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html index 01b5aed3..6c1d4188 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html @@ -1,11 +1,21 @@ + - +
- + @@ -23,11 +33,11 @@ [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"> - +
- + From 6cc12ff451106d358e8adc2c0a1eb07f77d7db22 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 20:21:04 +0800 Subject: [PATCH 2/4] fix bug --- .../components/fund-reporting/fund-reporting.component.ts | 2 +- .../components/abnormal-gold/abnormal-gold.component.ts | 2 +- .../advance-collection/advance-collection.component.ts | 2 +- .../components/cost-management/cost-management.component.ts | 2 +- .../components/driver-account/driver-account.component.ts | 2 +- .../components/freight-account/freight-account.component.ts | 2 +- .../components/payment-record/payment-record.component.ts | 2 +- .../components/platform-account/platform-account.component.ts | 2 +- .../components/recharge-record/recharge-record.component.ts | 2 +- .../components/refund-record/refund-record.component.ts | 2 +- .../components/transaction-flow/transaction-flow.component.ts | 2 +- .../components/voucher-summary/voucher-summary.component.ts | 2 +- .../withdrawals-record/withdrawals-record.component.ts | 2 +- .../components/billing-order/billing-order.component.ts | 2 +- .../components/etc-blacklist/etc-blacklist.component.ts | 4 ++-- .../invoice-requested/invoice-requested.component.ts | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index fa6f9e4d..0ccfd57d 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -413,7 +413,7 @@ export class DatatableFundReportingComponent implements OnInit { * 异步导出 */ export() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fund_reporting); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_fund_reporting); } openWainingModal(content: string, title = '提示') { diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index 77f25e8c..f3970d72 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -179,6 +179,6 @@ export class AbnormalGoldComponent extends BasicTableComponent implements OnInit } // 导出 exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); } } diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index 334c030e..9f8144d8 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -42,7 +42,7 @@ export class AdvanceCollectionComponent extends BasicTableComponent { }; exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_reportYskBla); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_reportYskBla); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 7e0458e2..1ad29585 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -84,7 +84,7 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator); } routeTo(url: string, params?: any, status?: any) { diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 47e3e0cc..1baa6f41 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -70,7 +70,7 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index 51d45ce9..c26e2187 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -72,7 +72,7 @@ export class FreightAccountComponent extends BasicTableComponent implements OnIn } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportShipperAccountBalanceByOperator); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 8acbf17f..86dfee36 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -263,6 +263,6 @@ export class PaymentRecordComponent extends BasicTableComponent implements OnIni } // 导出 exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportBillPaymentApplicationList); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportBillPaymentApplicationList); } } diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index 0fda4eae..688f145d 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -249,7 +249,7 @@ export class PlatformAccountComponent implements OnInit { } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator); } // 提现 diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index 75cbd5d3..c0c336d9 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -76,7 +76,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportPageByOperator); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts index 70569f0b..3b98803e 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts @@ -262,6 +262,6 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit } // 导出 exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportBillRefundApplicationList); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportBillRefundApplicationList); } } diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index ca397864..56d9c6ce 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -225,6 +225,6 @@ export class TransactionFlowComponent extends BasicTableComponent { ]; } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage); } } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts index 0f556f33..e10ff9d9 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts @@ -78,7 +78,7 @@ export class VoucherSummaryComponent extends BasicTableComponent implements OnIn } exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_fico_vch_page); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_fico_vch_page); } private initSF(): SFSchema { diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index cdb58228..22825710 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -279,6 +279,6 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { } // 导出 exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_asyncExportRefundApplicationList); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_asyncExportRefundApplicationList); } } diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 521040b2..00b51946 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -55,7 +55,7 @@ export class BillingOrderComponent implements OnInit { } export() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_InvoicedBillInfoPage); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_InvoicedBillInfoPage); } private initSF(): SFSchema { diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index ad17492a..a03001a6 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -298,9 +298,9 @@ export class ETCBlacklistComponent implements OnInit { // 导出 exprot() { if (this.tabType == 1) { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_aficoShipperWhiteList_asyncExport); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_aficoShipperWhiteList_asyncExport); } else { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_ficoCarWhiteList_asyncExport); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_get_ficoCarWhiteList_asyncExport); } } } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 09aa5176..d8a74f3e 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -318,7 +318,7 @@ export class InvoiceRequestedComponent { // 导出 exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page); + this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page); } private initSF(): SFSchema { From 2aeaa09e143afdaab842a804d50b7170f241d78b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 28 Apr 2022 20:26:30 +0800 Subject: [PATCH 3/4] fix bug --- .../edit-name/edit-name.component.ts | 2 +- .../contract-template-detail.component.ts | 10 +++--- .../components/policy/policy.component.ts | 2 +- .../compliance/salesman/salesman.component.ts | 2 +- .../customtable/driver/driver.component.ts | 2 +- .../mancustomtable.component.ts | 2 +- .../customtable/owner/owner.component.ts | 2 +- .../abnormal-gold/abnormal-gold.component.ts | 2 +- .../advance-collection.component.ts | 2 +- .../bind/bind.component.ts | 2 +- .../cost-management.component.ts | 10 +++--- .../driver-account-detail.component.ts | 12 +++---- .../driver-account.component.ts | 8 ++--- .../freight-account-detail.component.ts | 4 +-- .../freight-account.component.ts | 8 ++--- .../payable-order-detail.component.ts | 22 ++++++------ .../payable-order/payable-order.component.ts | 14 ++++---- .../payment-order-detail.component.ts | 10 +++--- .../payment-order/payment-order.component.ts | 2 +- .../payment-record.component.ts | 10 +++--- .../platform-account-detail.component.ts | 14 ++++---- .../platform-account.component.ts | 4 +-- .../setting-financial.component.ts | 16 ++++----- .../receipt-order/receipt-order.component.ts | 14 ++++---- .../receivable-order-detail.component.ts | 8 ++--- .../receivable-order.component.ts | 14 ++++---- .../recharge-record.component.ts | 8 ++--- .../refund-record/refund-record.component.ts | 6 ++-- .../transaction-flow.component.ts | 6 ++-- .../voucher-management.component.ts | 14 ++++---- .../voucher-list/voucher-list.component.ts | 14 ++++---- .../voucher-summary.component.ts | 10 +++--- .../withdrawals-record.component.ts | 6 ++-- .../system-logs/system-logs.component.ts | 6 ++-- .../system-supply-logs.component.ts | 6 ++-- .../system-waybill-logs.component.ts | 6 ++-- .../user-logs/user-logs.component.ts | 6 ++-- .../version-logs/version-logs.component.ts | 6 ++-- .../auth-drawer/auth-drawer.component.ts | 2 +- .../index/menu-modal/menu-modal.component.ts | 8 ++--- .../vehicle-detail-change.component.ts | 24 ++++++------- .../update-freight.component.ts | 4 +-- .../cancel-confirm.component.ts | 4 +-- .../modal/vehicle/cancel/cancel.component.ts | 4 +-- .../freight-people.component.ts | 4 +-- .../modify-rate/modify-rate.component.ts | 6 ++-- .../update-freight.component.ts | 18 +++++----- .../withdrawals-record.component.ts | 6 ++-- .../components/edit/edit.component.ts | 2 +- .../components/edit/edit.component.ts | 2 +- .../channel-approve.component.ts | 2 +- .../channel-reject.component.ts | 2 +- .../partner-approve.component.ts | 2 +- .../partner-reject.component.ts | 2 +- .../banner/components/add/add.component.ts | 4 +-- .../components/edit/edit.component.ts | 2 +- .../add-etp-partner.component.ts | 20 +++++------ .../add-personal-partner.component.ts | 10 +++--- .../index/partner-list.component.ts | 2 +- .../partner-audit-modal.component.ts | 6 ++-- .../rebate-setting/add/add.component.ts | 2 +- .../components/record/record.component.ts | 8 ++--- .../scrollimg/components/add/add.component.ts | 4 +-- .../add-driver/add-driver.component.ts | 4 +-- .../set-captain/set-captain.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- .../import-supply/import-supply.component.ts | 6 ++-- .../cart-config-action-modal.component.ts | 10 +++--- .../network-freight/new/new.component.ts | 4 +-- .../note-management.component.ts | 2 +- .../organization-modal.component.ts | 2 +- .../role-management/edit/edit.component.ts | 2 +- .../role-management.component.ts | 2 +- .../sms-template/sms-template.component.ts | 2 +- .../staff-management.component.html | 2 +- .../staff-management.component.ts | 2 +- .../staff-modal/staff-modal.component.ts | 6 ++-- .../individual-income.component.ts | 2 +- .../billing-order/billing-order.component.ts | 2 +- .../cancellation-invoice.component.ts | 8 ++--- .../add-cart/add-cart.component.ts | 2 +- .../add-owner/add-owner.component.ts | 2 +- .../etc-blacklist/etc-blacklist.component.ts | 2 +- .../etc-invoiced-list.component.ts | 2 +- .../etc-invoiced-logs.component.ts | 12 +++---- .../etc-invoiced-requested.component.ts | 2 +- .../express-detail-modal.component.ts | 6 ++-- .../express-info/express-info.component.ts | 6 ++-- .../add-collection-invoice-modal.component.ts | 2 +- .../add-cost-detail.component.ts | 2 +- .../input-invoice-detail.component.ts | 10 +++--- .../input-invoice/input-invoice.component.ts | 10 +++--- .../invoice-requested-detail.component.ts | 2 +- .../invoice-requested.component.ts | 2 +- .../invoiced-list/invoiced-list.component.ts | 6 ++-- .../driver/add-driver/add-driver.component.ts | 12 +++---- .../driver/captain/add/add.component.ts | 36 +++++++++---------- .../driver/captain/captain.component.ts | 2 +- .../driver-config/driver-config.component.ts | 2 +- .../components/driver/driver.component.ts | 2 +- .../enterprise-audit.component.ts | 10 +++--- .../freight-config.component.ts | 4 +-- .../list/editPartner/editPartner.component.ts | 2 +- .../list/editSale/editSale.component.ts | 2 +- .../components/freight/list/list.component.ts | 16 ++++----- .../freight/list/new/new.component.ts | 4 +-- .../list/showService/showservice.component.ts | 2 +- .../components/freight/user/user.component.ts | 2 +- .../list/carauth/carauth.component.ts | 2 +- .../components/list/edit/edit.component.ts | 6 ++-- .../vehicle/components/list/list.component.ts | 2 +- .../search-drawer/search-drawer.component.ts | 2 +- 112 files changed, 339 insertions(+), 339 deletions(-) diff --git a/src/app/routes/account/components/edit-name/edit-name.component.ts b/src/app/routes/account/components/edit-name/edit-name.component.ts index fdc0d05e..9b51522f 100644 --- a/src/app/routes/account/components/edit-name/edit-name.component.ts +++ b/src/app/routes/account/components/edit-name/edit-name.component.ts @@ -227,7 +227,7 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit } submitForm() { const params = { - smsVerifyCode: this.sf.value.smsVerifyCode, + smsVerifyCode: this.sf?.value.smsVerifyCode, }; this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => { diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index aa10cb75..f355dec3 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -275,22 +275,22 @@ export class ContractManagementTemplateTextComponent implements OnInit { save() { if ( - !this.sf.value.templateName || - !this.sf.value.templateType || + !this.sf?.value.templateName || + !this.sf?.value.templateType || !this.sf2.value.templateContent || !(this.title || this.detailList.templateName) ) { this.service.msgSrv.error('必填参数为空，请检查再重新保存！'); return; } - if (this.sf.value.templateType == 'MX') { - if (this.sf.value.contractType == '') { + if (this.sf?.value.templateType == 'MX') { + if (this.sf?.value.contractType == '') { this.service.msgSrv.error('必填参数为空，请检查再重新保存！'); return; } } const params = { - ...this.sf.value, + ...this.sf?.value, ...this.sf2.value, templateTitle: this.detailList.templateName || this.title }; diff --git a/src/app/routes/contract-management/components/policy/policy.component.ts b/src/app/routes/contract-management/components/policy/policy.component.ts index 542a5cbe..7d1ad09d 100644 --- a/src/app/routes/contract-management/components/policy/policy.component.ts +++ b/src/app/routes/contract-management/components/policy/policy.component.ts @@ -34,7 +34,7 @@ export class ContractManagementPolicyComponent implements OnInit { */ get reqParams() { const params: any = { - ...(this.sf && this.sf.value) + ...(this.sf && this.sf?.value) }; delete params.expand; return params; diff --git a/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts b/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts index d8dc8f23..d6366432 100644 --- a/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts +++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts @@ -195,7 +195,7 @@ export class DatatableComplianceSalesmanComponent implements OnInit { differenceInCalendarDays(current, this.today) > 0; export() { - // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); + // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); } search() { this.st?.load(1) diff --git a/src/app/routes/datatable/components/customtable/driver/driver.component.ts b/src/app/routes/datatable/components/customtable/driver/driver.component.ts index e24a58c5..3c1bd3d2 100644 --- a/src/app/routes/datatable/components/customtable/driver/driver.component.ts +++ b/src/app/routes/datatable/components/customtable/driver/driver.component.ts @@ -153,7 +153,7 @@ export class DatatableDriverComponent implements OnInit { differenceInCalendarDays(current, this.today) > 0; export() { - // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); + // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); } search() { this.st?.load(1) diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts index d6d5b692..ccef7ce9 100644 --- a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -313,7 +313,7 @@ export class DatatableMancustomtableComponent implements OnInit { differenceInCalendarDays(current, this.today) > 0; export() { - // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); + // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); } search() { this.st?.load(1); diff --git a/src/app/routes/datatable/components/customtable/owner/owner.component.ts b/src/app/routes/datatable/components/customtable/owner/owner.component.ts index 54549d42..d93c8d6c 100644 --- a/src/app/routes/datatable/components/customtable/owner/owner.component.ts +++ b/src/app/routes/datatable/components/customtable/owner/owner.component.ts @@ -165,7 +165,7 @@ export class DatatableOwnerComponent implements OnInit { differenceInCalendarDays(current, this.today) > 0; export() { - // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); + // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); } search() { this.st?.load(1) diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts index f3970d72..69227c4a 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts @@ -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; }; diff --git a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts index 9f8144d8..4111a115 100644 --- a/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts +++ b/src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts @@ -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; }; diff --git a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts index cea027a7..0a27381c 100644 --- a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts +++ b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts @@ -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); } diff --git a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts index 1ad29585..7c913644 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 1766fe99..f1197ff8 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -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 diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 1baa6f41..1b52b343 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 37bebe1d..3b1bb143 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -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, diff --git a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts index c26e2187..0eb46548 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts index cb802a1c..ee8f3abf 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts @@ -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 } }); } diff --git a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts index 860a4753..33b73f97 100644 --- a/src/app/routes/financial-management/components/payable-order/payable-order.component.ts +++ b/src/app/routes/financial-management/components/payable-order/payable-order.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts index c78211b7..82ab1c8d 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts @@ -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 { diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 1a49a4e9..23a987d2 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -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; diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts index 86dfee36..2ecb46f7 100644 --- a/src/app/routes/financial-management/components/payment-record/payment-record.component.ts +++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts index d2e4b20c..0bb52cce 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts @@ -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 }, diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index 688f145d..e939b50a 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -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) { diff --git a/src/app/routes/financial-management/components/platform-account/setting-financial/setting-financial.component.ts b/src/app/routes/financial-management/components/platform-account/setting-financial/setting-financial.component.ts index 27193906..09472efd 100644 --- a/src/app/routes/financial-management/components/platform-account/setting-financial/setting-financial.component.ts +++ b/src/app/routes/financial-management/components/platform-account/setting-financial/setting-financial.component.ts @@ -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) => { diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 151c7e56..00592bd6 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts index c8b2365a..807bf227 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 38da87bb..19007ae6 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index c0c336d9..2f79a31c 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts index 3b98803e..18cc037a 100644 --- a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 56d9c6ce..ceb7841d 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts index 76f4bb47..d4f8ad7f 100644 --- a/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts +++ b/src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts @@ -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 } }); } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts index d65f5669..5159d8bf 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts @@ -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 } }); } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts index e10ff9d9..a70dfa83 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.ts @@ -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] || '' } }); } diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index 22825710..8d9625a0 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -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] || '' }, }); } diff --git a/src/app/routes/logs/components/system-logs/system-logs.component.ts b/src/app/routes/logs/components/system-logs/system-logs.component.ts index 90caac95..20fd3af1 100644 --- a/src/app/routes/logs/components/system-logs/system-logs.component.ts +++ b/src/app/routes/logs/components/system-logs/system-logs.component.ts @@ -85,10 +85,10 @@ export class SystemLogsComponent implements OnInit { requestOptions.body.operateType = '1'; if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, operateType: '1', - endTime: this.sf.value.time?.[1] || null, - startTime: this.sf.value.time?.[0] || null + endTime: this.sf?.value.time?.[1] || null, + startTime: this.sf?.value.time?.[0] || null }); } return requestOptions; diff --git a/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts index 53edd71b..72e501a2 100644 --- a/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts +++ b/src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts @@ -64,10 +64,10 @@ export class SystemSupplyLogsComponent implements OnInit { requestOptions.body.operateType = '4' if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, operateType: '4', - endTime: this.sf.value.time?.[1] || null, - startTime: this.sf.value.time?.[0] || null + endTime: this.sf?.value.time?.[1] || null, + startTime: this.sf?.value.time?.[0] || null }); } return requestOptions; diff --git a/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts index f394883f..38a3b71f 100644 --- a/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts +++ b/src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts @@ -63,10 +63,10 @@ export class SystemWaybillLogsComponent implements OnInit { requestOptions.body.operateType = '3' if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, operateType: '3', - endTime: this.sf.value.time?.[1] || null, - startTime: this.sf.value.time?.[0] || null + endTime: this.sf?.value.time?.[1] || null, + startTime: this.sf?.value.time?.[0] || null }); } return requestOptions; diff --git a/src/app/routes/logs/components/user-logs/user-logs.component.ts b/src/app/routes/logs/components/user-logs/user-logs.component.ts index 70bf123f..2a1a674e 100644 --- a/src/app/routes/logs/components/user-logs/user-logs.component.ts +++ b/src/app/routes/logs/components/user-logs/user-logs.component.ts @@ -93,10 +93,10 @@ export class UserLogsComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, time: { - start: this.sf.value.time?.[0] || null, - end: this.sf.value.time?.[1] || null + start: this.sf?.value.time?.[0] || null, + end: this.sf?.value.time?.[1] || null } }); } diff --git a/src/app/routes/logs/components/version-logs/version-logs.component.ts b/src/app/routes/logs/components/version-logs/version-logs.component.ts index d53bad68..cddd0f8a 100644 --- a/src/app/routes/logs/components/version-logs/version-logs.component.ts +++ b/src/app/routes/logs/components/version-logs/version-logs.component.ts @@ -94,10 +94,10 @@ export class VersionLogsComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, publishTime: { - start: this.sf.value.time?.[0] || null, - end: this.sf.value.time?.[1] || null + start: this.sf?.value.time?.[0] || null, + end: this.sf?.value.time?.[1] || null } }); } diff --git a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts index a2895ba9..c7abc4a0 100644 --- a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts +++ b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts @@ -37,7 +37,7 @@ export class AuthDrawerComponent implements OnInit { Object.assign(requestOptions.body, { id: this.id }); if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } return requestOptions; diff --git a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts index b55bde12..2dc63603 100644 --- a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts +++ b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts @@ -129,17 +129,17 @@ export class MenuModalComponent implements OnInit { return; } const params = { - ...this.sf.value, + ...this.sf?.value, ...this.params, i18n: null, - // i18n: this.sf.value.keyCode, + // i18n: this.sf?.value.keyCode, menuType: 0, reuse: 0, shortcut: 0, hideInBreadcrumb: 0, functionType: 0, - sortId: this.sf.value.sortId?.toString() || null, - text: this.sf.value.title + sortId: this.sf?.value.sortId?.toString() || null, + text: this.sf?.value.title }; this.service.request(this.service.$api_add_one, params).subscribe(res => { if (res) { diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index 18126884..7e1f5a25 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -547,21 +547,21 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { loadTime: this.loadTime, // 到车时间 unloadTime: this.unloadTime, - loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data - ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath - : this.sf.value?.loadingLadingBillFilePath?.url, + loadingLadingBillFilePath: this.sf?.value?.loadingLadingBillFilePath?.data + ? this.sf?.value?.loadingLadingBillFilePath.data.fullFilePath + : this.sf?.value?.loadingLadingBillFilePath?.url, - loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data - ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath - : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, + loadingPeopleVehiclesGoodsFilePath: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.data + ? this.sf?.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath + : this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.url, - unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data - ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath - : this.sf.value?.unloadingLadingBillFilePath?.url, + unloadingLadingBillFilePath: this.sf?.value?.unloadingLadingBillFilePath?.data + ? this.sf?.value?.unloadingLadingBillFilePath.data.fullFilePath + : this.sf?.value?.unloadingLadingBillFilePath?.url, - unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data - ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath - : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url + unloadingPeopleVehiclesGoodsFilePath: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.data + ? this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath + : this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.url }; this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => { if (res) { diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 9ee9df5e..8f5c5751 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -184,7 +184,7 @@ export class UpdateFreightComponent implements OnInit { if (this.calculateSub) { this.calculateSub.unsubscribe(); } - const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} } + const params = { billId: this.data.billId, changeCause: this.sf?.value.changeCause, dto: {...this.sf?.value} } this.calculateSub = this.service .request(this.service.$api_calculate_cost, params) .subscribe(res => { @@ -203,7 +203,7 @@ export class UpdateFreightComponent implements OnInit { this.sf.validator({ emitError: true }); return; } - const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} } + const params = { billId: this.data.billId, changeCause: this.sf?.value.changeCause, dto: {...this.sf?.value} } this.service.request(this.service.$api_change_bulk,params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('变更运费成功！'); diff --git a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts index dc868538..ebb18270 100644 --- a/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts +++ b/src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts @@ -103,11 +103,11 @@ export class OneCarOrderCancelConfirmComponent implements OnInit { console.log(this.List) } save(value: any): void { - if (!this.sf.value.reason) { + if (!this.sf?.value.reason) { this.service.msgSrv.error('请填写备注信息！'); return; } - const params = { billId: this.i?.id, ...this.sf.value }; + const params = { billId: this.i?.id, ...this.sf?.value }; console.log(params) this.service.request(this.service.$api_billRefundApplication_save, params).subscribe(res => { if (res) { diff --git a/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts b/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts index 16e7c1c0..2570b3c9 100644 --- a/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts +++ b/src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts @@ -60,7 +60,7 @@ export class OneCarOrderCancelComponent implements OnInit { this.modal.confirm({ nzTitle: '是否确定立即取消运单！', nzOnOk: () => - this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => { + this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf?.value }).subscribe(res => { if (res) { this.modalRef.close(true); } @@ -68,7 +68,7 @@ export class OneCarOrderCancelComponent implements OnInit { nzOnCancel: () => this.modalRef.destroy() }); } else { - this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf.value }).subscribe(res => { + this.service.request(this.service.$api_get_cancelAnOrder, { id: this.i?.id, ...this.sf?.value }).subscribe(res => { if (res) { this.modalRef.close(true); } diff --git a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts index 15410d98..7749f409 100644 --- a/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts +++ b/src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts @@ -68,14 +68,14 @@ export class VehicleFreightPeopleComponent implements OnInit { } save(value: any): void { - console.log(this.sf.value); + console.log(this.sf?.value); if(!this.sf.valid) { this.service.msgSrv.error("请选择网络货运人！") return; } const params = { billIds: this.data?.ids, - enterpriseInfoId: this.sf.value?.enterpriseInfoId + enterpriseInfoId: this.sf?.value?.enterpriseInfoId }; console.log(params); this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => { diff --git a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts index 6e61d083..ce7ccec7 100644 --- a/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts +++ b/src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts @@ -78,14 +78,14 @@ export class VehicleModifyRateComponent implements OnInit { } save(value: any): void { - if (!this.sf.value?.additionalRate) { + if (!this.sf?.value?.additionalRate) { this.service.msgSrv.warning('请填写附加费！'); return; } - console.log(this.sf.value); + console.log(this.sf?.value); const params = { ids: this.data?.ids, - ...this.sf.value + ...this.sf?.value }; console.log(params); this.service.request(this.service.$api_set_updateAdditionalRateBatch, params).subscribe((res: any) => { diff --git a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts index 8f5794f0..9ddfbc83 100644 --- a/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts @@ -165,8 +165,8 @@ export class VehicleUpdateFreightComponent implements OnInit { }); } }); - // this.tranPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay; - // this.totalPrice = this.sf.value.prePay + this.sf.value.toPay + this.sf.value.oilCardPay + this.sf.value.receiptPay + this.otherPrice; + // this.tranPrice = this.sf?.value.prePay + this.sf?.value.toPay + this.sf?.value.oilCardPay + this.sf?.value.receiptPay; + // this.totalPrice = this.sf?.value.prePay + this.sf?.value.toPay + this.sf?.value.oilCardPay + this.sf?.value.receiptPay + this.otherPrice; } getParams() { @@ -174,13 +174,13 @@ export class VehicleUpdateFreightComponent implements OnInit { editItems.forEach((item: any) => { switch (item.costName) { case '预付': - item.price = this.sf.value.prePay; + item.price = this.sf?.value.prePay; break; case '到付': - item.price = this.sf.value.toPay; + item.price = this.sf?.value.toPay; break; case '回单付': - item.price = this.sf.value.receiptPay; + item.price = this.sf?.value.receiptPay; break; default: break; @@ -190,7 +190,7 @@ export class VehicleUpdateFreightComponent implements OnInit { const params = { billId: this.data.id, dtos: editItems, - changeCause: this.sf.value.changeCause + changeCause: this.sf?.value.changeCause }; return params; } @@ -198,9 +198,9 @@ export class VehicleUpdateFreightComponent implements OnInit { const param = { billId: this.data.id, - pre: this.sf.value.prePay, - rece: this.sf.value.toPay, - back: this.sf.value.receiptPay, + pre: this.sf?.value.prePay, + rece: this.sf?.value.toPay, + back: this.sf?.value.receiptPay, total: this.data.totalFreight, freightAmount: this.data.totalAmount, } diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index b26884f4..3388d7a5 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -35,10 +35,10 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni 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] || '' }, refundStatus: this.refundStatus || null }); diff --git a/src/app/routes/partner/article-management/components/edit/edit.component.ts b/src/app/routes/partner/article-management/components/edit/edit.component.ts index f65dea8f..8389e378 100644 --- a/src/app/routes/partner/article-management/components/edit/edit.component.ts +++ b/src/app/routes/partner/article-management/components/edit/edit.component.ts @@ -178,7 +178,7 @@ export class ParterArticleManagementEditComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - // this.service.request('', { ...this.sf.value }).subscribe(res => { + // this.service.request('', { ...this.sf?.value }).subscribe(res => { // if (res) { // this.modalRef.destroy(true); // } else { diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts index c563ff9b..3fc7e467 100644 --- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts +++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts @@ -208,7 +208,7 @@ export class ParterChannelSalesEditComponent implements OnInit { if (!this.sf.valid) return; let params: any= { - ...this.sf.value, + ...this.sf?.value, } delete params.telephone this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => { diff --git a/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts index 8856e337..276c2a43 100644 --- a/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts +++ b/src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts @@ -85,7 +85,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - // this.service.request('', { ...this.sf.value }).subscribe(res => { + // this.service.request('', { ...this.sf?.value }).subscribe(res => { // if (res) { // this.modalRef.destroy(true); // } else { diff --git a/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts index 27566f45..0f419064 100644 --- a/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts +++ b/src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts @@ -85,7 +85,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - // this.service.request('', { ...this.sf.value }).subscribe(res => { + // this.service.request('', { ...this.sf?.value }).subscribe(res => { // if (res) { // this.modalRef.destroy(true); // } else { diff --git a/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts index 86f5e72d..0bab6b02 100644 --- a/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts +++ b/src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts @@ -85,7 +85,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - // this.service.request('', { ...this.sf.value }).subscribe(res => { + // this.service.request('', { ...this.sf?.value }).subscribe(res => { // if (res) { // this.modalRef.destroy(true); // } else { diff --git a/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts index 09abe28f..0b1419bf 100644 --- a/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts +++ b/src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts @@ -85,7 +85,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - // this.service.request('', { ...this.sf.value }).subscribe(res => { + // this.service.request('', { ...this.sf?.value }).subscribe(res => { // if (res) { // this.modalRef.destroy(true); // } else { diff --git a/src/app/routes/partner/knowledge/banner/components/add/add.component.ts b/src/app/routes/partner/knowledge/banner/components/add/add.component.ts index 132e6bb2..62b5fa07 100644 --- a/src/app/routes/partner/knowledge/banner/components/add/add.component.ts +++ b/src/app/routes/partner/knowledge/banner/components/add/add.component.ts @@ -185,7 +185,7 @@ export class BannerComponentsAddComponent implements OnInit { if (this.queryParams.id !== '0'){ params.advertisementId = this.queryParams.id; } - if (this.sf.value.takeEffectType === 2){ + if (this.sf?.value.takeEffectType === 2){ if (this.changeTimeFlag) { params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); } else { @@ -207,7 +207,7 @@ export class BannerComponentsAddComponent implements OnInit { if (this.queryParams.type === 'add') { delete params.id; } - if (this.sf.value.takeEffectType === 2){ + if (this.sf?.value.takeEffectType === 2){ if (this.changeTimeFlag) { params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); } else { diff --git a/src/app/routes/partner/level-config/components/edit/edit.component.ts b/src/app/routes/partner/level-config/components/edit/edit.component.ts index 029381d5..0eeda78c 100644 --- a/src/app/routes/partner/level-config/components/edit/edit.component.ts +++ b/src/app/routes/partner/level-config/components/edit/edit.component.ts @@ -73,7 +73,7 @@ export class ParterLevelConfigEditComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => { + this.service.request(this.service.$api_save, { ...this.sf?.value }).subscribe(res => { if (res) { this.service.msgSrv.success('保存成功！') this.modalRef.destroy(true); diff --git a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts index 2ccfeb94..359dba09 100644 --- a/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts @@ -75,38 +75,38 @@ export class AddEtpPartnerComponent { this.service.msgSrv.warning('请修改填写错误信息'); return; } - if (this.sf.value.cityCodesList?.length > 3) { + if (this.sf?.value.cityCodesList?.length > 3) { this.sf.validator({ emitError: true }); this.service.msgSrv.warning('所属城市不能超过3个'); return; } // 校验企业营业期限 - const operatingStartTime = new Date(this.sf.value.operatingStartTime); - const operatingEndTime = new Date(this.sf.value.operatingEndTime); + const operatingStartTime = new Date(this.sf?.value.operatingStartTime); + const operatingEndTime = new Date(this.sf?.value.operatingEndTime); if (operatingStartTime.getTime() > operatingEndTime.getTime()) { this.service.msgSrv.warning('营业截止日期不能小于开始日期'); return; } // 校验法人证件有效期限 - if (this.sf.value.legalPersonIdentity.validEndTime) { - const validStartTime = new Date(this.sf.value.legalPersonIdentity.validStartTime); - const validEndTime = new Date(this.sf.value.legalPersonIdentity.validEndTime); + if (this.sf?.value.legalPersonIdentity.validEndTime) { + const validStartTime = new Date(this.sf?.value.legalPersonIdentity.validStartTime); + const validEndTime = new Date(this.sf?.value.legalPersonIdentity.validEndTime); if (validStartTime.getTime() > validEndTime.getTime()) { this.service.msgSrv.warning('法人证件有效截止日期不能小于开始日期'); return; } } // 校验管理员证件有效期限 - if (this.sf.value.adminUserInfo.validEndTime) { - const validStartTime = new Date(this.sf.value.adminUserInfo.validStartTime); - const validEndTime = new Date(this.sf.value.adminUserInfo.validEndTime); + if (this.sf?.value.adminUserInfo.validEndTime) { + const validStartTime = new Date(this.sf?.value.adminUserInfo.validStartTime); + const validEndTime = new Date(this.sf?.value.adminUserInfo.validEndTime); if (validStartTime.getTime() > validEndTime.getTime()) { this.service.msgSrv.warning('管理员证件有效截止日期小于开始日期'); return; } } const params = {}; - Object.assign(params, { ...this.sf.value, source: 2 }); + Object.assign(params, { ...this.sf?.value, source: 2 }); // console.log(params); this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => { diff --git a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts index c18550ef..14ca253a 100644 --- a/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts +++ b/src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts @@ -76,21 +76,21 @@ export class AddPersonalPartnerComponent { this.service.msgSrv.warning('请修改填写错误信息'); return; } - if (this.sf.value.cityCodesList?.length > 3) { + if (this.sf?.value.cityCodesList?.length > 3) { this.sf.validator({ emitError: true }); this.service.msgSrv.warning('所属城市不能超过3个'); return; } - if (this.sf.value.validEndTime) { - const validStartTime = new Date(this.sf.value.validStartTime); - const validEndTime = new Date(this.sf.value.validEndTime); + if (this.sf?.value.validEndTime) { + const validStartTime = new Date(this.sf?.value.validStartTime); + const validEndTime = new Date(this.sf?.value.validEndTime); if (validStartTime.getTime() > validEndTime.getTime()) { this.service.msgSrv.warning('身份证有效截止日期不能小于开始日期'); return; } } const params = {}; - Object.assign(params, { ...this.sf.value, source: 2 }); + Object.assign(params, { ...this.sf?.value, source: 2 }); this.service.request(this.service.$api_save_personal_partner, params).subscribe(res => { if (res) { diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 87ef9a27..b7b6bbaf 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -43,7 +43,7 @@ export class PartnerListComponent { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - let params = { ...this.sf.value }; + let params = { ...this.sf?.value }; if (params.createTime) { params.createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] }; } diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 1c2c4d4f..5756e136 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -93,7 +93,7 @@ export class PartnerAuditModalComponent implements OnInit { } sure() { - if (this.info.isPass || this.sf.value.status) { + if (this.info.isPass || this.sf?.value.status) { this.nzModalService.confirm({ nzTitle: `确定以“${this.info.channelIdLabel}”的名义重新发起CRM《付款对象合同管理》吗？`, nzOnOk: () => { @@ -107,9 +107,9 @@ export class PartnerAuditModalComponent implements OnInit { audit() { const params: any = { - ...this.sf.value, + ...this.sf?.value, id: this.info.id, - auditStatusEnum: this.info.isPass || this.sf.value.status ? '20' : '30' + auditStatusEnum: this.info.isPass || this.sf?.value.status ? '20' : '30' }; this.service .request(this.service.$api_audit_partner, { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 96080492..c0740d72 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -178,7 +178,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { rebateConfigLineDTO: this.table.data, priority: this.priority, // 优先级 partnerIds: this.partnerId, - ruleDescription: this.sf.value.ruleDescription, + ruleDescription: this.sf?.value.ruleDescription, remark: this.remark, partnerType: this.partnerType }; diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts index 2a554c41..74f14074 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.ts +++ b/src/app/routes/partner/recorded/components/record/record.component.ts @@ -55,10 +55,10 @@ export class PartnerRecordedRecordComponent implements OnInit { 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] || '' }, refundStatus: this.refundStatus || null }); @@ -354,7 +354,7 @@ export class PartnerRecordedRecordComponent implements OnInit { * 底部统计 */ getSummary() { - this.service.request(this.service.$api_get_list_summary, { ...this.sf.value }).subscribe(res => { + this.service.request(this.service.$api_get_list_summary, { ...this.sf?.value }).subscribe(res => { if (res) { this.totalInfo = res; } diff --git a/src/app/routes/partner/scrollimg/components/add/add.component.ts b/src/app/routes/partner/scrollimg/components/add/add.component.ts index e8345d9e..1c0d95e0 100644 --- a/src/app/routes/partner/scrollimg/components/add/add.component.ts +++ b/src/app/routes/partner/scrollimg/components/add/add.component.ts @@ -183,7 +183,7 @@ export class ScrollimgComponentsAddComponent implements OnInit { if (this.queryParams.id !== '0') { params.advertisementId = this.queryParams.id; } - if (this.sf.value.takeEffectType === 2) { + if (this.sf?.value.takeEffectType === 2) { if (this.changeTimeFlag) { params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); } else { @@ -205,7 +205,7 @@ export class ScrollimgComponentsAddComponent implements OnInit { if (this.queryParams.type === 'add') { delete params.id; } - if (this.sf.value.takeEffectType === 2) { + if (this.sf?.value.takeEffectType === 2) { if (this.changeTimeFlag) { params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); } else { diff --git a/src/app/routes/supply-management/components/add-driver/add-driver.component.ts b/src/app/routes/supply-management/components/add-driver/add-driver.component.ts index 18c09240..d4e7f6eb 100644 --- a/src/app/routes/supply-management/components/add-driver/add-driver.component.ts +++ b/src/app/routes/supply-management/components/add-driver/add-driver.component.ts @@ -599,9 +599,9 @@ export class CarAddDriverComponent implements OnInit { submitForm(){ const params:any = { source: 1, - mobile: this.sf.value.mobile, + mobile: this.sf?.value.mobile, identityInfoDTO:{ - ...this.sf.value, + ...this.sf?.value, certificatePhotoFront: this.detailData.certificatePhotoFront, certificatePhotoBack: this.detailData.certificatePhotoBack, }, diff --git a/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts b/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts index 395a7514..67562dea 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts +++ b/src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts @@ -49,5 +49,5 @@ export class PublishchooseFamifiarSetCaptainComponent implements OnInit { } close() {this.modal.close()} - save() {this.modal.close(this.sf.value.captainPhone)} + save() {this.modal.close(this.sf?.value.captainPhone)} } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 817a0c97..83354853 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -427,7 +427,7 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem // }, // allowClear: true, // containsAllLabel: true, - // asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf.value?.shipperAppUserId) + // asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf?.value?.shipperAppUserId) // } as SFSelectWidgetSchema // }, enterpriseProjectId: { diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts index e75aafe1..9c75ae87 100644 --- a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts +++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts @@ -155,7 +155,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { }); } save(): void { - if(!this.sf.value?.shipperAppUserId || !this?.networkTransporter || !this.sf.value?.enterpriseProjectId || !this.sf.value?.fileName) { + if(!this.sf?.value?.shipperAppUserId || !this?.networkTransporter || !this.sf?.value?.enterpriseProjectId || !this.sf?.value?.fileName) { this.service.msgSrv.error('请填写必填项并上传文件！') return } @@ -163,9 +163,9 @@ export class SupplyManagementImportSupplyComponent implements OnInit { const formData : any= new FormData(); this.files?.forEach((file: any) => { formData.append('file', file); - formData.append('shipperAppUserId', this.sf.value?.shipperAppUserId); + formData.append('shipperAppUserId', this.sf?.value?.shipperAppUserId); formData.append('enterpriseInfoId', this?.networkTransporter); - formData.append('enterpriseProjectId', this.sf.value?.enterpriseProjectId); + formData.append('enterpriseProjectId', this.sf?.value?.enterpriseProjectId); }); console.log(formData) diff --git a/src/app/routes/sys-setting/components/cart-config/cart-config-action-modal/cart-config-action-modal.component.ts b/src/app/routes/sys-setting/components/cart-config/cart-config-action-modal/cart-config-action-modal.component.ts index 86e436fd..c37eca3e 100644 --- a/src/app/routes/sys-setting/components/cart-config/cart-config-action-modal/cart-config-action-modal.component.ts +++ b/src/app/routes/sys-setting/components/cart-config/cart-config-action-modal/cart-config-action-modal.component.ts @@ -93,9 +93,9 @@ export class CartConfigActionModalComponent implements OnInit { sure() { if (this.i.id === 0) { const params: any = { - ...this.sf.value, + ...this.sf?.value, dictKey: this.dictKey, - itemData: this.sf.value.itemValue + itemData: this.sf?.value.itemValue }; this.service.request(this.service.$api_add_dict, params).subscribe(res => { if (res) { @@ -106,7 +106,7 @@ export class CartConfigActionModalComponent implements OnInit { } else { const params: any = { ...this.i, - ...this.sf.value + ...this.sf?.value }; this.service.request(this.service.$api_update_dict, params).subscribe(res => { if (res) { @@ -121,7 +121,7 @@ export class CartConfigActionModalComponent implements OnInit { if (this.i.id === 0) { const params: any = { configFullKey: 'ban.goods.name', - name: this.sf.value.itemValue + name: this.sf?.value.itemValue }; this.service.request(this.service.$api_add_config_item, params).subscribe(res => { if (res) { @@ -130,7 +130,7 @@ export class CartConfigActionModalComponent implements OnInit { } }); } else { - const params: any = { ...this.sf.value, ...this.i, configFullKey: 'ban.goods.name', name: this.sf.value.itemValue }; + const params: any = { ...this.sf?.value, ...this.i, configFullKey: 'ban.goods.name', name: this.sf?.value.itemValue }; this.service.request(this.service.$api_update_config_item, params).subscribe(res => { if (res) { this.service.msgSrv.success('保存成功！'); diff --git a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts index 0f1bb9ff..70658250 100644 --- a/src/app/routes/sys-setting/components/network-freight/new/new.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/new/new.component.ts @@ -182,14 +182,14 @@ export class NetworkFreightNewComponent implements OnInit { } console.log(this.sf1.value); console.log(this.sf1.valid); - console.log(this.sf.value); + console.log(this.sf?.value); console.log(this.sf.valid); const sfVlaue = this.sf1.value; const params: any = {}; console.log(this.sf1.value); Object.assign(params, { - ...this.sf.value, + ...this.sf?.value, enterpriseInfoDTO: { ...this.sf1.value, legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO, diff --git a/src/app/routes/sys-setting/components/note-management/note-management.component.ts b/src/app/routes/sys-setting/components/note-management/note-management.component.ts index f93705dc..2bc9b0c5 100644 --- a/src/app/routes/sys-setting/components/note-management/note-management.component.ts +++ b/src/app/routes/sys-setting/components/note-management/note-management.component.ts @@ -59,7 +59,7 @@ export class NoTeManagementComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { ...this.sf?.value }); } return requestOptions; }; diff --git a/src/app/routes/sys-setting/components/organization-management/organization-modal/organization-modal.component.ts b/src/app/routes/sys-setting/components/organization-management/organization-modal/organization-modal.component.ts index a9f765e1..07734a18 100644 --- a/src/app/routes/sys-setting/components/organization-management/organization-modal/organization-modal.component.ts +++ b/src/app/routes/sys-setting/components/organization-management/organization-modal/organization-modal.component.ts @@ -72,7 +72,7 @@ export class OrganizationModalComponent implements OnInit { const params: any = { id: this.params.id, - ...this.sf.value, + ...this.sf?.value, authority: this.roleInfoData.authority, authorityAssistId: this.roleInfoData.authorityAssistId, parentId: this.parentId diff --git a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts index 9d00f002..9a999014 100644 --- a/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts +++ b/src/app/routes/sys-setting/components/role-management/edit/edit.component.ts @@ -102,7 +102,7 @@ console.log(this.params.infoUrl) } const params: any = { id: this.params.id, - ...this.sf.value, + ...this.sf?.value, authority: auths.authority, authorityAssistId: auths.authorityAssistId }; diff --git a/src/app/routes/sys-setting/components/role-management/role-management.component.ts b/src/app/routes/sys-setting/components/role-management/role-management.component.ts index c596fe85..ddf4a427 100644 --- a/src/app/routes/sys-setting/components/role-management/role-management.component.ts +++ b/src/app/routes/sys-setting/components/role-management/role-management.component.ts @@ -94,7 +94,7 @@ export class RoleManagementComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { ...this.sf?.value }); } if (requestOptions.body?.createTime) { Object.assign(requestOptions.body, { sort: 'createTime.' + requestOptions.body.createTime }); diff --git a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts index 3e3bd75b..136f88b6 100644 --- a/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts +++ b/src/app/routes/sys-setting/components/sms-template/sms-template.component.ts @@ -103,7 +103,7 @@ export class SmsTemplateComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { ...this.sf?.value }); } return requestOptions; }; diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html index 3c1580bf..1ff0f06f 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html @@ -35,6 +35,6 @@
\ No newline at end of file diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts index d363a597..2035f92f 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts @@ -170,7 +170,7 @@ export class StaffManagementComponent implements OnInit { } exportList() { - const params = { nameOrPhone: this.sf.value?.nameOrPhone }; + const params = { nameOrPhone: this.sf?.value?.nameOrPhone }; this.service.downloadFile(this.service.$api_export_staff, { ...params, pageSize: -1 }); } diff --git a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts index 49b2cb27..348c432c 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts @@ -72,13 +72,13 @@ export class SystemStaffStaffModalComponent implements OnInit { } sure() { - if (!this.sf.value.roleId || this.sf.value.roleId.length === 0) { + if (!this.sf?.value.roleId || this.sf?.value.roleId.length === 0) { this.service.msgSrv.error('员工角色不能为空！'); return; } if (this.i.userId === 0) { const params: any = { - ...this.sf.value + ...this.sf?.value }; this.service.request(this.service.$api_add_staff, params).subscribe(res => { if (res) { @@ -89,7 +89,7 @@ export class SystemStaffStaffModalComponent implements OnInit { } else { const params: any = { appUserId: this.i.appUserId, - ...this.sf.value + ...this.sf?.value }; this.service.request(this.service.$api_edit_staff, params).subscribe(res => { if (res) { diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index f6bf2ede..3fc0ea7d 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -35,7 +35,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { Object.assign(requestOptions.body, { declareStatus: this.selectedIndex }); if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { ...this.sf?.value }); delete requestOptions.body._$expand; } this.selectedRows = []; diff --git a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts index 00b51946..7edcdb80 100644 --- a/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts +++ b/src/app/routes/ticket-management/components/billing-order/billing-order.component.ts @@ -27,7 +27,7 @@ export class BillingOrderComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, }); } return requestOptions; diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 3c2a61c2..3fa501f9 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -39,13 +39,13 @@ export class CancellationInvoiceComponent 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] || '' } }); } diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts index 2910a0ab..a2b7569b 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts @@ -47,7 +47,7 @@ export class AddCartComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } return requestOptions; diff --git a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts index 02136e3a..4b4f1256 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts @@ -63,7 +63,7 @@ export class AddOwnerComponent implements OnInit { }); if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } return requestOptions; diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index a03001a6..2a98b86e 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -45,7 +45,7 @@ export class ETCBlacklistComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } this.selectedRows = []; diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index f8aab8ac..c560edfb 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -27,7 +27,7 @@ export class ETCInvoicedListComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } return requestOptions; diff --git a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts index c9a2a049..9293cf62 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts @@ -27,14 +27,14 @@ export class ETCInvoicedLogsComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, exTime: { - start: this.sf.value.exTime?.[0] || '', - end: this.sf.value.exTime?.[1] || '' + start: this.sf?.value.exTime?.[0] || '', + end: this.sf?.value.exTime?.[1] || '' }, invoiceMakeTime: { - start: this.sf.value.invoiceMakeTime?.[0] || '', - end: this.sf.value.invoiceMakeTime?.[1] || '' + start: this.sf?.value.invoiceMakeTime?.[0] || '', + end: this.sf?.value.invoiceMakeTime?.[1] || '' } }); } @@ -66,7 +66,7 @@ export class ETCInvoicedLogsComponent implements OnInit { const params = { listSource: 1, pageSize: -1 }; if (this.sf) { Object.assign(params, { - ...this.sf.value + ...this.sf?.value }); } this.service.downloadFile(this.service.$api_export_invoice_logs_page, params); diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts index 08ea0663..2faefd48 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts @@ -30,7 +30,7 @@ export class ETCInvoicedRequestedComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } this.selectedRows = []; diff --git a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts index ee5bc68d..9efac2ad 100644 --- a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts @@ -94,10 +94,10 @@ export class ExpressDetailModalComponent implements OnInit { Object.assign(requestOptions.body, { expressno: this.expressCode }); if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, 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 } }); } diff --git a/src/app/routes/ticket-management/components/express-info/express-info.component.ts b/src/app/routes/ticket-management/components/express-info/express-info.component.ts index c8e49e8a..c5d9659a 100644 --- a/src/app/routes/ticket-management/components/express-info/express-info.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-info.component.ts @@ -86,10 +86,10 @@ export class ExpressInfoComponent implements OnInit { 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] || '' } }); } diff --git a/src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.ts b/src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.ts index 422930cd..b3bb1c9e 100644 --- a/src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.ts @@ -86,7 +86,7 @@ export class AddCollectionInvoiceModalComponent implements OnInit { sure() { const params: any = { - ...this.sf.value + ...this.sf?.value }; // this.service.request(this.service.$api_add_staff, params).subscribe(res => { // if (res) { diff --git a/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts index 3ca21dbf..fc5f6616 100644 --- a/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts @@ -24,7 +24,7 @@ export class AddCostDetailComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); } return requestOptions; diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts index 384fa720..52286e05 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts @@ -42,14 +42,14 @@ export class InputInvoiceDetailComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => { 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 } }); } diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts index ec8c927c..5dc512c0 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts @@ -31,14 +31,14 @@ export class InputInvoiceComponent implements OnInit { 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] || '' }, invdate: { - start: this.sf.value.invdate?.[0] || '', - end: this.sf.value.invdate?.[1] || '' + start: this.sf?.value.invdate?.[0] || '', + end: this.sf?.value.invdate?.[1] || '' } }); } diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 12c787a3..1391b026 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -54,7 +54,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { this.selectedRows = []; Object.assign(requestOptions.body, { vatappHId: this.id }); if (this.sf) { - Object.assign(requestOptions.body, { ...this.sf.value }); + Object.assign(requestOptions.body, { ...this.sf?.value }); } return requestOptions; }; diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index d8a74f3e..ca3afe4d 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -42,7 +42,7 @@ export class InvoiceRequestedComponent { } 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] || '' diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts index 14c6bf69..e818fdd1 100644 --- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts @@ -42,10 +42,10 @@ export class InvoicedListComponent implements OnInit { Object.assign(requestOptions.body,{sts: '3'}) if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value, + ...this.sf?.value, invoicedate: { - start: this.sf.value.invoicedate?.[0] || '', - end: this.sf.value.invoicedate?.[1] || '' + start: this.sf?.value.invoicedate?.[0] || '', + end: this.sf?.value.invoicedate?.[1] || '' } }); } diff --git a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts index b970cef6..56b048cc 100644 --- a/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts +++ b/src/app/routes/usercenter/components/driver/add-driver/add-driver.component.ts @@ -665,18 +665,18 @@ export class CarSettleAddDriverComponent implements OnInit { this.showJopFlag = !this.showJopFlag; } submitForm() { - const items: any = this.sf.value; - items.certificatePhotoFrontWatermark = this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoFrontWatermark; - items.certificatePhotoBackWatermark = this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark; + const items: any = this.sf?.value; + items.certificatePhotoFrontWatermark = this.sf?.value?.certificatePhotoFrontWatermark?.data?.fullFilePath || this.sf?.value?.certificatePhotoFrontWatermark; + items.certificatePhotoBackWatermark = this.sf?.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf?.value?.certificatePhotoBackWatermark; const items2: any = this.sf1.value; items2.certificatePhotoWatermark = this.sf1.value?.certificatePhotoWatermark?.data?.fullFilePath || this.sf1.value?.certificatePhotoWatermark; const items3: any = this.sf2.value; items3.certificatePhotoWatermark = this.sf2.value?.certificatePhotoWatermark?.data?.fullFilePath || this.sf2.value?.certificatePhotoWatermark; const params: any = { source: 2, - mobile: this.sf.value.mobile, - bankCardNo: this.sf.value.bankCardNo, - bankName: this.sf.value.bankName, + mobile: this.sf?.value.mobile, + bankCardNo: this.sf?.value.bankCardNo, + bankName: this.sf?.value.bankName, identityInfoDTO: { ...items, certificatePhotoFront: this.detailData.certificatePhotoFront, diff --git a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts index 8a477dc9..44f85295 100644 --- a/src/app/routes/usercenter/components/driver/captain/add/add.component.ts +++ b/src/app/routes/usercenter/components/driver/captain/add/add.component.ts @@ -90,17 +90,17 @@ export class CtcCaptatinAddComponent implements OnInit { widget: this.i.id ? 'text' : '', placeholder: '请输入手机号', blur: () => { - if(!this.sf.value.mobile) { + if(!this.sf?.value.mobile) { return } - this.service.request(this.service.$api_getByMobile, { mobile: this.sf.value.mobile }).subscribe(res => { + this.service.request(this.service.$api_getByMobile, { mobile: this.sf?.value.mobile }).subscribe(res => { if (res.certificateNumber) { this.readFlag = true this.detailData = { - mobile: this.sf.value.mobile, - bankName: this.sf.value.bankName, - bankCardNo: this.sf.value.bankCardNo, - remark: this.sf.value.remark, + mobile: this.sf?.value.mobile, + bankName: this.sf?.value.bankName, + bankCardNo: this.sf?.value.bankCardNo, + remark: this.sf?.value.remark, identityInfoDTO: { certificatePhotoFrontWatermark: [ { @@ -128,10 +128,10 @@ export class CtcCaptatinAddComponent implements OnInit { } else { this.readFlag = false this.detailData = { - mobile: this.sf.value.mobile, - bankName: this.sf.value.bankName, - bankCardNo: this.sf.value.bankCardNo, - remark: this.sf.value.remark, + mobile: this.sf?.value.mobile, + bankName: this.sf?.value.bankName, + bankCardNo: this.sf?.value.bankCardNo, + remark: this.sf?.value.remark, identityInfoDTO: { certificatePhotoFrontWatermark: '', certificatePhotoBackWatermark: '', @@ -377,17 +377,17 @@ export class CtcCaptatinAddComponent implements OnInit { this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { if (res) { const params: any = { - bankCardNo: this.sf.value.bankCardNo, - bankName: this.sf.value.bankName, - mobile: this.sf.value.mobile, - remark: this.sf.value.remark, + bankCardNo: this.sf?.value.bankCardNo, + bankName: this.sf?.value.bankName, + mobile: this.sf?.value.mobile, + remark: this.sf?.value.remark, identityInfoDTO: { - certificatePhotoBackWatermark: this.sf.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value?.certificatePhotoBackWatermark, - certificatePhotoFrontWatermark: this.sf.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf.value?.certificatePhotoFrontWatermark, + certificatePhotoBackWatermark: this.sf?.value?.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf?.value?.certificatePhotoBackWatermark, + certificatePhotoFrontWatermark: this.sf?.value?.certificatePhotoFrontWatermark?.data?.fullFilePath ||this.sf?.value?.certificatePhotoFrontWatermark, certificatePhotoFront: this.detailData.certificatePhotoFront, certificatePhotoBack: this.detailData.certificatePhotoBack, - certificateNumber: this.sf.value.certificateNumber, - name: this.sf.value.name, + certificateNumber: this.sf?.value.certificateNumber, + name: this.sf?.value.name, } } if (this.i.id) { diff --git a/src/app/routes/usercenter/components/driver/captain/captain.component.ts b/src/app/routes/usercenter/components/driver/captain/captain.component.ts index 7191198c..bf8cbf37 100644 --- a/src/app/routes/usercenter/components/driver/captain/captain.component.ts +++ b/src/app/routes/usercenter/components/driver/captain/captain.component.ts @@ -32,7 +32,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit { */ get reqParams() { const params: any = { - ...(this.sf && this.sf.value) + ...(this.sf && this.sf?.value) }; if (this.sf?.value.effectiveDate) { params.effectiveDateStart = this.sf?.value.effectiveDate[0]; diff --git a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts index 66161971..46fe8dcd 100644 --- a/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts +++ b/src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts @@ -24,7 +24,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit { get reqParams() { const params: any = { auditStatus: 20, - ...(this.sf && this.sf.value) + ...(this.sf && this.sf?.value) }; delete params.effectiveDate; delete params.expand; diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index b4956e3c..9e97d181 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -39,7 +39,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { */ get reqParams() { const params: any = { - ...(this.sf && this.sf.value), + ...(this.sf && this.sf?.value), auditStatus: this.resourceStatus }; if (this.sf?.value.effectiveDate) { diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts index 5b2aaca8..a2f34c9c 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts @@ -50,13 +50,13 @@ export class FreightComponentsEnterpriseAuditComponent 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] || '' } }); } @@ -240,7 +240,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit { } exportList() { - const params = { ...this.sf.value, flag: this.tabType, listSource: 2, pageSize: -1 }; + const params = { ...this.sf?.value, flag: this.tabType, listSource: 2, pageSize: -1 }; this.service.downloadFile(this.service.$api_export_enterprise, params); } diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index 7cf9162b..26add0e2 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -40,7 +40,7 @@ export class FreightConfigComponent implements OnInit { Object.assign(requestOptions.body, { listSource: 1 }); if (this.sf?.value) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); if (this.sf?.value.createTime) { Object.assign(requestOptions.body, { @@ -171,7 +171,7 @@ export class FreightConfigComponent implements OnInit { const params = { listSource: 1, pageSize: -1 }; if (this.sf) { Object.assign(params, { - ...this.sf.value + ...this.sf?.value }); } this.service.downloadFile(this.service.$api_export_freight_config, params); diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index 627cb0f8..b517e581 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -149,7 +149,7 @@ export class EditPartnerComponentsAddComponent implements OnInit { enterId = [this.i.id] } const params = { - ...this.sf.value, + ...this.sf?.value, enterpriceIds: enterId, settStartTime: this.sf?.value?.settStartTime + ' 00:00:00' } diff --git a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts index 7b67fc42..1b1b174b 100644 --- a/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editSale/editSale.component.ts @@ -122,7 +122,7 @@ export class EditSaleComponentsAddComponent implements OnInit { nzContent: '确定提交吗？', nzOnOk: () => { const params = { - ...this.sf.value, + ...this.sf?.value, enterpriceIds: enterId, } diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index 8184a56f..d7d5860c 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -47,21 +47,21 @@ export class FreightComponentsListComponent implements OnInit { Object.assign(requestOptions.body, { listSource: 1 }); 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.approvalTime) { + if (this.sf?.value.approvalTime) { Object.assign(requestOptions.body, { approvalTime: { - start: this.sf.value.approvalTime[0], - end: this.sf.value.approvalTime[1] + start: this.sf?.value.approvalTime[0], + end: this.sf?.value.approvalTime[1] } }); } @@ -555,7 +555,7 @@ export class FreightComponentsListComponent implements OnInit { const params = { listSource: 1, pageSize: -1 }; if (this.sf) { Object.assign(params, { - ...this.sf.value + ...this.sf?.value }); } this.service.downloadFile(this.service.$api_export_enterprise, params); diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index 59359454..c5a26054 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -107,12 +107,12 @@ export class FreightComponentsListNewComponent implements OnInit { return; } } - const sfVlaue = this.sf.value; + const sfVlaue = this.sf?.value; const params = {}; Object.assign( params, { ...this.sf1.value }, - { ...this.sf.value }, + { ...this.sf?.value }, { enterpriseAddressCode: this.sf1.value.enterpriseAddressCode[2], oftenUsedServices: sfVlaue.oftenUsedServices, diff --git a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts index ce6e942a..01edf682 100644 --- a/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts +++ b/src/app/routes/usercenter/components/freight/list/showService/showservice.component.ts @@ -80,7 +80,7 @@ export class ShowServiceComponent implements OnInit { } submitForm() { const params: any = { - ...this.sf.value, + ...this.sf?.value, enterpriseIdList: [this.i.id] }; this.service.request(this.service.$api_distributionCusService, params).subscribe(res => { diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts index 8aee6208..f24369eb 100644 --- a/src/app/routes/usercenter/components/freight/user/user.component.ts +++ b/src/app/routes/usercenter/components/freight/user/user.component.ts @@ -35,7 +35,7 @@ export class FreightComponentsUserComponent implements OnInit { Object.assign(requestOptions.body, { certificationStatus: this.resourceStatus }); if (this.sf) { Object.assign(requestOptions.body, { - ...this.sf.value + ...this.sf?.value }); if (this.sf?.value.effectiveDate) { Object.assign(requestOptions.body, { diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 092c7c90..8ea6e54d 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -735,7 +735,7 @@ export class CarSettleCarauthComponent implements OnInit { submitForm() { const params: any = { appUserId: this.i.appUserId, - ...this.sf.value, + ...this.sf?.value, bindType: this.i.bindType }; params.carFrontPhoto = this.detailData.carFrontPhoto; diff --git a/src/app/routes/vehicle/components/list/edit/edit.component.ts b/src/app/routes/vehicle/components/list/edit/edit.component.ts index d614e420..f94e7ae0 100644 --- a/src/app/routes/vehicle/components/list/edit/edit.component.ts +++ b/src/app/routes/vehicle/components/list/edit/edit.component.ts @@ -116,11 +116,11 @@ export class VehicleComponentsListEditComponent implements OnInit { this.modal.destroy(); } sure() { - console.log(this.sf.value); + console.log(this.sf?.value); const params ={ - carProtocal: this.sf.value.carProtocal, - carProtocalWatermark: this.sf.value.carProtocalWatermark, + carProtocal: this.sf?.value.carProtocal, + carProtocalWatermark: this.sf?.value.carProtocalWatermark, id: this.i.id } this.service.request(this.service.$api_get_upLoadCarProtocal, params).subscribe((res) => { diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 5a871858..04a43d76 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -26,7 +26,7 @@ export class VehicleComponentsListComponent implements OnInit { */ get reqParams() { const params: any = { - ...(this.sf && this.sf.value) + ...(this.sf && this.sf?.value) }; if (this.sf?.value.effectiveDate) { params.effectiveDateStart = this.sf?.value.effectiveDate[0]; diff --git a/src/app/shared/components/search-drawer/search-drawer.component.ts b/src/app/shared/components/search-drawer/search-drawer.component.ts index 3e8b30fd..2395073c 100644 --- a/src/app/shared/components/search-drawer/search-drawer.component.ts +++ b/src/app/shared/components/search-drawer/search-drawer.component.ts @@ -46,7 +46,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit { search() { if (this.sf) { - this.service.closeEvent.next(this.sf.value); + this.service.closeEvent.next(this.sf?.value); } } From 88c4f567ef5b13b446076dfb4474f6dc1fb94fc0 Mon Sep 17 00:00:00 2001 From: weiyu Date: Thu, 28 Apr 2022 20:34:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B4=E8=BD=A6?= =?UTF-8?q?=E5=BE=85=E5=8F=91=E8=B4=A7=E6=BA=90=E8=A1=A8=E5=8D=95=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/release-publish/release-publish.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 57b97963..b17688c4 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -71,8 +71,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { unloadAddress0: [null, [Validators.required]], unloadName0: [null, [Validators.required]], unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], - loadingTime: [null, []], - unloadingTime: [null, []] + loadingTime: [null, [Validators.required]], + unloadingTime: [null, [Validators.required]] }); }