From a51249f32c550d37c9e2fe362381dc854b22d27d Mon Sep 17 00:00:00 2001
From: heqinghang <qinghang.he@eascs.com>
Date: Fri, 28 Jan 2022 10:00:52 +0800
Subject: [PATCH] 666

---
 .../bulk-publish/bulk-publish.component.ts    | 19 +++++++++++++++++--
 .../bulk-release-publish.component.ts         | 19 +++++++++++++++++--
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
index 2d78ebd2..5347d024 100644
--- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
@@ -20,6 +20,7 @@ import { of } from 'rxjs';
 import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
 import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
 import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 @Component({
   selector: 'app-publish-goods-bulk-publish',
   templateUrl: './bulk-publish.component.html',
@@ -141,12 +142,26 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
           }
         },
         deadlineTime: {
-          title: '截至日期',
+          title: '截止日期',
           type: 'string',
           format: 'date-time',
           ui: {
             placeholder: '请输入',
-            format: 'yyyy-MM-dd HH:mm:ss'
+            format: 'yyyy-MM-dd HH:mm:ss',
+            disabledDate: (current: Date): boolean => {
+              let d = new Date();
+              let year = d.getFullYear();
+              let month = d.getMonth();
+              let date = d.getDate();
+              let mydate = new Date(year, month + 3, date);
+              return differenceInCalendarDays(current, new Date()) < 0 || differenceInCalendarDays(current, mydate) > 0;
+            },
+            validator: (val) => {
+                if( new Date(val) <new Date()){
+                  return [{ keyword: 'validTime', message: '截止日期需大于当前时间' }];
+                }
+                return [];
+            },
           }
         },
         dispatchPhone: {
diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
index 1ed8dc59..015699cf 100644
--- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
+++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
@@ -20,6 +20,7 @@ import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-f
 import { PublishAddressListComponent } from '../onecar-publish/address-list/address-list.component';
 import { PublishSuccessComponent } from '../onecar-publish/publish-success/publish-success.component';
 import { TranAgreementComponent } from '../tran-agreement/tran-agreement.component';
+import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
 @Component({
   selector: 'app-publish-goods-bulk-publish',
   templateUrl: './bulk-release-publish.component.html',
@@ -161,12 +162,26 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
           }
         },
         deadlineTime: {
-          title: '截至日期',
+          title: '截止日期',
           type: 'string',
           format: 'date-time',
           ui: {
             placeholder: '请输入',
-            format: 'yyyy-MM-dd HH:mm:ss'
+            format: 'yyyy-MM-dd HH:mm:ss',
+            disabledDate: (current: Date): boolean => {
+              let d = new Date();
+              let year = d.getFullYear();
+              let month = d.getMonth();
+              let date = d.getDate();
+              let mydate = new Date(year, month + 3, date);
+              return differenceInCalendarDays(current, new Date()) < 0 || differenceInCalendarDays(current, mydate) > 0;
+            },
+            validator: (val) => {
+                if( new Date(val) <new Date()){
+                  return [{ keyword: 'validTime', message: '截止日期需大于当前时间' }];
+                }
+                return [];
+            },
           }
         },
         dispatchPhone: {