-
+
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/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..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;
};
@@ -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..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,13 +36,13 @@ 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;
};
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/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 7e0458e2..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] || ''
}
});
}
@@ -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-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 47e3e0cc..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] || ''
}
});
}
@@ -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-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 51d45ce9..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] || ''
}
});
}
@@ -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/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 8acbf17f..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] || ''
}
});
}
@@ -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-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 0fda4eae..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) {
@@ -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/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 75cbd5d3..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] || ''
}
});
}
@@ -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..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] || ''
}
});
}
@@ -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..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] || ''
}
});
}
@@ -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-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 0f556f33..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] || ''
}
});
}
@@ -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..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] || ''
},
});
}
@@ -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/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts
index 00db0eb7..7cdee930 100644
--- a/src/app/routes/financial-management/financial-managemen-routing.module.ts
+++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts
@@ -37,7 +37,11 @@ import { CwcBankCardManagementIndexComponent } from './components/bank-card-mana
const routes: Routes = [
{ path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } },
- { path: 'freight-account/detail/:id', component: FreightAccountDetailComponent },
+ {
+ path: 'freight-account/detail/:id',
+ component: FreightAccountDetailComponent,
+ data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-DETAIL-view'] } }
+ },
{ path: 'driver-account', component: DriverAccountComponent, data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-list'] } } },
{
path: 'driver-account/detail/:id',
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/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]]
});
}
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/announcement-message/announcement-message.component.html b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
index ff5a6eb5..493c1423 100644
--- a/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
+++ b/src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
@@ -13,14 +13,7 @@
-
-
-
-
-
-
@@ -35,7 +28,6 @@
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 @@