From c4b8e0cd31aa4a1ab8fa3d7372a7c6b4b906508d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 16 Feb 2022 17:03:46 +0800 Subject: [PATCH 1/3] edit --- .../freight/list/new/new.component.ts | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index 281131e3..82358583 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -86,7 +86,27 @@ export class FreightComponentsListNewComponent implements OnInit { this.service.msgSrv.warning('请修改填写错误信息'); return; } - + const enterpriseRegistrationTime = new Date(this.sf1.value.enterpriseRegistrationTime); + const operatingStartTime = new Date(this.sf1.value.operatingStartTime); + if (enterpriseRegistrationTime.getTime() > operatingStartTime.getTime()) { + this.service.msgSrv.warning('营业期限不能小于成立日期'); + return; + } + if (this.sf1.value.operatingEndTime) { + const operatingEndTime = new Date(this.sf1.value.operatingEndTime); + if (operatingStartTime.getTime() > operatingEndTime.getTime()) { + this.service.msgSrv.warning('营业期限不能小于期限开始日期'); + return; + } + } + const validStartTime = new Date(this.sf1.value.legalPersonIdentityDTO.validStartTime); + if (this.sf1.value.legalPersonIdentityDTO.validEndTime) { + const validEndTime = new Date(this.sf1.value.legalPersonIdentityDTO.validEndTime); + if (validStartTime.getTime() > validEndTime.getTime()) { + this.service.msgSrv.warning('法人证件有效截止日期小于开始日期'); + return; + } + } const sfVlaue = this.sf.value; const params = {}; Object.assign( @@ -511,7 +531,7 @@ export class FreightComponentsListNewComponent implements OnInit { required: '请选择截止日期' }, change: i => { - this.sf1?.setValue('/isLoingDate', false); + this.sf1?.setValue('/legalPersonIdentityDTO/isLoingDate', false); } } as SFDateWidgetSchema }, @@ -691,7 +711,7 @@ export class FreightComponentsListNewComponent implements OnInit { type: 'string', minLength: 1, format: 'mobile', - maxLength: 32, + maxLength: 11, ui: { grid: { xxl: 13, xl: 18, lg: 24, md: 24 }, placeholder: '请输入推广业务员手机号', From 888103ed65addbd728e22e936fe3260f697520e7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 16 Feb 2022 17:15:27 +0800 Subject: [PATCH 2/3] edit --- .../cost-management-detail.component.html | 2 +- .../cost-management-detail.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html index 67aa0dd1..79fa2578 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html @@ -33,7 +33,7 @@ {{ costInfo?.arkpmoney }} - {{ costInfo?.arbrmmoney }} + {{ costInfo?.armoeny }} diff --git a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts index 56fd1edc..f3dbaca6 100644 --- a/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts +++ b/src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.ts @@ -59,13 +59,13 @@ export class CostManagementDetailComponent implements OnInit { ], requested: [ { title: '序号', render: 'no', width: 70, className: 'text-left' }, - { title: '费用明细号', index: 'feeHId', className: 'text-left', width: 200 }, - { title: '发票申请', index: 'vatappcode', className: 'text-left', width: 200 }, + { title: '费用明细号', index: 'feeLId', className: 'text-left', width: 200 }, + { title: '发票申请', index: 'vatinvcode', className: 'text-left', width: 200 }, { title: '发票类型', index: 'vatapptype', className: 'text-left', width: 200 }, { title: '发票号', index: 'vatappcode', className: 'text-left', width: 200 }, { title: '发票日期', index: 'vatappdate', className: 'text-left', width: 200 }, - { title: '发票状态', index: 'sts', className: 'text-left', width: 200 }, - { title: '应收金额', render: 'vatnotax', className: 'text-left', width: 200 }, + { title: '发票状态', index: 'stsLabel', className: 'text-left', width: 200 }, + { title: '应收金额', render: 'armoney', className: 'text-left', width: 200 }, { title: '开票金额', render: 'vatmoney', className: 'text-left', width: 200 } ], collection: [ From c0801a94d6f8f96bce352751a87b3f7dc0f83300 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 16 Feb 2022 17:25:35 +0800 Subject: [PATCH 3/3] edit --- .../freight/list/detail/detail.component.html | 2 +- .../freight/list/detail/detail.component.less | 9 +++++++++ .../freight/list/detail/detail.component.ts | 15 +++++++++++++-- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 2c807164..7a3798cf 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -1,5 +1,5 @@ - +