From b41f785f6e38efe36d9ab5626ba949afb7010ebe Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Sat, 18 Dec 2021 10:35:09 +0800
Subject: [PATCH] updated date time picker of fdd message views in admin

---
 .../fdd/textmessage/textmessageoption.controller.js         | 6 ++----
 .../fdd/webmessage/webmessageoption.controller.js           | 6 ++----
 .../fdd/wechatmessage/wechatmessageoption.controller.js     | 6 ++----
 admin/views/fdd/emailmessage.html                           | 4 +++-
 admin/views/fdd/textmessage.html                            | 5 ++++-
 admin/views/fdd/webmessage.html                             | 5 ++++-
 admin/views/fdd/wechatmessage.html                          | 5 ++++-
 7 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
index 44b5eef7..b8ccef3a 100644
--- a/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
+++ b/admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
@@ -11,24 +11,22 @@ app.controller('TextMessageOptionController', function(
 		endDate: moment()
 	};
 	$scope.dtOptions = {
-		timePicker: false,
+		timePicker: true,
 		timePicker24Hour: true,
 		timePickerIncrement: 1,
 		timePickerSeconds: true,
 		startView:2,
 		autoApply: true,
 		locale:{
-			format: 'YYYY-MM-DD',
+			format: 'YYYY-MM-DDTHH:mm:ss',
 			applyLabel: "OK",
 			cancelLabel: "Cancel",
 		},
-
 		eventHandlers:{
 			'apply.daterangepicker':function(ev,picker){
 				//$scope.execute();
 			}
 		}
-
 	};
 
 	$scope.execute = function() {
diff --git a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js
index 6a84f101..9d76829c 100644
--- a/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js
+++ b/admin/app/controllers/fdd/webmessage/webmessageoption.controller.js
@@ -11,24 +11,22 @@ app.controller('WebMessageOptionController', function(
 		endDate: moment()
 	};
 	$scope.dtOptions = {
-		timePicker: false,
+		timePicker: true,
 		timePicker24Hour: true,
 		timePickerIncrement: 1,
 		timePickerSeconds: true,
 		startView:2,
 		autoApply: true,
 		locale:{
-			format: 'YYYY-MM-DD',
+			format: 'YYYY-MM-DDTHH:mm:ss',
 			applyLabel: "OK",
 			cancelLabel: "Cancel",
 		},
-
 		eventHandlers:{
 			'apply.daterangepicker':function(ev,picker){
 				//$scope.execute();
 			}
 		}
-
 	};
 
 	$scope.execute = function() {
diff --git a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js
index 0b46f7d1..68944dd4 100644
--- a/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js
+++ b/admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js
@@ -11,24 +11,22 @@ app.controller('WechatMessageOptionController', function(
 		endDate: moment()
 	};
 	$scope.dtOptions = {
-		timePicker: false,
+		timePicker: true,
 		timePicker24Hour: true,
 		timePickerIncrement: 1,
 		timePickerSeconds: true,
 		startView:2,
 		autoApply: true,
 		locale:{
-			format: 'YYYY-MM-DD',
+			format: 'YYYY-MM-DDTHH:mm:ss',
 			applyLabel: "OK",
 			cancelLabel: "Cancel",
 		},
-
 		eventHandlers:{
 			'apply.daterangepicker':function(ev,picker){
 				//$scope.execute();
 			}
 		}
-
 	};
 
 	$scope.execute = function() {
diff --git a/admin/views/fdd/emailmessage.html b/admin/views/fdd/emailmessage.html
index a052bfb0..a50da955 100644
--- a/admin/views/fdd/emailmessage.html
+++ b/admin/views/fdd/emailmessage.html
@@ -5,7 +5,9 @@
                 <div class="form-group no-margin">
                     <label>{{'COMMON.DATE' | translate}}</label>
                     <textarea rows="2" date-range-picker class="form-control date-picker" type="text"
-                        ng-model="daterange" options="dtOptions" readonly="" />
+                              ng-model="daterange" options="dtOptions"
+                              placeholder="{{'SETTING.SELECT_DATE' | translate}}"
+                              readonly="" />
                     </div>
             </form>
         </div>
diff --git a/admin/views/fdd/textmessage.html b/admin/views/fdd/textmessage.html
index 60379cc5..5949c209 100644
--- a/admin/views/fdd/textmessage.html
+++ b/admin/views/fdd/textmessage.html
@@ -4,7 +4,10 @@
             <form role="form">
                 <div class="form-group no-margin">
                     <label>{{'COMMON.DATE' | translate}}</label>
-                    <textarea rows="1" date-range-picker class="form-control date-picker" type="text" ng-model="daterange" options="dtOptions" readonly="" placeholder="请选择日期" />
+                    <textarea rows="2" date-range-picker class="form-control date-picker" type="text"
+                              ng-model="daterange" options="dtOptions"
+                              placeholder="{{'SETTING.SELECT_DATE' | translate}}"
+                              readonly="" />
                 </div>
             </form>
         </div>
diff --git a/admin/views/fdd/webmessage.html b/admin/views/fdd/webmessage.html
index 0b0004d9..7a8ff1b2 100644
--- a/admin/views/fdd/webmessage.html
+++ b/admin/views/fdd/webmessage.html
@@ -4,7 +4,10 @@
             <form role="form">
                 <div class="form-group no-margin">
                     <label>{{'COMMON.DATE' | translate}}</label>
-                    <textarea rows="1" date-range-picker class="form-control date-picker" type="text" ng-model="daterange" options="dtOptions" readonly="" placeholder="请选择日期" />
+                    <textarea rows="2" date-range-picker class="form-control date-picker" type="text"
+                              ng-model="daterange" options="dtOptions"
+                              placeholder="{{'SETTING.SELECT_DATE' | translate}}"
+                              readonly="" />
                 </div>
             </form>
         </div>
diff --git a/admin/views/fdd/wechatmessage.html b/admin/views/fdd/wechatmessage.html
index 5695a74f..17d7c827 100644
--- a/admin/views/fdd/wechatmessage.html
+++ b/admin/views/fdd/wechatmessage.html
@@ -4,7 +4,10 @@
             <form role="form">
                 <div class="form-group no-margin">
                     <label>{{'COMMON.DATE' | translate}}</label>
-                    <textarea rows="1" date-range-picker class="form-control date-picker" type="text" ng-model="daterange" options="dtOptions" readonly="" placeholder="请选择日期" />
+                    <textarea rows="2" date-range-picker class="form-control date-picker" type="text"
+                              ng-model="daterange" options="dtOptions"
+                              placeholder="{{'SETTING.SELECT_DATE' | translate}}"
+                              readonly="" />
                 </div>
             </form>
         </div>