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

src/app/routes/financial-management/components/cost-management/cost-management-detail/cost-management-detail.component.html

@@ -33,7 +33,7 @@
           {{ costInfo?.arkpmoney }}
         </se>
         <se label="收款金额" required>
-          {{ costInfo?.arbrmmoney }}
+          {{ costInfo?.armoeny }}
         </se>
       </se-container>
       <se-container col="3" labelWidth="100" *ngIf="textStatus" class="mt-md">

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: [

src/app/routes/usercenter/components/freight/list/detail/detail.component.html

@@ -1,5 +1,5 @@
 <!-- 页头 -->
-<page-header-wrapper [logo]="logo" [content]="content" [title]="'企业详情'">
+<page-header-wrapper [logo]="logo" [content]="content" [title]="'企业详情'" [ngClass]="{'affix': scrollTop>210}">
   <ng-template #logo>
     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
       <i nz-icon nzType="left" nzTheme="outline"></i>

src/app/routes/usercenter/components/freight/list/detail/detail.component.less

@@ -18,4 +18,13 @@
   .user-info-des {
     margin-bottom: 5px;
   }
+}
+
+:host::ng-deep {
+  .affix {
+    position: fixed !important;
+    top     : 20px !important;
+    z-index : 999 !important;
+    width   : 100% !important;
+  }
 }

src/app/routes/usercenter/components/freight/list/detail/detail.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
 import { STColumn, STComponent } from '@delon/abc/st';
@@ -6,6 +6,8 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/fo
 import { DatePipe, ModalHelper, _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { logging } from 'protractor';
+import { fromEvent, Subscription } from 'rxjs';
 import { UsermanageService } from '../../../../services/usercenter.service';
 
 @Component({
@@ -14,7 +16,7 @@ import { UsermanageService } from '../../../../services/usercenter.service';
   styleUrls: ['./detail.component.less'],
   providers: [DatePipe]
 })
-export class FreightComponentsListDetailComponent implements OnInit {
+export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
   @ViewChild('approvedModal', { static: false })
   approvedModal!: any;
   @ViewChild('redectModal', { static: false })
@@ -41,16 +43,25 @@ export class FreightComponentsListDetailComponent implements OnInit {
   };
 
   billEvaluate = null;
+
+  scrollTop = 0;
+  subscribeScoll!: Subscription;
   constructor(
     public service: UsermanageService,
     private route: ActivatedRoute,
     private nzModalService: NzModalService,
     private datePipe: DatePipe
   ) {}
+  ngOnDestroy(): void {
+    this.subscribeScoll.unsubscribe();
+  }
 
   ngOnInit() {
     this.initData();
     this.loadltdId();
+    this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
+      this.scrollTop = document.documentElement.scrollTop;
+    });
   }
   loadltdId() {
     this.service.getNetworkFreightForwarder().subscribe(res => {

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: '请输入推广业务员手机号',