From d7bb19635a3dddd9147904ed8126f66d1b8ec080 Mon Sep 17 00:00:00 2001
From: zhouyuejun <505127606@qq.com>
Date: Mon, 18 Mar 2019 16:04:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E6=8D=AE=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-synchronize.component.html           |  2 +-
 .../data-synchronize.component.ts             | 22 +++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/app/pages/system-management/data-synchronize/data-synchronize.component.html b/src/app/pages/system-management/data-synchronize/data-synchronize.component.html
index 1253257..e45802e 100644
--- a/src/app/pages/system-management/data-synchronize/data-synchronize.component.html
+++ b/src/app/pages/system-management/data-synchronize/data-synchronize.component.html
@@ -28,7 +28,7 @@
             </div>
         </div>
         <div class="user-footer">
-            <button (click)='save()' nz-button nzType="primary" class="mr10" [disabled]='!dateRange'>确定</button>
+            <button (click)='save()' nz-button nzType="primary" class="mr10" [disabled]='!search.startDate||!search.endDate'>确定</button>
             <!-- <button (click)='cancel()' nz-button nzType="default">取消</button> -->
         </div>
     </div>
diff --git a/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts b/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts
index 0ab508f..f2b3800 100644
--- a/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts
+++ b/src/app/pages/system-management/data-synchronize/data-synchronize.component.ts
@@ -12,7 +12,7 @@ export class DataSynchronizeComponent implements OnInit {
     selectedValue: any = '1';
     dateRange: any = '';
     search: any = {
-        startDate: '',
+        startDate: '', 
         endDate: ''
     }
     constructor(
@@ -63,14 +63,18 @@ export class DataSynchronizeComponent implements OnInit {
 
     //日期时间处理
     changeDate(time) {
-        var date = new Date(time);
-        var Y = date.getFullYear() + '';
-        var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '';
-        var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '';
-        var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + '';
-        var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + '';
-        var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + '';
-        return Y + '-' + M + '-' + D + ' ' + h + ':' + m ;
+        if(time){
+            var date = new Date(time);
+            var Y = date.getFullYear() + '';
+            var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '';
+            var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + '';
+            var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + '';
+            var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + '';
+            var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds() + '';
+            return Y + '-' + M + '-' + D + ' ' + h + ':' + m ;
+        }else{
+            return '';
+        }
     }
 
     //保存