Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
		| @ -227,7 +227,7 @@ export class AccountComponentsEditNameComponent implements OnInit, AfterViewInit | |||||||
|   } |   } | ||||||
|   submitForm() { |   submitForm() { | ||||||
|     const params = { |     const params = { | ||||||
|       smsVerifyCode: this.sf.value.smsVerifyCode, |       smsVerifyCode: this.sf?.value.smsVerifyCode, | ||||||
|     }; |     }; | ||||||
|  |  | ||||||
|     this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => { |     this.service.http.post(this.service.$api_get_verifyPhone, params).subscribe((res) => { | ||||||
|  | |||||||
| @ -275,22 +275,22 @@ export class ContractManagementTemplateTextComponent implements OnInit { | |||||||
|  |  | ||||||
|   save() { |   save() { | ||||||
|     if ( |     if ( | ||||||
|       !this.sf.value.templateName || |       !this.sf?.value.templateName || | ||||||
|       !this.sf.value.templateType || |       !this.sf?.value.templateType || | ||||||
|       !this.sf2.value.templateContent || |       !this.sf2.value.templateContent || | ||||||
|       !(this.title || this.detailList.templateName) |       !(this.title || this.detailList.templateName) | ||||||
|     ) { |     ) { | ||||||
|       this.service.msgSrv.error('必填参数为空,请检查再重新保存!'); |       this.service.msgSrv.error('必填参数为空,请检查再重新保存!'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.templateType == 'MX') { |     if (this.sf?.value.templateType == 'MX') { | ||||||
|       if (this.sf.value.contractType == '') { |       if (this.sf?.value.contractType == '') { | ||||||
|         this.service.msgSrv.error('必填参数为空,请检查再重新保存!'); |         this.service.msgSrv.error('必填参数为空,请检查再重新保存!'); | ||||||
|         return; |         return; | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     const params = { |     const params = { | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|       ...this.sf2.value, |       ...this.sf2.value, | ||||||
|       templateTitle: this.detailList.templateName || this.title |       templateTitle: this.detailList.templateName || this.title | ||||||
|     }; |     }; | ||||||
|  | |||||||
| @ -34,7 +34,7 @@ export class ContractManagementPolicyComponent implements OnInit { | |||||||
|    */ |    */ | ||||||
|   get reqParams() { |   get reqParams() { | ||||||
|     const params: any = { |     const params: any = { | ||||||
|       ...(this.sf && this.sf.value) |       ...(this.sf && this.sf?.value) | ||||||
|     }; |     }; | ||||||
|     delete params.expand; |     delete params.expand; | ||||||
|     return params; |     return params; | ||||||
|  | |||||||
| @ -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> | <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> |   <ng-template #extraTemplate> | ||||||
|     <div class="chooseBox"> |     <div class="chooseBox"> | ||||||
|       <button nz-button nzType="primary" (click)="exportFun()">导出</button> |       <button nz-button nzType="primary" (click)="exportFun()">导出</button> | ||||||
|       <div class="timeBox"> |       <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="year">年</label> | ||||||
|           <label nz-radio-button nzValue="month">月</label> |           <label nz-radio-button nzValue="month">月</label> | ||||||
|           <label nz-radio-button nzValue="date">日</label> |           <label nz-radio-button nzValue="date">日</label> | ||||||
| @ -23,11 +33,11 @@ | |||||||
|     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" |     [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" | ||||||
|     [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st> |     [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"></st> | ||||||
| </nz-card> | </nz-card> | ||||||
| <nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01"> | <nz-card nzTitle="业绩报表" [nzExtra]="extraTemplate01" acl  [acl-ability]="['busiindex-report']"> | ||||||
|   <ng-template #extraTemplate01> |   <ng-template #extraTemplate01> | ||||||
|     <div class="chooseBox"> |     <div class="chooseBox"> | ||||||
|       <div class="timeBox"> |       <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="year">年</label> | ||||||
|           <label nz-radio-button nzValue="month">月</label> |           <label nz-radio-button nzValue="month">月</label> | ||||||
|         </nz-radio-group> |         </nz-radio-group> | ||||||
|  | |||||||
| @ -195,7 +195,7 @@ export class DatatableComplianceSalesmanComponent implements OnInit { | |||||||
|     differenceInCalendarDays(current, this.today) > 0; |     differenceInCalendarDays(current, this.today) > 0; | ||||||
|  |  | ||||||
|     export() { |     export() { | ||||||
|       // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); |       // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); | ||||||
|     } |     } | ||||||
|   search() { |   search() { | ||||||
|     this.st?.load(1) |     this.st?.load(1) | ||||||
|  | |||||||
| @ -153,7 +153,7 @@ export class DatatableDriverComponent implements OnInit { | |||||||
|     differenceInCalendarDays(current, this.today) > 0; |     differenceInCalendarDays(current, this.today) > 0; | ||||||
|  |  | ||||||
|   export() { |   export() { | ||||||
|     // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); |     // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); | ||||||
|   } |   } | ||||||
|   search() { |   search() { | ||||||
|     this.st?.load(1) |     this.st?.load(1) | ||||||
|  | |||||||
| @ -313,7 +313,7 @@ export class DatatableMancustomtableComponent implements OnInit { | |||||||
|     differenceInCalendarDays(current, this.today) > 0; |     differenceInCalendarDays(current, this.today) > 0; | ||||||
|  |  | ||||||
|   export() { |   export() { | ||||||
|     // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); |     // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); | ||||||
|   } |   } | ||||||
|   search() { |   search() { | ||||||
|     this.st?.load(1); |     this.st?.load(1); | ||||||
|  | |||||||
| @ -165,7 +165,7 @@ export class DatatableOwnerComponent implements OnInit { | |||||||
|     differenceInCalendarDays(current, this.today) > 0; |     differenceInCalendarDays(current, this.today) > 0; | ||||||
|  |  | ||||||
|     export() { |     export() { | ||||||
|       // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf.value, {}); |       // this.service.downloadFile(this.service.$api_exportUploadBill, this.sf?.value, {}); | ||||||
|     } |     } | ||||||
|   search() { |   search() { | ||||||
|     this.st?.load(1) |     this.st?.load(1) | ||||||
|  | |||||||
| @ -413,7 +413,7 @@ export class DatatableFundReportingComponent implements OnInit { | |||||||
|   * 异步导出 |   * 异步导出 | ||||||
|   */ |   */ | ||||||
|   export() { |   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 = '提示') { |   openWainingModal(content: string, title = '提示') { | ||||||
|  | |||||||
| @ -38,7 +38,7 @@ export class AbnormalGoldComponent extends BasicTableComponent implements OnInit | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus }); |     Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|   }; |   }; | ||||||
| @ -179,6 +179,6 @@ export class AbnormalGoldComponent extends BasicTableComponent implements OnInit | |||||||
|   } |   } | ||||||
|   // 导出 |   // 导出 | ||||||
|   exprot() { |   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); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -36,13 +36,13 @@ export class AdvanceCollectionComponent extends BasicTableComponent { | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   exportList() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -125,7 +125,7 @@ export class CwcBankCardManagementBindComponent implements OnInit { | |||||||
|  |  | ||||||
|   submit() { |   submit() { | ||||||
|     if (this.sf.valid) { |     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) { |         if (res) { | ||||||
|           this.modalRef.destroy(true); |           this.modalRef.destroy(true); | ||||||
|         } |         } | ||||||
|  | |||||||
| @ -42,14 +42,14 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         feedate: { |         feedate: { | ||||||
|           start: this.sf.value.feedate?.[0] || '', |           start: this.sf?.value.feedate?.[0] || '', | ||||||
|           end: this.sf.value.feedate?.[1] || '' |           end: this.sf?.value.feedate?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -84,7 +84,7 @@ export class CostManagementComponent extends BasicTableComponent implements OnIn | |||||||
|  |  | ||||||
|  |  | ||||||
|   exportList() { |   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) { |   routeTo(url: string, params?: any, status?: any) { | ||||||
|  | |||||||
| @ -40,10 +40,10 @@ export class DriverAccountDetailComponent implements OnInit { | |||||||
|     }); |     }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value?.createTime?.[0] || '', |           start: this.sf?.value?.createTime?.[0] || '', | ||||||
|           end: this.sf.value?.createTime?.[1] || '' |           end: this.sf?.value?.createTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -78,7 +78,7 @@ export class DriverAccountDetailComponent implements OnInit { | |||||||
|   exportList() { |   exportList() { | ||||||
|     this.service.exportStart( |     this.service.exportStart( | ||||||
|       { |       { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         pageSize: -1, |         pageSize: -1, | ||||||
|         ltdId: this.params.ltdId, |         ltdId: this.params.ltdId, | ||||||
|         projectId: this.params.projectId, |         projectId: this.params.projectId, | ||||||
| @ -86,8 +86,8 @@ export class DriverAccountDetailComponent implements OnInit { | |||||||
|         roleId: this.params.roleId, |         roleId: this.params.roleId, | ||||||
|         bankType: this.params.bankType, |         bankType: this.params.bankType, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value?.createTime?.[0] || '', |           start: this.sf?.value?.createTime?.[0] || '', | ||||||
|           end: this.sf.value?.createTime?.[1] || '' |           end: this.sf?.value?.createTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }, |       }, | ||||||
|       this.service.$api_get_exportAccountBalanceDriverByOperatorPage |       this.service.$api_get_exportAccountBalanceDriverByOperatorPage | ||||||
|  | |||||||
| @ -38,12 +38,12 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     Object.assign(requestOptions.body, { accountType: 2 }); |     Object.assign(requestOptions.body, { accountType: 2 }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
| @ -70,7 +70,7 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   exportList() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -39,7 +39,7 @@ export class FreightAccountDetailComponent implements OnInit { | |||||||
|     }); |     }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf?.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf?.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
| @ -85,7 +85,7 @@ export class FreightAccountDetailComponent implements OnInit { | |||||||
|   exportList() { |   exportList() { | ||||||
|     this.service.exportStart( |     this.service.exportStart( | ||||||
|       { |       { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         pageSize: -1, |         pageSize: -1, | ||||||
|         ltdId: this.params.ltdId, |         ltdId: this.params.ltdId, | ||||||
|         projectId: this.params.projectId, |         projectId: this.params.projectId, | ||||||
|  | |||||||
| @ -44,12 +44,12 @@ export class FreightAccountComponent extends BasicTableComponent implements OnIn | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     Object.assign(requestOptions.body, { accountType: 1 }); |     Object.assign(requestOptions.body, { accountType: 1 }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
| @ -72,7 +72,7 @@ export class FreightAccountComponent extends BasicTableComponent implements OnIn | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   exportList() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -44,29 +44,29 @@ export class PayableOrderDetailComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body, { phxHId: this.billHId }); |     Object.assign(requestOptions.body, { phxHId: this.billHId }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         billTime: { |         billTime: { | ||||||
|           start: this.sf.value.billTime?.[0] || null, |           start: this.sf?.value.billTime?.[0] || null, | ||||||
|           end: this.sf.value.billTime?.[1] || null |           end: this.sf?.value.billTime?.[1] || null | ||||||
|         }, |         }, | ||||||
|         feedate: { |         feedate: { | ||||||
|           start: this.sf.value.feedate?.[0] || null, |           start: this.sf?.value.feedate?.[0] || null, | ||||||
|           end: this.sf.value.feedate?.[1] || null |           end: this.sf?.value.feedate?.[1] || null | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value.billTime) { |       if (this.sf?.value.billTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           billTime: { |           billTime: { | ||||||
|             start: this.sf.value.billTime?.[0] || null, |             start: this.sf?.value.billTime?.[0] || null, | ||||||
|             end: this.sf.value.billTime?.[1] || null |             end: this.sf?.value.billTime?.[1] || null | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|       if (this.sf.value.feedate) { |       if (this.sf?.value.feedate) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           feedate: { |           feedate: { | ||||||
|             start: this.sf.value.feedate?.[0] || null, |             start: this.sf?.value.feedate?.[0] || null, | ||||||
|             end: this.sf.value.feedate?.[1] || null |             end: this.sf?.value.feedate?.[1] || null | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -45,21 +45,21 @@ export class PayableOrderComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value?.createTime) { |       if (this.sf?.value?.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|       if (this.sf.value?.phxdate) { |       if (this.sf?.value?.phxdate) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           phxdate: { |           phxdate: { | ||||||
|             start: this.sf.value.phxdate?.[0] || '', |             start: this.sf?.value.phxdate?.[0] || '', | ||||||
|             end: this.sf.value.phxdate?.[1] || '' |             end: this.sf?.value.phxdate?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -39,15 +39,15 @@ export class PaymentOrderDetailComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         payHId: this.id, |         payHId: this.id, | ||||||
|         billTime: { |         billTime: { | ||||||
|           start: this.sf.value.billTime?.[0] || null, |           start: this.sf?.value.billTime?.[0] || null, | ||||||
|           end: this.sf.value.billTime?.[1] || null |           end: this.sf?.value.billTime?.[1] || null | ||||||
|         }, |         }, | ||||||
|         feedate: { |         feedate: { | ||||||
|           start: this.sf.value.feedate?.[0] || null, |           start: this.sf?.value.feedate?.[0] || null, | ||||||
|           end: this.sf.value.feedate?.[1] || null |           end: this.sf?.value.feedate?.[1] || null | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } else { |     } else { | ||||||
|  | |||||||
| @ -38,7 +38,7 @@ export class PaymentOrderComponent extends BasicTableComponent implements OnInit | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       let params = { ...this.sf.value }; |       let params = { ...this.sf?.value }; | ||||||
|       if (params.payDate) { |       if (params.payDate) { | ||||||
|         const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] }; |         const payDate = { start: this.sf?.value?.payDate?.[0], end: this.sf?.value?.payDate?.[1] }; | ||||||
|         params.payDate = payDate; |         params.payDate = payDate; | ||||||
|  | |||||||
| @ -38,14 +38,14 @@ export class PaymentRecordComponent extends BasicTableComponent implements OnIni | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         applyDate: { |         applyDate: { | ||||||
|           start: this.sf.value.applyDate?.[0] || '', |           start: this.sf?.value.applyDate?.[0] || '', | ||||||
|           end: this.sf.value.applyDate?.[1] || '' |           end: this.sf?.value.applyDate?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         handlerDate: { |         handlerDate: { | ||||||
|           start: this.sf.value.handlerDate?.[0] || '', |           start: this.sf?.value.handlerDate?.[0] || '', | ||||||
|           end: this.sf.value.handlerDate?.[1] || '' |           end: this.sf?.value.handlerDate?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -263,6 +263,6 @@ export class PaymentRecordComponent extends BasicTableComponent implements OnIni | |||||||
|   } |   } | ||||||
|   // 导出 |   // 导出 | ||||||
|   exprot() { |   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); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -34,13 +34,13 @@ export class PlatformAccountDetailComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body, { ...this.params }); |     Object.assign(requestOptions.body, { ...this.params }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value?.createTime?.[0] || '', |             start: this.sf?.value?.createTime?.[0] || '', | ||||||
|             end: this.sf.value?.createTime?.[1] || '' |             end: this.sf?.value?.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
| @ -68,11 +68,11 @@ export class PlatformAccountDetailComponent implements OnInit { | |||||||
|   exportList() { |   exportList() { | ||||||
|     this.service.exportStart( |     this.service.exportStart( | ||||||
|       { |       { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         ...this.params, |         ...this.params, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value?.createTime?.[0] || '', |           start: this.sf?.value?.createTime?.[0] || '', | ||||||
|           end: this.sf.value?.createTime?.[1] || '' |           end: this.sf?.value?.createTime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         pageSize: -1 |         pageSize: -1 | ||||||
|       }, |       }, | ||||||
|  | |||||||
| @ -36,7 +36,7 @@ export class PlatformAccountComponent implements OnInit { | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     this.loadStatistics(requestOptions.body); |     this.loadStatistics(requestOptions.body); | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
| @ -45,7 +45,7 @@ export class PlatformAccountComponent implements OnInit { | |||||||
|   loadInfo() { |   loadInfo() { | ||||||
|     const params = {}; |     const params = {}; | ||||||
|     if (this.sf) { |     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 => { |     this.service.request(this.service.$api_get_platform_account_header, params).subscribe(res => { | ||||||
|       if (res) { |       if (res) { | ||||||
| @ -249,7 +249,7 @@ export class PlatformAccountComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   exportList() { |   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); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   // 提现 |   // 提现 | ||||||
|  | |||||||
| @ -64,13 +64,13 @@ export class SettingFinancialComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   sure() { |   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('员工角色不能为空!'); |       this.service.msgSrv.error('员工角色不能为空!'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     this.roleNames = []; |     this.roleNames = []; | ||||||
|     this.roleList.forEach((item: { id: any; roleName: string }) => { |     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) { |         if (ele === item.id) { | ||||||
|           this.roleNames.push(item.roleName); |           this.roleNames.push(item.roleName); | ||||||
|         } |         } | ||||||
| @ -78,11 +78,11 @@ export class SettingFinancialComponent implements OnInit { | |||||||
|     }); |     }); | ||||||
|     if (this.i.id === 0) { |     if (this.i.id === 0) { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         roleId: this.sf.value.roleIds, |         roleId: this.sf?.value.roleIds, | ||||||
|         roleNames: this.roleNames.join(','), |         roleNames: this.roleNames.join(','), | ||||||
|         telephone: this.sf.value.phone, |         telephone: this.sf?.value.phone, | ||||||
|         staffName: this.sf.value.name |         staffName: this.sf?.value.name | ||||||
|       }; |       }; | ||||||
|       // this.service.request(this.service.$api_addStaff, params).subscribe((res) => { |       // this.service.request(this.service.$api_addStaff, params).subscribe((res) => { | ||||||
|       //   if (res) { |       //   if (res) { | ||||||
| @ -95,8 +95,8 @@ export class SettingFinancialComponent implements OnInit { | |||||||
|     } else { |     } else { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         appUserId: this.i.appUserId, |         appUserId: this.i.appUserId, | ||||||
|         staffName: this.sf.value.name, |         staffName: this.sf?.value.name, | ||||||
|         roleId: this.sf.value.roleIds, |         roleId: this.sf?.value.roleIds, | ||||||
|         telephone: this.i.telephone |         telephone: this.i.telephone | ||||||
|       }; |       }; | ||||||
|       // this.service.request(this.service.$api_editorStaff, params).subscribe((res) => { |       // this.service.request(this.service.$api_editorStaff, params).subscribe((res) => { | ||||||
|  | |||||||
| @ -37,21 +37,21 @@ export class ReceiptOrderComponent extends BasicTableComponent implements OnInit | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value.brmdate) { |       if (this.sf?.value.brmdate) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           brmdate: { |           brmdate: { | ||||||
|             start: this.sf.value.brmdate?.[0] || '', |             start: this.sf?.value.brmdate?.[0] || '', | ||||||
|             end: this.sf.value.brmdate?.[1] || '' |             end: this.sf?.value.brmdate?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -45,13 +45,13 @@ export class ReceivableOrderDetailComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body, { ahxHId: this.id }); |     Object.assign(requestOptions.body, { ahxHId: this.id }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       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, { |         Object.assign(requestOptions.body, { | ||||||
|           feedate: { |           feedate: { | ||||||
|             start: this.sf.value.feedate?.[0] || '', |             start: this.sf?.value.feedate?.[0] || '', | ||||||
|             end: this.sf.value.feedate?.[1] || '' |             end: this.sf?.value.feedate?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -47,21 +47,21 @@ export class ReceivableOrderComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value?.createTime) { |       if (this.sf?.value?.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|       if (this.sf.value?.ahxdate) { |       if (this.sf?.value?.ahxdate) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           ahxdate: { |           ahxdate: { | ||||||
|             start: this.sf.value.ahxdate?.[0] || '', |             start: this.sf?.value.ahxdate?.[0] || '', | ||||||
|             end: this.sf.value.ahxdate?.[1] || '' |             end: this.sf?.value.ahxdate?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -33,12 +33,12 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
| @ -76,7 +76,7 @@ export class RechargeRecordComponent extends BasicTableComponent implements OnIn | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   exportList() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -41,10 +41,10 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit | |||||||
|     Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null }); |     Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         refundExecuteTime: { |         refundExecuteTime: { | ||||||
|           start: this.sf.value.refundExecuteTime?.[0] || '', |           start: this.sf?.value.refundExecuteTime?.[0] || '', | ||||||
|           end: this.sf.value.refundExecuteTime?.[1] || '' |           end: this.sf?.value.refundExecuteTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -262,6 +262,6 @@ export class RefundRecordComponent extends BasicTableComponent implements OnInit | |||||||
|   } |   } | ||||||
|   // 导出 |   // 导出 | ||||||
|   exprot() { |   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); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -30,10 +30,10 @@ export class TransactionFlowComponent extends BasicTableComponent { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -225,6 +225,6 @@ export class TransactionFlowComponent extends BasicTableComponent { | |||||||
|     ]; |     ]; | ||||||
|   } |   } | ||||||
|   exportList() { |   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); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -34,21 +34,21 @@ export class VoucherManagementComponent extends BasicTableComponent implements O | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || null, |             start: this.sf?.value.createTime?.[0] || null, | ||||||
|             end: this.sf.value.createTime?.[1] || null |             end: this.sf?.value.createTime?.[1] || null | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|       if (this.sf.value.vctime) { |       if (this.sf?.value.vctime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           vctime: { |           vctime: { | ||||||
|             start: this.sf.value.vctime?.[0] || null, |             start: this.sf?.value.vctime?.[0] || null, | ||||||
|             end: this.sf.value.vctime?.[1] || null |             end: this.sf?.value.vctime?.[1] || null | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -34,21 +34,21 @@ export class VoucherListComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body, { vc2code: this.vc2code }); |     Object.assign(requestOptions.body, { vc2code: this.vc2code }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || null, |             start: this.sf?.value.createTime?.[0] || null, | ||||||
|             end: this.sf.value.createTime?.[1] || null |             end: this.sf?.value.createTime?.[1] || null | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|       if (this.sf.value.vctime) { |       if (this.sf?.value.vctime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           vctime: { |           vctime: { | ||||||
|             start: this.sf.value.vctime?.[0] || null, |             start: this.sf?.value.vctime?.[0] || null, | ||||||
|             end: this.sf.value.vctime?.[1] || null |             end: this.sf?.value.vctime?.[1] || null | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -42,14 +42,14 @@ export class VoucherSummaryComponent extends BasicTableComponent implements OnIn | |||||||
|     Object.assign(requestOptions.body, { isvc2: 1 }); |     Object.assign(requestOptions.body, { isvc2: 1 }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createtime: { |         createtime: { | ||||||
|           start: this.sf.value.createtime?.[0] || '', |           start: this.sf?.value.createtime?.[0] || '', | ||||||
|           end: this.sf.value.createtime?.[1] || '' |           end: this.sf?.value.createtime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         vctime: { |         vctime: { | ||||||
|           start: this.sf.value.vctime?.[0] || '', |           start: this.sf?.value.vctime?.[0] || '', | ||||||
|           end: this.sf.value.vctime?.[1] || '' |           end: this.sf?.value.vctime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -78,7 +78,7 @@ export class VoucherSummaryComponent extends BasicTableComponent implements OnIn | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   exportList() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -44,10 +44,10 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -279,6 +279,6 @@ export class WithdrawalsRecordComponent extends BasicTableComponent { | |||||||
|   } |   } | ||||||
|   // 导出 |   // 导出 | ||||||
|   exprot() { |   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); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -37,7 +37,11 @@ import { CwcBankCardManagementIndexComponent } from './components/bank-card-mana | |||||||
|  |  | ||||||
| const routes: Routes = [ | const routes: Routes = [ | ||||||
|   { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, |   { 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', component: DriverAccountComponent, data: { guard: { ability: ['FINANCIAL-DRIVER-ACOUNT-list'] } } }, | ||||||
|   { |   { | ||||||
|     path: 'driver-account/detail/:id', |     path: 'driver-account/detail/:id', | ||||||
|  | |||||||
| @ -85,10 +85,10 @@ export class SystemLogsComponent implements OnInit { | |||||||
|     requestOptions.body.operateType = '1'; |     requestOptions.body.operateType = '1'; | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         operateType: '1', |         operateType: '1', | ||||||
|         endTime: this.sf.value.time?.[1] || null, |         endTime: this.sf?.value.time?.[1] || null, | ||||||
|         startTime: this.sf.value.time?.[0] || null |         startTime: this.sf?.value.time?.[0] || null | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -64,10 +64,10 @@ export class SystemSupplyLogsComponent implements OnInit { | |||||||
|     requestOptions.body.operateType = '4' |     requestOptions.body.operateType = '4' | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         operateType: '4', |         operateType: '4', | ||||||
|         endTime: this.sf.value.time?.[1] || null, |         endTime: this.sf?.value.time?.[1] || null, | ||||||
|         startTime: this.sf.value.time?.[0] || null |         startTime: this.sf?.value.time?.[0] || null | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -63,10 +63,10 @@ export class SystemWaybillLogsComponent implements OnInit { | |||||||
|     requestOptions.body.operateType = '3' |     requestOptions.body.operateType = '3' | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         operateType: '3', |         operateType: '3', | ||||||
|         endTime: this.sf.value.time?.[1] || null, |         endTime: this.sf?.value.time?.[1] || null, | ||||||
|         startTime: this.sf.value.time?.[0] || null |         startTime: this.sf?.value.time?.[0] || null | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -93,10 +93,10 @@ export class UserLogsComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         time: { |         time: { | ||||||
|           start: this.sf.value.time?.[0] || null, |           start: this.sf?.value.time?.[0] || null, | ||||||
|           end: this.sf.value.time?.[1] || null |           end: this.sf?.value.time?.[1] || null | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -94,10 +94,10 @@ export class VersionLogsComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         publishTime: { |         publishTime: { | ||||||
|           start: this.sf.value.time?.[0] ||  null, |           start: this.sf?.value.time?.[0] ||  null, | ||||||
|           end: this.sf.value.time?.[1] ||  null |           end: this.sf?.value.time?.[1] ||  null | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -37,7 +37,7 @@ export class AuthDrawerComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body, { id: this.id }); |     Object.assign(requestOptions.body, { id: this.id }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -129,17 +129,17 @@ export class MenuModalComponent implements OnInit { | |||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     const params = { |     const params = { | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|       ...this.params, |       ...this.params, | ||||||
|       i18n: null, |       i18n: null, | ||||||
|       // i18n: this.sf.value.keyCode, |       // i18n: this.sf?.value.keyCode, | ||||||
|       menuType: 0, |       menuType: 0, | ||||||
|       reuse: 0, |       reuse: 0, | ||||||
|       shortcut: 0, |       shortcut: 0, | ||||||
|       hideInBreadcrumb: 0, |       hideInBreadcrumb: 0, | ||||||
|       functionType: 0, |       functionType: 0, | ||||||
|       sortId: this.sf.value.sortId?.toString() || null, |       sortId: this.sf?.value.sortId?.toString() || null, | ||||||
|       text: this.sf.value.title |       text: this.sf?.value.title | ||||||
|     }; |     }; | ||||||
|     this.service.request(this.service.$api_add_one, params).subscribe(res => { |     this.service.request(this.service.$api_add_one, params).subscribe(res => { | ||||||
|       if (res) { |       if (res) { | ||||||
|  | |||||||
| @ -547,21 +547,21 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { | |||||||
|       loadTime: this.loadTime, |       loadTime: this.loadTime, | ||||||
|       // 到车时间 |       // 到车时间 | ||||||
|       unloadTime: this.unloadTime, |       unloadTime: this.unloadTime, | ||||||
|       loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data |       loadingLadingBillFilePath: this.sf?.value?.loadingLadingBillFilePath?.data | ||||||
|         ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath |         ? this.sf?.value?.loadingLadingBillFilePath.data.fullFilePath | ||||||
|         : this.sf.value?.loadingLadingBillFilePath?.url, |         : this.sf?.value?.loadingLadingBillFilePath?.url, | ||||||
|  |  | ||||||
|       loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data |       loadingPeopleVehiclesGoodsFilePath: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.data | ||||||
|         ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath |         ? this.sf?.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath | ||||||
|         : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, |         : this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.url, | ||||||
|  |  | ||||||
|       unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data |       unloadingLadingBillFilePath: this.sf?.value?.unloadingLadingBillFilePath?.data | ||||||
|         ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath |         ? this.sf?.value?.unloadingLadingBillFilePath.data.fullFilePath | ||||||
|         : this.sf.value?.unloadingLadingBillFilePath?.url, |         : this.sf?.value?.unloadingLadingBillFilePath?.url, | ||||||
|  |  | ||||||
|       unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data |       unloadingPeopleVehiclesGoodsFilePath: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.data | ||||||
|         ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath |         ? this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath | ||||||
|         : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url |         : this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.url | ||||||
|     }; |     }; | ||||||
|     this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => { |     this.service.request(this.service.$api_set_modifyWholeOrder, params).subscribe((res: any) => { | ||||||
|       if (res) { |       if (res) { | ||||||
|  | |||||||
| @ -184,7 +184,7 @@ export class UpdateFreightComponent implements OnInit { | |||||||
|     if (this.calculateSub) { |     if (this.calculateSub) { | ||||||
|       this.calculateSub.unsubscribe(); |       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 |     this.calculateSub = this.service | ||||||
|       .request(this.service.$api_calculate_cost, params) |       .request(this.service.$api_calculate_cost, params) | ||||||
|       .subscribe(res => { |       .subscribe(res => { | ||||||
| @ -203,7 +203,7 @@ export class UpdateFreightComponent implements OnInit { | |||||||
|       this.sf.validator({ emitError: true }); |       this.sf.validator({ emitError: true }); | ||||||
|       return; |       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) => { |     this.service.request(this.service.$api_change_bulk,params).subscribe((res: any) => { | ||||||
|       if (res) { |       if (res) { | ||||||
|         this.service.msgSrv.success('变更运费成功!'); |         this.service.msgSrv.success('变更运费成功!'); | ||||||
|  | |||||||
| @ -103,11 +103,11 @@ export class OneCarOrderCancelConfirmComponent implements OnInit { | |||||||
|     console.log(this.List) |     console.log(this.List) | ||||||
|   } |   } | ||||||
|   save(value: any): void { |   save(value: any): void { | ||||||
|     if (!this.sf.value.reason) { |     if (!this.sf?.value.reason) { | ||||||
|       this.service.msgSrv.error('请填写备注信息!'); |       this.service.msgSrv.error('请填写备注信息!'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     const params = { billId: this.i?.id, ...this.sf.value }; |     const params = { billId: this.i?.id, ...this.sf?.value }; | ||||||
|     console.log(params) |     console.log(params) | ||||||
|     this.service.request(this.service.$api_billRefundApplication_save, params).subscribe(res => { |     this.service.request(this.service.$api_billRefundApplication_save, params).subscribe(res => { | ||||||
|       if (res) { |       if (res) { | ||||||
|  | |||||||
| @ -60,7 +60,7 @@ export class OneCarOrderCancelComponent implements OnInit { | |||||||
|       this.modal.confirm({ |       this.modal.confirm({ | ||||||
|         nzTitle: '<i>是否确定立即取消运单!</i>', |         nzTitle: '<i>是否确定立即取消运单!</i>', | ||||||
|         nzOnOk: () => |         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) { |             if (res) { | ||||||
|               this.modalRef.close(true); |               this.modalRef.close(true); | ||||||
|             } |             } | ||||||
| @ -68,7 +68,7 @@ export class OneCarOrderCancelComponent implements OnInit { | |||||||
|         nzOnCancel: () => this.modalRef.destroy() |         nzOnCancel: () => this.modalRef.destroy() | ||||||
|       }); |       }); | ||||||
|     } else { |     } 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) { |         if (res) { | ||||||
|           this.modalRef.close(true); |           this.modalRef.close(true); | ||||||
|         } |         } | ||||||
|  | |||||||
| @ -68,14 +68,14 @@ export class VehicleFreightPeopleComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   save(value: any): void { |   save(value: any): void { | ||||||
|     console.log(this.sf.value); |     console.log(this.sf?.value); | ||||||
|     if(!this.sf.valid) { |     if(!this.sf.valid) { | ||||||
|       this.service.msgSrv.error("请选择网络货运人!") |       this.service.msgSrv.error("请选择网络货运人!") | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     const params = { |     const params = { | ||||||
|       billIds: this.data?.ids, |       billIds: this.data?.ids, | ||||||
|       enterpriseInfoId: this.sf.value?.enterpriseInfoId |       enterpriseInfoId: this.sf?.value?.enterpriseInfoId | ||||||
|     }; |     }; | ||||||
|     console.log(params); |     console.log(params); | ||||||
|     this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => { |     this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => { | ||||||
|  | |||||||
| @ -78,14 +78,14 @@ export class VehicleModifyRateComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   save(value: any): void { |   save(value: any): void { | ||||||
|     if (!this.sf.value?.additionalRate) { |     if (!this.sf?.value?.additionalRate) { | ||||||
|       this.service.msgSrv.warning('请填写附加费!'); |       this.service.msgSrv.warning('请填写附加费!'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     console.log(this.sf.value); |     console.log(this.sf?.value); | ||||||
|     const params = { |     const params = { | ||||||
|       ids: this.data?.ids, |       ids: this.data?.ids, | ||||||
|       ...this.sf.value |       ...this.sf?.value | ||||||
|     }; |     }; | ||||||
|     console.log(params); |     console.log(params); | ||||||
|     this.service.request(this.service.$api_set_updateAdditionalRateBatch, params).subscribe((res: any) => { |     this.service.request(this.service.$api_set_updateAdditionalRateBatch, params).subscribe((res: any) => { | ||||||
|  | |||||||
| @ -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.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.totalPrice = this.sf?.value.prePay + this.sf?.value.toPay + this.sf?.value.oilCardPay + this.sf?.value.receiptPay + this.otherPrice; | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   getParams() { |   getParams() { | ||||||
| @ -174,13 +174,13 @@ export class VehicleUpdateFreightComponent implements OnInit { | |||||||
|     editItems.forEach((item: any) => { |     editItems.forEach((item: any) => { | ||||||
|       switch (item.costName) { |       switch (item.costName) { | ||||||
|         case '预付': |         case '预付': | ||||||
|           item.price = this.sf.value.prePay; |           item.price = this.sf?.value.prePay; | ||||||
|           break; |           break; | ||||||
|         case '到付': |         case '到付': | ||||||
|           item.price = this.sf.value.toPay; |           item.price = this.sf?.value.toPay; | ||||||
|           break; |           break; | ||||||
|         case '回单付': |         case '回单付': | ||||||
|           item.price = this.sf.value.receiptPay; |           item.price = this.sf?.value.receiptPay; | ||||||
|           break; |           break; | ||||||
|         default: |         default: | ||||||
|           break; |           break; | ||||||
| @ -190,7 +190,7 @@ export class VehicleUpdateFreightComponent implements OnInit { | |||||||
|     const params = { |     const params = { | ||||||
|       billId: this.data.id, |       billId: this.data.id, | ||||||
|       dtos: editItems, |       dtos: editItems, | ||||||
|       changeCause: this.sf.value.changeCause |       changeCause: this.sf?.value.changeCause | ||||||
|     }; |     }; | ||||||
|     return params; |     return params; | ||||||
|   } |   } | ||||||
| @ -198,9 +198,9 @@ export class VehicleUpdateFreightComponent implements OnInit { | |||||||
|  |  | ||||||
|     const param = { |     const param = { | ||||||
|       billId: this.data.id, |       billId: this.data.id, | ||||||
|       pre: this.sf.value.prePay, |       pre: this.sf?.value.prePay, | ||||||
|       rece: this.sf.value.toPay, |       rece: this.sf?.value.toPay, | ||||||
|       back: this.sf.value.receiptPay, |       back: this.sf?.value.receiptPay, | ||||||
|       total: this.data.totalFreight, |       total: this.data.totalFreight, | ||||||
|       freightAmount: this.data.totalAmount, |       freightAmount: this.data.totalAmount, | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -35,10 +35,10 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         refundStatus: this.refundStatus || null |         refundStatus: this.refundStatus || null | ||||||
|       }); |       }); | ||||||
|  | |||||||
| @ -178,7 +178,7 @@ export class ParterArticleManagementEditComponent implements OnInit { | |||||||
|   save() { |   save() { | ||||||
|     this.sf.validator({ emitError: true }); |     this.sf.validator({ emitError: true }); | ||||||
|     if(!this.sf.valid) return; |     if(!this.sf.valid) return; | ||||||
|     // this.service.request('', { ...this.sf.value }).subscribe(res => { |     // this.service.request('', { ...this.sf?.value }).subscribe(res => { | ||||||
|     //   if (res) { |     //   if (res) { | ||||||
|     //     this.modalRef.destroy(true); |     //     this.modalRef.destroy(true); | ||||||
|     //   } else { |     //   } else { | ||||||
|  | |||||||
| @ -208,7 +208,7 @@ export class ParterChannelSalesEditComponent implements OnInit { | |||||||
|      |      | ||||||
|     if (!this.sf.valid) return; |     if (!this.sf.valid) return; | ||||||
|     let params: any= { |     let params: any= { | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|     } |     } | ||||||
|     delete params.telephone |     delete params.telephone | ||||||
|     this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => { |     this.service.request(this.service.$api_save, { ...params, employeeVO: this.currentOAItem }).subscribe(res => { | ||||||
|  | |||||||
| @ -85,7 +85,7 @@ export class ParterClaimAuditListChannelApproveComponent implements OnInit { | |||||||
|   save() { |   save() { | ||||||
|     this.sf.validator({ emitError: true }); |     this.sf.validator({ emitError: true }); | ||||||
|     if(!this.sf.valid) return; |     if(!this.sf.valid) return; | ||||||
|     // this.service.request('', { ...this.sf.value }).subscribe(res => { |     // this.service.request('', { ...this.sf?.value }).subscribe(res => { | ||||||
|     //   if (res) { |     //   if (res) { | ||||||
|     //     this.modalRef.destroy(true); |     //     this.modalRef.destroy(true); | ||||||
|     //   } else { |     //   } else { | ||||||
|  | |||||||
| @ -85,7 +85,7 @@ export class ParterClaimAuditListChannelRejectComponent implements OnInit { | |||||||
|   save() { |   save() { | ||||||
|     this.sf.validator({ emitError: true }); |     this.sf.validator({ emitError: true }); | ||||||
|     if(!this.sf.valid) return; |     if(!this.sf.valid) return; | ||||||
|     // this.service.request('', { ...this.sf.value }).subscribe(res => { |     // this.service.request('', { ...this.sf?.value }).subscribe(res => { | ||||||
|     //   if (res) { |     //   if (res) { | ||||||
|     //     this.modalRef.destroy(true); |     //     this.modalRef.destroy(true); | ||||||
|     //   } else { |     //   } else { | ||||||
|  | |||||||
| @ -85,7 +85,7 @@ export class ParterClaimAuditListPartnerApproveComponent implements OnInit { | |||||||
|   save() { |   save() { | ||||||
|     this.sf.validator({ emitError: true }); |     this.sf.validator({ emitError: true }); | ||||||
|     if(!this.sf.valid) return; |     if(!this.sf.valid) return; | ||||||
|     // this.service.request('', { ...this.sf.value }).subscribe(res => { |     // this.service.request('', { ...this.sf?.value }).subscribe(res => { | ||||||
|     //   if (res) { |     //   if (res) { | ||||||
|     //     this.modalRef.destroy(true); |     //     this.modalRef.destroy(true); | ||||||
|     //   } else { |     //   } else { | ||||||
|  | |||||||
| @ -85,7 +85,7 @@ export class ParterClaimAuditListPartnerRejectComponent implements OnInit { | |||||||
|   save() { |   save() { | ||||||
|     this.sf.validator({ emitError: true }); |     this.sf.validator({ emitError: true }); | ||||||
|     if(!this.sf.valid) return; |     if(!this.sf.valid) return; | ||||||
|     // this.service.request('', { ...this.sf.value }).subscribe(res => { |     // this.service.request('', { ...this.sf?.value }).subscribe(res => { | ||||||
|     //   if (res) { |     //   if (res) { | ||||||
|     //     this.modalRef.destroy(true); |     //     this.modalRef.destroy(true); | ||||||
|     //   } else { |     //   } else { | ||||||
|  | |||||||
| @ -185,7 +185,7 @@ export class BannerComponentsAddComponent implements OnInit { | |||||||
|     if (this.queryParams.id !== '0'){ |     if (this.queryParams.id !== '0'){ | ||||||
|       params.advertisementId = this.queryParams.id; |       params.advertisementId = this.queryParams.id; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.takeEffectType === 2){ |     if (this.sf?.value.takeEffectType === 2){ | ||||||
|       if (this.changeTimeFlag) { |       if (this.changeTimeFlag) { | ||||||
|         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); |         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); | ||||||
|       } else { |       } else { | ||||||
| @ -207,7 +207,7 @@ export class BannerComponentsAddComponent implements OnInit { | |||||||
|     if (this.queryParams.type === 'add') { |     if (this.queryParams.type === 'add') { | ||||||
|       delete params.id; |       delete params.id; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.takeEffectType === 2){ |     if (this.sf?.value.takeEffectType === 2){ | ||||||
|       if (this.changeTimeFlag) { |       if (this.changeTimeFlag) { | ||||||
|         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); |         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); | ||||||
|       } else { |       } else { | ||||||
|  | |||||||
| @ -73,7 +73,7 @@ export class ParterLevelConfigEditComponent implements OnInit { | |||||||
|   save() { |   save() { | ||||||
|     this.sf.validator({ emitError: true }); |     this.sf.validator({ emitError: true }); | ||||||
|     if(!this.sf.valid) return; |     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) { |       if (res) { | ||||||
|         this.service.msgSrv.success('保存成功!') |         this.service.msgSrv.success('保存成功!') | ||||||
|         this.modalRef.destroy(true); |         this.modalRef.destroy(true); | ||||||
|  | |||||||
| @ -75,38 +75,38 @@ export class AddEtpPartnerComponent { | |||||||
|       this.service.msgSrv.warning('请修改填写错误信息'); |       this.service.msgSrv.warning('请修改填写错误信息'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.cityCodesList?.length > 3) { |     if (this.sf?.value.cityCodesList?.length > 3) { | ||||||
|       this.sf.validator({ emitError: true }); |       this.sf.validator({ emitError: true }); | ||||||
|       this.service.msgSrv.warning('所属城市不能超过3个'); |       this.service.msgSrv.warning('所属城市不能超过3个'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     // 校验企业营业期限 |     // 校验企业营业期限 | ||||||
|     const operatingStartTime = new Date(this.sf.value.operatingStartTime); |     const operatingStartTime = new Date(this.sf?.value.operatingStartTime); | ||||||
|     const operatingEndTime = new Date(this.sf.value.operatingEndTime); |     const operatingEndTime = new Date(this.sf?.value.operatingEndTime); | ||||||
|     if (operatingStartTime.getTime() > operatingEndTime.getTime()) { |     if (operatingStartTime.getTime() > operatingEndTime.getTime()) { | ||||||
|       this.service.msgSrv.warning('营业截止日期不能小于开始日期'); |       this.service.msgSrv.warning('营业截止日期不能小于开始日期'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     // 校验法人证件有效期限 |     // 校验法人证件有效期限 | ||||||
|     if (this.sf.value.legalPersonIdentity.validEndTime) { |     if (this.sf?.value.legalPersonIdentity.validEndTime) { | ||||||
|       const validStartTime = new Date(this.sf.value.legalPersonIdentity.validStartTime); |       const validStartTime = new Date(this.sf?.value.legalPersonIdentity.validStartTime); | ||||||
|       const validEndTime = new Date(this.sf.value.legalPersonIdentity.validEndTime); |       const validEndTime = new Date(this.sf?.value.legalPersonIdentity.validEndTime); | ||||||
|       if (validStartTime.getTime() > validEndTime.getTime()) { |       if (validStartTime.getTime() > validEndTime.getTime()) { | ||||||
|         this.service.msgSrv.warning('法人证件有效截止日期不能小于开始日期'); |         this.service.msgSrv.warning('法人证件有效截止日期不能小于开始日期'); | ||||||
|         return; |         return; | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     // 校验管理员证件有效期限 |     // 校验管理员证件有效期限 | ||||||
|     if (this.sf.value.adminUserInfo.validEndTime) { |     if (this.sf?.value.adminUserInfo.validEndTime) { | ||||||
|       const validStartTime = new Date(this.sf.value.adminUserInfo.validStartTime); |       const validStartTime = new Date(this.sf?.value.adminUserInfo.validStartTime); | ||||||
|       const validEndTime = new Date(this.sf.value.adminUserInfo.validEndTime); |       const validEndTime = new Date(this.sf?.value.adminUserInfo.validEndTime); | ||||||
|       if (validStartTime.getTime() > validEndTime.getTime()) { |       if (validStartTime.getTime() > validEndTime.getTime()) { | ||||||
|         this.service.msgSrv.warning('管理员证件有效截止日期小于开始日期'); |         this.service.msgSrv.warning('管理员证件有效截止日期小于开始日期'); | ||||||
|         return; |         return; | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     const params = {}; |     const params = {}; | ||||||
|     Object.assign(params, { ...this.sf.value, source: 2 }); |     Object.assign(params, { ...this.sf?.value, source: 2 }); | ||||||
|     // console.log(params); |     // console.log(params); | ||||||
|  |  | ||||||
|     this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => { |     this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => { | ||||||
|  | |||||||
| @ -76,21 +76,21 @@ export class AddPersonalPartnerComponent { | |||||||
|       this.service.msgSrv.warning('请修改填写错误信息'); |       this.service.msgSrv.warning('请修改填写错误信息'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.cityCodesList?.length > 3) { |     if (this.sf?.value.cityCodesList?.length > 3) { | ||||||
|       this.sf.validator({ emitError: true }); |       this.sf.validator({ emitError: true }); | ||||||
|       this.service.msgSrv.warning('所属城市不能超过3个'); |       this.service.msgSrv.warning('所属城市不能超过3个'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.validEndTime) { |     if (this.sf?.value.validEndTime) { | ||||||
|       const validStartTime = new Date(this.sf.value.validStartTime); |       const validStartTime = new Date(this.sf?.value.validStartTime); | ||||||
|       const validEndTime = new Date(this.sf.value.validEndTime); |       const validEndTime = new Date(this.sf?.value.validEndTime); | ||||||
|       if (validStartTime.getTime() > validEndTime.getTime()) { |       if (validStartTime.getTime() > validEndTime.getTime()) { | ||||||
|         this.service.msgSrv.warning('身份证有效截止日期不能小于开始日期'); |         this.service.msgSrv.warning('身份证有效截止日期不能小于开始日期'); | ||||||
|         return; |         return; | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|     const params = {}; |     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 => { |     this.service.request(this.service.$api_save_personal_partner, params).subscribe(res => { | ||||||
|       if (res) { |       if (res) { | ||||||
|  | |||||||
| @ -43,7 +43,7 @@ export class PartnerListComponent { | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       let params = { ...this.sf.value }; |       let params = { ...this.sf?.value }; | ||||||
|       if (params.createTime) { |       if (params.createTime) { | ||||||
|         params.createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] }; |         params.createTime = { start: this.sf?.value?.createTime?.[0], end: this.sf?.value?.createTime?.[1] }; | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -93,7 +93,7 @@ export class PartnerAuditModalComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   sure() { |   sure() { | ||||||
|     if (this.info.isPass || this.sf.value.status) { |     if (this.info.isPass || this.sf?.value.status) { | ||||||
|       this.nzModalService.confirm({ |       this.nzModalService.confirm({ | ||||||
|         nzTitle: `确定以“${this.info.channelIdLabel}”的名义重新发起CRM《付款对象合同管理》吗?`, |         nzTitle: `确定以“${this.info.channelIdLabel}”的名义重新发起CRM《付款对象合同管理》吗?`, | ||||||
|         nzOnOk: () => { |         nzOnOk: () => { | ||||||
| @ -107,9 +107,9 @@ export class PartnerAuditModalComponent implements OnInit { | |||||||
|  |  | ||||||
|   audit() { |   audit() { | ||||||
|     const params: any = { |     const params: any = { | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|       id: this.info.id, |       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 |     this.service | ||||||
|       .request(this.service.$api_audit_partner, { |       .request(this.service.$api_audit_partner, { | ||||||
|  | |||||||
| @ -178,7 +178,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { | |||||||
|       rebateConfigLineDTO: this.table.data, |       rebateConfigLineDTO: this.table.data, | ||||||
|       priority: this.priority, // 优先级 |       priority: this.priority, // 优先级 | ||||||
|       partnerIds: this.partnerId, |       partnerIds: this.partnerId, | ||||||
|       ruleDescription: this.sf.value.ruleDescription, |       ruleDescription: this.sf?.value.ruleDescription, | ||||||
|       remark: this.remark, |       remark: this.remark, | ||||||
|       partnerType: this.partnerType |       partnerType: this.partnerType | ||||||
|     }; |     }; | ||||||
|  | |||||||
| @ -55,10 +55,10 @@ export class PartnerRecordedRecordComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         refundStatus: this.refundStatus || null |         refundStatus: this.refundStatus || null | ||||||
|       }); |       }); | ||||||
| @ -354,7 +354,7 @@ export class PartnerRecordedRecordComponent implements OnInit { | |||||||
|    * 底部统计 |    * 底部统计 | ||||||
|    */ |    */ | ||||||
|   getSummary() { |   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) { |       if (res) { | ||||||
|         this.totalInfo = res; |         this.totalInfo = res; | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -183,7 +183,7 @@ export class ScrollimgComponentsAddComponent implements OnInit { | |||||||
|     if (this.queryParams.id !== '0') { |     if (this.queryParams.id !== '0') { | ||||||
|       params.advertisementId = this.queryParams.id; |       params.advertisementId = this.queryParams.id; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.takeEffectType === 2) { |     if (this.sf?.value.takeEffectType === 2) { | ||||||
|       if (this.changeTimeFlag) { |       if (this.changeTimeFlag) { | ||||||
|         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); |         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); | ||||||
|       } else { |       } else { | ||||||
| @ -205,7 +205,7 @@ export class ScrollimgComponentsAddComponent implements OnInit { | |||||||
|     if (this.queryParams.type === 'add') { |     if (this.queryParams.type === 'add') { | ||||||
|       delete params.id; |       delete params.id; | ||||||
|     } |     } | ||||||
|     if (this.sf.value.takeEffectType === 2) { |     if (this.sf?.value.takeEffectType === 2) { | ||||||
|       if (this.changeTimeFlag) { |       if (this.changeTimeFlag) { | ||||||
|         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); |         params.takeEffectTime = format(this.detailData.takeEffectTime, 'yyyy-MM-dd HH:mm'); | ||||||
|       } else { |       } else { | ||||||
|  | |||||||
| @ -599,9 +599,9 @@ export class CarAddDriverComponent implements OnInit { | |||||||
|   submitForm(){ |   submitForm(){ | ||||||
|     const params:any = { |     const params:any = { | ||||||
|       source: 1, |       source: 1, | ||||||
|       mobile: this.sf.value.mobile, |       mobile: this.sf?.value.mobile, | ||||||
|       identityInfoDTO:{ |       identityInfoDTO:{ | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         certificatePhotoFront: this.detailData.certificatePhotoFront, |         certificatePhotoFront: this.detailData.certificatePhotoFront, | ||||||
|         certificatePhotoBack: this.detailData.certificatePhotoBack, |         certificatePhotoBack: this.detailData.certificatePhotoBack, | ||||||
|       }, |       }, | ||||||
|  | |||||||
| @ -49,5 +49,5 @@ export class PublishchooseFamifiarSetCaptainComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   close() {this.modal.close()} |   close() {this.modal.close()} | ||||||
|   save() {this.modal.close(this.sf.value.captainPhone)} |   save() {this.modal.close(this.sf?.value.captainPhone)} | ||||||
| } | } | ||||||
|  | |||||||
| @ -71,8 +71,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { | |||||||
|       unloadAddress0: [null, [Validators.required]], |       unloadAddress0: [null, [Validators.required]], | ||||||
|       unloadName0: [null, [Validators.required]], |       unloadName0: [null, [Validators.required]], | ||||||
|       unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], |       unloadPhone0: [null, [Validators.required, Validators.pattern('^[0-9]*$')]], | ||||||
|       loadingTime: [null, []], |       loadingTime: [null, [Validators.required]], | ||||||
|       unloadingTime: [null, []] |       unloadingTime: [null, [Validators.required]] | ||||||
|     }); |     }); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  | |||||||
| @ -427,7 +427,7 @@ export class SupplyManagementVehicleComponent extends BasicTableComponent implem | |||||||
|         //     }, |         //     }, | ||||||
|         //     allowClear: true, |         //     allowClear: true, | ||||||
|         //     containsAllLabel: true, |         //     containsAllLabel: true, | ||||||
|         //     asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf.value?.shipperAppUserId) |         //     asyncData: () => this.shipperSrv.getEnterpriseProject(this.sf?.value?.shipperAppUserId) | ||||||
|         //   } as SFSelectWidgetSchema |         //   } as SFSelectWidgetSchema | ||||||
|         // }, |         // }, | ||||||
|         enterpriseProjectId: { |         enterpriseProjectId: { | ||||||
|  | |||||||
| @ -155,7 +155,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { | |||||||
|       }); |       }); | ||||||
|   } |   } | ||||||
|   save(): void { |   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('请填写必填项并上传文件!') |       this.service.msgSrv.error('请填写必填项并上传文件!') | ||||||
|       return |       return | ||||||
|     } |     } | ||||||
| @ -163,9 +163,9 @@ export class SupplyManagementImportSupplyComponent implements OnInit { | |||||||
|     const formData : any= new FormData(); |     const formData : any= new FormData(); | ||||||
|     this.files?.forEach((file: any) => { |     this.files?.forEach((file: any) => { | ||||||
|       formData.append('file', file); |       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('enterpriseInfoId', this?.networkTransporter); | ||||||
|       formData.append('enterpriseProjectId', this.sf.value?.enterpriseProjectId); |       formData.append('enterpriseProjectId', this.sf?.value?.enterpriseProjectId); | ||||||
|     }); |     }); | ||||||
|    |    | ||||||
|     console.log(formData) |     console.log(formData) | ||||||
|  | |||||||
| @ -13,14 +13,7 @@ | |||||||
|  |  | ||||||
| <nz-card> | <nz-card> | ||||||
|   <div nz-row nzGutter="8"> |   <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个时,根据展开状态调整布局 --> |     <!-- 查询字段大于3个时,根据展开状态调整布局 --> | ||||||
|     <ng-container *ngIf="queryFieldCount > 4"> |  | ||||||
|       <div nz-col [nzSpan]="_$expand ? 24 : 18"> |       <div nz-col [nzSpan]="_$expand ? 24 : 18"> | ||||||
|         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> |         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> | ||||||
|       </div> |       </div> | ||||||
| @ -35,7 +28,6 @@ | |||||||
|           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> |           <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i> | ||||||
|         </button> |         </button> | ||||||
|       </div> |       </div> | ||||||
|     </ng-container> |  | ||||||
|   </div> |   </div> | ||||||
| </nz-card> | </nz-card> | ||||||
|  |  | ||||||
|  | |||||||
| @ -93,9 +93,9 @@ export class CartConfigActionModalComponent implements OnInit { | |||||||
|   sure() { |   sure() { | ||||||
|     if (this.i.id === 0) { |     if (this.i.id === 0) { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         dictKey: this.dictKey, |         dictKey: this.dictKey, | ||||||
|         itemData: this.sf.value.itemValue |         itemData: this.sf?.value.itemValue | ||||||
|       }; |       }; | ||||||
|       this.service.request(this.service.$api_add_dict, params).subscribe(res => { |       this.service.request(this.service.$api_add_dict, params).subscribe(res => { | ||||||
|         if (res) { |         if (res) { | ||||||
| @ -106,7 +106,7 @@ export class CartConfigActionModalComponent implements OnInit { | |||||||
|     } else { |     } else { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         ...this.i, |         ...this.i, | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }; |       }; | ||||||
|       this.service.request(this.service.$api_update_dict, params).subscribe(res => { |       this.service.request(this.service.$api_update_dict, params).subscribe(res => { | ||||||
|         if (res) { |         if (res) { | ||||||
| @ -121,7 +121,7 @@ export class CartConfigActionModalComponent implements OnInit { | |||||||
|     if (this.i.id === 0) { |     if (this.i.id === 0) { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         configFullKey: 'ban.goods.name', |         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 => { |       this.service.request(this.service.$api_add_config_item, params).subscribe(res => { | ||||||
|         if (res) { |         if (res) { | ||||||
| @ -130,7 +130,7 @@ export class CartConfigActionModalComponent implements OnInit { | |||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } else { |     } 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 => { |       this.service.request(this.service.$api_update_config_item, params).subscribe(res => { | ||||||
|         if (res) { |         if (res) { | ||||||
|           this.service.msgSrv.success('保存成功!'); |           this.service.msgSrv.success('保存成功!'); | ||||||
|  | |||||||
| @ -182,14 +182,14 @@ export class NetworkFreightNewComponent implements OnInit { | |||||||
|     } |     } | ||||||
|     console.log(this.sf1.value); |     console.log(this.sf1.value); | ||||||
|     console.log(this.sf1.valid); |     console.log(this.sf1.valid); | ||||||
|     console.log(this.sf.value); |     console.log(this.sf?.value); | ||||||
|     console.log(this.sf.valid); |     console.log(this.sf.valid); | ||||||
|     const sfVlaue = this.sf1.value; |     const sfVlaue = this.sf1.value; | ||||||
|     const params: any = {}; |     const params: any = {}; | ||||||
|     console.log(this.sf1.value); |     console.log(this.sf1.value); | ||||||
|      |      | ||||||
|     Object.assign(params, { |     Object.assign(params, { | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|       enterpriseInfoDTO: { |       enterpriseInfoDTO: { | ||||||
|         ...this.sf1.value, |         ...this.sf1.value, | ||||||
|         legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO, |         legalPersonIdentityDTO: this.sf1.value.legalPersonIdentityVO, | ||||||
|  | |||||||
| @ -59,7 +59,7 @@ export class NoTeManagementComponent implements OnInit { | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|   }; |   }; | ||||||
|  | |||||||
| @ -72,7 +72,7 @@ export class OrganizationModalComponent implements OnInit { | |||||||
|  |  | ||||||
|     const params: any = { |     const params: any = { | ||||||
|       id: this.params.id, |       id: this.params.id, | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|       authority: this.roleInfoData.authority, |       authority: this.roleInfoData.authority, | ||||||
|       authorityAssistId: this.roleInfoData.authorityAssistId, |       authorityAssistId: this.roleInfoData.authorityAssistId, | ||||||
|       parentId: this.parentId |       parentId: this.parentId | ||||||
|  | |||||||
| @ -102,7 +102,7 @@ console.log(this.params.infoUrl) | |||||||
|     } |     } | ||||||
|     const params: any = { |     const params: any = { | ||||||
|       id: this.params.id, |       id: this.params.id, | ||||||
|       ...this.sf.value, |       ...this.sf?.value, | ||||||
|       authority: auths.authority, |       authority: auths.authority, | ||||||
|       authorityAssistId: auths.authorityAssistId |       authorityAssistId: auths.authorityAssistId | ||||||
|     }; |     }; | ||||||
|  | |||||||
| @ -94,7 +94,7 @@ export class RoleManagementComponent implements OnInit { | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     if (requestOptions.body?.createTime) { |     if (requestOptions.body?.createTime) { | ||||||
|       Object.assign(requestOptions.body, { sort: 'createTime.' + requestOptions.body.createTime }); |       Object.assign(requestOptions.body, { sort: 'createTime.' + requestOptions.body.createTime }); | ||||||
|  | |||||||
| @ -103,7 +103,7 @@ export class SmsTemplateComponent implements OnInit { | |||||||
|  |  | ||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|   }; |   }; | ||||||
|  | |||||||
| @ -35,6 +35,6 @@ | |||||||
|     </div> |     </div> | ||||||
|  |  | ||||||
|     <st #st [data]="service.$api_get_enterprise_staff_page" [columns]="columns" [page]="{}" |     <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> |         (change)="stChange($event)"></st> | ||||||
| </nz-card> | </nz-card> | ||||||
| @ -170,7 +170,7 @@ export class StaffManagementComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   exportList() { |   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 }); |     this.service.downloadFile(this.service.$api_export_staff, { ...params, pageSize: -1 }); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|  | |||||||
| @ -72,13 +72,13 @@ export class SystemStaffStaffModalComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   sure() { |   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('员工角色不能为空!'); |       this.service.msgSrv.error('员工角色不能为空!'); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
|     if (this.i.userId === 0) { |     if (this.i.userId === 0) { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }; |       }; | ||||||
|       this.service.request(this.service.$api_add_staff, params).subscribe(res => { |       this.service.request(this.service.$api_add_staff, params).subscribe(res => { | ||||||
|         if (res) { |         if (res) { | ||||||
| @ -89,7 +89,7 @@ export class SystemStaffStaffModalComponent implements OnInit { | |||||||
|     } else { |     } else { | ||||||
|       const params: any = { |       const params: any = { | ||||||
|         appUserId: this.i.appUserId, |         appUserId: this.i.appUserId, | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }; |       }; | ||||||
|       this.service.request(this.service.$api_edit_staff, params).subscribe(res => { |       this.service.request(this.service.$api_edit_staff, params).subscribe(res => { | ||||||
|         if (res) { |         if (res) { | ||||||
|  | |||||||
| @ -35,7 +35,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     Object.assign(requestOptions.body, { declareStatus: this.selectedIndex }); |     Object.assign(requestOptions.body, { declareStatus: this.selectedIndex }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|       delete requestOptions.body._$expand; |       delete requestOptions.body._$expand; | ||||||
|     } |     } | ||||||
|     this.selectedRows = []; |     this.selectedRows = []; | ||||||
|  | |||||||
| @ -27,7 +27,7 @@ export class BillingOrderComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
| @ -55,7 +55,7 @@ export class BillingOrderComponent implements OnInit { | |||||||
|   } |   } | ||||||
|  |  | ||||||
|   export() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -39,13 +39,13 @@ export class CancellationInvoiceComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|       if (this.sf.value.createTime) { |       if (this.sf?.value.createTime) { | ||||||
|         Object.assign(requestOptions.body, { |         Object.assign(requestOptions.body, { | ||||||
|           createTime: { |           createTime: { | ||||||
|             start: this.sf.value.createTime?.[0] || '', |             start: this.sf?.value.createTime?.[0] || '', | ||||||
|             end: this.sf.value.createTime?.[1] || '' |             end: this.sf?.value.createTime?.[1] || '' | ||||||
|           } |           } | ||||||
|         }); |         }); | ||||||
|       } |       } | ||||||
|  | |||||||
| @ -47,7 +47,7 @@ export class AddCartComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -63,7 +63,7 @@ export class AddOwnerComponent implements OnInit { | |||||||
|     }); |     }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -45,7 +45,7 @@ export class ETCBlacklistComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     this.selectedRows = []; |     this.selectedRows = []; | ||||||
| @ -298,9 +298,9 @@ export class ETCBlacklistComponent implements OnInit { | |||||||
|   // 导出 |   // 导出 | ||||||
|   exprot() { |   exprot() { | ||||||
|     if (this.tabType == 1) { |     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 { |     } 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); | ||||||
|     } |     } | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  | |||||||
| @ -27,7 +27,7 @@ export class ETCInvoicedListComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -27,14 +27,14 @@ export class ETCInvoicedLogsComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         exTime: { |         exTime: { | ||||||
|           start: this.sf.value.exTime?.[0] || '', |           start: this.sf?.value.exTime?.[0] || '', | ||||||
|           end: this.sf.value.exTime?.[1] || '' |           end: this.sf?.value.exTime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         invoiceMakeTime: { |         invoiceMakeTime: { | ||||||
|           start: this.sf.value.invoiceMakeTime?.[0] || '', |           start: this.sf?.value.invoiceMakeTime?.[0] || '', | ||||||
|           end: this.sf.value.invoiceMakeTime?.[1] || '' |           end: this.sf?.value.invoiceMakeTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @ -66,7 +66,7 @@ export class ETCInvoicedLogsComponent implements OnInit { | |||||||
|     const params = { listSource: 1, pageSize: -1 }; |     const params = { listSource: 1, pageSize: -1 }; | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(params, { |       Object.assign(params, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     this.service.downloadFile(this.service.$api_export_invoice_logs_page, params); |     this.service.downloadFile(this.service.$api_export_invoice_logs_page, params); | ||||||
|  | |||||||
| @ -30,7 +30,7 @@ export class ETCInvoicedRequestedComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     this.selectedRows = []; |     this.selectedRows = []; | ||||||
|  | |||||||
| @ -94,10 +94,10 @@ export class ExpressDetailModalComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body, { expressno: this.expressCode }); |     Object.assign(requestOptions.body, { expressno: this.expressCode }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || null, |           start: this.sf?.value.createTime?.[0] || null, | ||||||
|           end: this.sf.value.createTime?.[1] || null |           end: this.sf?.value.createTime?.[1] || null | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -86,10 +86,10 @@ export class ExpressInfoComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf.value.createTime?.[0] || '', |           start: this.sf?.value.createTime?.[0] || '', | ||||||
|           end: this.sf.value.createTime?.[1] || '' |           end: this.sf?.value.createTime?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -86,7 +86,7 @@ export class AddCollectionInvoiceModalComponent implements OnInit { | |||||||
|  |  | ||||||
|   sure() { |   sure() { | ||||||
|     const params: any = { |     const params: any = { | ||||||
|       ...this.sf.value |       ...this.sf?.value | ||||||
|     }; |     }; | ||||||
|     // this.service.request(this.service.$api_add_staff, params).subscribe(res => { |     // this.service.request(this.service.$api_add_staff, params).subscribe(res => { | ||||||
|     //   if (res) { |     //   if (res) { | ||||||
|  | |||||||
| @ -24,7 +24,7 @@ export class AddCostDetailComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value |         ...this.sf?.value | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|  | |||||||
| @ -42,14 +42,14 @@ export class InputInvoiceDetailComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         billTime: { |         billTime: { | ||||||
|           start: this.sf.value.billTime?.[0] || null, |           start: this.sf?.value.billTime?.[0] || null, | ||||||
|           end: this.sf.value.billTime?.[1] || null |           end: this.sf?.value.billTime?.[1] || null | ||||||
|         }, |         }, | ||||||
|         feedate: { |         feedate: { | ||||||
|           start: this.sf.value.feedate?.[0] || null, |           start: this.sf?.value.feedate?.[0] || null, | ||||||
|           end: this.sf.value.feedate?.[1] || null |           end: this.sf?.value.feedate?.[1] || null | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -31,14 +31,14 @@ export class InputInvoiceComponent implements OnInit { | |||||||
|   beforeReq = (requestOptions: STRequestOptions) => { |   beforeReq = (requestOptions: STRequestOptions) => { | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createtime: { |         createtime: { | ||||||
|           start: this.sf.value.createtime?.[0] || '', |           start: this.sf?.value.createtime?.[0] || '', | ||||||
|           end: this.sf.value.createtime?.[1] || '' |           end: this.sf?.value.createtime?.[1] || '' | ||||||
|         }, |         }, | ||||||
|         invdate: { |         invdate: { | ||||||
|           start: this.sf.value.invdate?.[0] || '', |           start: this.sf?.value.invdate?.[0] || '', | ||||||
|           end: this.sf.value.invdate?.[1] || '' |           end: this.sf?.value.invdate?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
| @ -54,7 +54,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { | |||||||
|     this.selectedRows = []; |     this.selectedRows = []; | ||||||
|     Object.assign(requestOptions.body, { vatappHId: this.id }); |     Object.assign(requestOptions.body, { vatappHId: this.id }); | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { ...this.sf.value }); |       Object.assign(requestOptions.body, { ...this.sf?.value }); | ||||||
|     } |     } | ||||||
|     return requestOptions; |     return requestOptions; | ||||||
|   }; |   }; | ||||||
|  | |||||||
| @ -42,7 +42,7 @@ export class InvoiceRequestedComponent { | |||||||
|     } |     } | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         createTime: { |         createTime: { | ||||||
|           start: this.sf?.value?.createTime?.[0] || '', |           start: this.sf?.value?.createTime?.[0] || '', | ||||||
|           end: this.sf?.value?.createTime?.[1] || '' |           end: this.sf?.value?.createTime?.[1] || '' | ||||||
| @ -318,7 +318,7 @@ export class InvoiceRequestedComponent { | |||||||
|  |  | ||||||
|   // 导出 |   // 导出 | ||||||
|   exprot() { |   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 { |   private initSF(): SFSchema { | ||||||
|  | |||||||
| @ -42,10 +42,10 @@ export class InvoicedListComponent implements OnInit { | |||||||
|     Object.assign(requestOptions.body,{sts: '3'}) |     Object.assign(requestOptions.body,{sts: '3'}) | ||||||
|     if (this.sf) { |     if (this.sf) { | ||||||
|       Object.assign(requestOptions.body, { |       Object.assign(requestOptions.body, { | ||||||
|         ...this.sf.value, |         ...this.sf?.value, | ||||||
|         invoicedate: { |         invoicedate: { | ||||||
|           start: this.sf.value.invoicedate?.[0] || '', |           start: this.sf?.value.invoicedate?.[0] || '', | ||||||
|           end: this.sf.value.invoicedate?.[1] || '' |           end: this.sf?.value.invoicedate?.[1] || '' | ||||||
|         } |         } | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
|  | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user