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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
潘晓云
2022-04-28 20:42:59 +08:00
parent bbc3095852 5eb22cb934
commit f83ab482a8
120 changed files with 413 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/account/components/edit-name/edit-name.component.ts
View File

@ -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) => {

10
src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts
View File

@ -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
};

2
src/app/routes/contract-management/components/policy/policy.component.ts
View File

@ -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;

18
src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html
View File

@ -1,11 +1,21 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-04-21 13:49:21
* @LastEditors : Shiming
* @LastEditTime : 2022-04-28 20:09:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\busitable\\busiindex\\busiindex.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 页头 -->
<page-header-wrapper [title]="'业务报表'"></page-header-wrapper>
<nz-card nzTitle="运多星平台业务情况" [nzExtra]="extraTemplate">
<nz-card nzTitle="运多星平台业务情况" [nzExtra]="extraTemplate" acl [acl-ability]="['busiindex-tabel']">
<ng-template #extraTemplate>
<div class="chooseBox">
<button nz-button nzType="primary" (click)="exportFun()">导出</button>
<div class="timeBox">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" acl [acl-ability]="['busiindex-tabel']">
<nz-radio-group [(ngModel)]="mode" nzButtonStyle="solid" (ngModelChange)="changeData()" >
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
<label nz-radio-button nzValue="date">日</label>
@ -23,11 +33,11 @@
[scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st>
</nz-card>
<nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01">
<nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01" acl [acl-ability]="['busiindex-report']">
<ng-template #extraTemplate01>
<div class="chooseBox">
<div class="timeBox">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" acl [acl-ability]="['busiindex-report']">
<nz-radio-group [(ngModel)]="modeNext" nzButtonStyle="solid" (ngModelChange)="changeDataNext()" >
<label nz-radio-button nzValue="year">年</label>
<label nz-radio-button nzValue="month">月</label>
</nz-radio-group>

2
src/app/routes/datatable/components/compliance/salesman/salesman.component.ts
View File

@ -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)

2
src/app/routes/datatable/components/customtable/driver/driver.component.ts
View File

@ -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)

2
src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts
View File

@ -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);

2
src/app/routes/datatable/components/customtable/owner/owner.component.ts
View File

@ -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)

2
src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts
View File

@ -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 = '提示') {

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

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

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

@ -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 {

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

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

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

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

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

@ -40,10 +40,10 @@ export class DriverAccountDetailComponent implements OnInit {
});
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
createTime: {
start: this.sf.value?.createTime?.[0] || '',
end: this.sf.value?.createTime?.[1] || ''
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
}
});
}
@ -78,7 +78,7 @@ export class DriverAccountDetailComponent implements OnInit {
exportList() {
this.service.exportStart(
{
...this.sf.value,
...this.sf?.value,
pageSize: -1,
ltdId: this.params.ltdId,
projectId: this.params.projectId,
@ -86,8 +86,8 @@ export class DriverAccountDetailComponent implements OnInit {
roleId: this.params.roleId,
bankType: this.params.bankType,
createTime: {
start: this.sf.value?.createTime?.[0] || '',
end: this.sf.value?.createTime?.[1] || ''
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
}
},
this.service.$api_get_exportAccountBalanceDriverByOperatorPage

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

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

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

@ -39,7 +39,7 @@ export class FreightAccountDetailComponent implements OnInit {
});
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
createTime: {
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
@ -85,7 +85,7 @@ export class FreightAccountDetailComponent implements OnInit {
exportList() {
this.service.exportStart(
{
...this.sf.value,
...this.sf?.value,
pageSize: -1,
ltdId: this.params.ltdId,
projectId: this.params.projectId,

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

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

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

@ -44,29 +44,29 @@ export class PayableOrderDetailComponent implements OnInit {
Object.assign(requestOptions.body, { phxHId: this.billHId });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
start: this.sf?.value.billTime?.[0] || null,
end: this.sf?.value.billTime?.[1] || null
},
feedate: {
start: this.sf.value.feedate?.[0] || null,
end: this.sf.value.feedate?.[1] || null
start: this.sf?.value.feedate?.[0] || null,
end: this.sf?.value.feedate?.[1] || null
}
});
if (this.sf.value.billTime) {
if (this.sf?.value.billTime) {
Object.assign(requestOptions.body, {
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
start: this.sf?.value.billTime?.[0] || null,
end: this.sf?.value.billTime?.[1] || null
}
});
}
if (this.sf.value.feedate) {
if (this.sf?.value.feedate) {
Object.assign(requestOptions.body, {
feedate: {
start: this.sf.value.feedate?.[0] || null,
end: this.sf.value.feedate?.[1] || null
start: this.sf?.value.feedate?.[0] || null,
end: this.sf?.value.feedate?.[1] || null
}
});
}

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

@ -45,21 +45,21 @@ export class PayableOrderComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value?.createTime) {
if (this.sf?.value?.createTime) {
Object.assign(requestOptions.body, {
createTime: {
start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || ''
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
}
});
}
if (this.sf.value?.phxdate) {
if (this.sf?.value?.phxdate) {
Object.assign(requestOptions.body, {
phxdate: {
start: this.sf.value.phxdate?.[0] || '',
end: this.sf.value.phxdate?.[1] || ''
start: this.sf?.value.phxdate?.[0] || '',
end: this.sf?.value.phxdate?.[1] || ''
}
});
}

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

@ -39,15 +39,15 @@ export class PaymentOrderDetailComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
...this.sf?.value,
payHId: this.id,
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
start: this.sf?.value.billTime?.[0] || null,
end: this.sf?.value.billTime?.[1] || null
},
feedate: {
start: this.sf.value.feedate?.[0] || null,
end: this.sf.value.feedate?.[1] || null
start: this.sf?.value.feedate?.[0] || null,
end: this.sf?.value.feedate?.[1] || null
}
});
} else {

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

@ -38,7 +38,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
let params = { ...this.sf.value };
let params = { ...this.sf?.value };
if (params.payDate) {
const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] };
params.payDate = payDate;

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

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

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

@ -34,13 +34,13 @@ export class PlatformAccountDetailComponent implements OnInit {
Object.assign(requestOptions.body, { ...this.params });
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value.createTime) {
if (this.sf?.value.createTime) {
Object.assign(requestOptions.body, {
createTime: {
start: this.sf.value?.createTime?.[0] || '',
end: this.sf.value?.createTime?.[1] || ''
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
}
});
}
@ -68,11 +68,11 @@ export class PlatformAccountDetailComponent implements OnInit {
exportList() {
this.service.exportStart(
{
...this.sf.value,
...this.sf?.value,
...this.params,
createTime: {
start: this.sf.value?.createTime?.[0] || '',
end: this.sf.value?.createTime?.[1] || ''
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || ''
},
pageSize: -1
},

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

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

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

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

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

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

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

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

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

@ -47,21 +47,21 @@ export class ReceivableOrderComponent implements OnInit {
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
if (this.sf.value?.createTime) {
if (this.sf?.value?.createTime) {
Object.assign(requestOptions.body, {
createTime: {
start: this.sf.value.createTime?.[0] || '',
end: this.sf.value.createTime?.[1] || ''
start: this.sf?.value.createTime?.[0] || '',
end: this.sf?.value.createTime?.[1] || ''
}
});
}
if (this.sf.value?.ahxdate) {
if (this.sf?.value?.ahxdate) {
Object.assign(requestOptions.body, {
ahxdate: {
start: this.sf.value.ahxdate?.[0] || '',
end: this.sf.value.ahxdate?.[1] || ''
start: this.sf?.value.ahxdate?.[0] || '',
end: this.sf?.value.ahxdate?.[1] || ''
}
});
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
src/app/routes/financial-management/financial-managemen-routing.module.ts
View File

@ -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',

6
src/app/routes/logs/components/system-logs/system-logs.component.ts
View File

@ -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;

6
src/app/routes/logs/components/system-supply-logs/system-supply-logs.component.ts
View File

@ -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;

6
src/app/routes/logs/components/system-waybill-logs/system-waybill-logs.component.ts
View File

@ -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;

6
src/app/routes/logs/components/user-logs/user-logs.component.ts
View File

@ -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
}
});
}

6
src/app/routes/logs/components/version-logs/version-logs.component.ts
View File

@ -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
}
});
}

2
src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts
View File

@ -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;

8
src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts
View File

@ -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) {

24
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -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) {

4
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
View File

@ -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('变更运费成功！');

4
src/app/routes/order-management/modal/vehicle/cancel-confirm/cancel-confirm.component.ts
View File

@ -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) {

4
src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts
View File

@ -60,7 +60,7 @@ export class OneCarOrderCancelComponent implements OnInit {
this.modal.confirm({
nzTitle: '<i>是否确定立即取消运单！</i>',
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);
}

4
src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
View File

@ -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) => {

6
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
View File

@ -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) => {

18
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -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,
}

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

@ -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
});

2
src/app/routes/partner/article-management/components/edit/edit.component.ts
View File

@ -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 {

2
src/app/routes/partner/channel-sales/components/edit/edit.component.ts
View File

@ -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 => {

2
src/app/routes/partner/claim-audit/components/channel-approve/channel-approve.component.ts
View File

@ -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 {

2
src/app/routes/partner/claim-audit/components/channel-reject/channel-reject.component.ts
View File

@ -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 {

2
src/app/routes/partner/claim-audit/components/partner-approve/partner-approve.component.ts
View File

@ -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 {

2
src/app/routes/partner/claim-audit/components/partner-reject/partner-reject.component.ts
View File

@ -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 {

4
src/app/routes/partner/knowledge/banner/components/add/add.component.ts
View File

@ -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 {

2
src/app/routes/partner/level-config/components/edit/edit.component.ts
View File

@ -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);

20
src/app/routes/partner/partner-list/components/add-etp-partner/add-etp-partner.component.ts
View File

@ -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 => {

10
src/app/routes/partner/partner-list/components/add-personal-partner/add-personal-partner.component.ts
View File

@ -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) {

2
src/app/routes/partner/partner-list/components/index/partner-list.component.ts
View File

@ -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] };
}

6
src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts
View File

@ -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, {

2
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
View File

@ -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
};

8
src/app/routes/partner/recorded/components/record/record.component.ts
View File

@ -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;
}

4
src/app/routes/partner/scrollimg/components/add/add.component.ts
View File

@ -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 {

4
src/app/routes/supply-management/components/add-driver/add-driver.component.ts
View File

@ -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,
},

2
src/app/routes/supply-management/components/choose-famifiar/set-captain/set-captain.component.ts
View File

@ -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)}
}

4
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -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]]
});
}

2
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -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: {

6
src/app/routes/supply-management/model/import-supply/import-supply.component.ts
View File

@ -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)

8
src/app/routes/sys-setting/components/announcement-message/announcement-message.component.html
View File

@ -13,14 +13,7 @@
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [loading]="false" (formSubmit)="st?.load(1)"
(formReset)="resetSF()"></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
@ -35,7 +28,6 @@
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>

10
src/app/routes/sys-setting/components/cart-config/cart-config-action-modal/cart-config-action-modal.component.ts
View File

@ -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('保存成功！');

4
src/app/routes/sys-setting/components/network-freight/new/new.component.ts
View File

@ -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,

2
src/app/routes/sys-setting/components/note-management/note-management.component.ts
View File

@ -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;
};

2
src/app/routes/sys-setting/components/organization-management/organization-modal/organization-modal.component.ts
View File

@ -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

2
src/app/routes/sys-setting/components/role-management/edit/edit.component.ts
View File

@ -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
};

2
src/app/routes/sys-setting/components/role-management/role-management.component.ts
View File

@ -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 });

2
src/app/routes/sys-setting/components/sms-template/sms-template.component.ts
View File

@ -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;
};

2
src/app/routes/sys-setting/components/staff-management/staff-management.component.html
View File

@ -35,6 +35,6 @@
</div>
<st #st [data]="service.$api_get_enterprise_staff_page" [columns]="columns" [page]="{}"
[req]="{ params: {nameOrPhone: this.sf.value?.nameOrPhone} }" [loading]="false" [scroll]="{ y: '370px' }"
[req]="{ params: {nameOrPhone: this.sf?.value?.nameOrPhone} }" [loading]="false" [scroll]="{ y: '370px' }"
(change)="stChange($event)"></st>
</nz-card>

2
src/app/routes/sys-setting/components/staff-management/staff-management.component.ts
View File

@ -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 });
}

6
src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts
View File

@ -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) {

2
src/app/routes/tax-management/components/individual-income/individual-income.component.ts
View File

@ -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 = [];

4
src/app/routes/ticket-management/components/billing-order/billing-order.component.ts
View File

@ -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;
@ -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 {

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

@ -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] || ''
}
});
}

2
src/app/routes/ticket-management/components/etc-blacklist/add-cart/add-cart.component.ts
View File

@ -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;

2
src/app/routes/ticket-management/components/etc-blacklist/add-owner/add-owner.component.ts
View File

@ -63,7 +63,7 @@ export class AddOwnerComponent implements OnInit {
});
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value
...this.sf?.value
});
}
return requestOptions;

6
src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts
View File

@ -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 = [];
@ -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);
}
}
}

2
src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts
View File

@ -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;

12
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.ts
View File

@ -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);

2
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
View File

@ -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 = [];

6
src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts
View File

@ -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
}
});
}

6
src/app/routes/ticket-management/components/express-info/express-info.component.ts
View File

@ -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] || ''
}
});
}

2
src/app/routes/ticket-management/components/input-invoice/add-collection-invoice-modal/add-collection-invoice-modal.component.ts
View File

@ -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) {

2
src/app/routes/ticket-management/components/input-invoice/add-cost-detail/add-cost-detail.component.ts
View File

@ -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;

10
src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts
View File

@ -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
}
});
}

10
src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
View File

@ -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] || ''
}
});
}

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

@ -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;
};

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

@ -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] || ''
@ -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 {

6
src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.ts
View File

@ -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] || ''
}
});
}

Some files were not shown because too many files have changed in this diff Show More