seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

pull/100/head
13621160019@163.com 2021-12-18 11:10:54 +08:00
parent 326e428363 b41f785f6e
commit 3cbde358b8
7 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/app/controllers/fdd/textmessage/textmessageoption.controller.js
View File

@ -11,24 +11,22 @@ app.controller('TextMessageOptionController', function(
endDate: moment() endDate: moment()
}; };
$scope.dtOptions = { $scope.dtOptions = {
timePicker: false, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerIncrement: 1, timePickerIncrement: 1,
timePickerSeconds: true, timePickerSeconds: true,
startView:2, startView:2,
autoApply: true, autoApply: true,
locale:{ locale:{
format: 'YYYY-MM-DD', format: 'YYYY-MM-DDTHH:mm:ss',
applyLabel: "OK", applyLabel: "OK",
cancelLabel: "Cancel", cancelLabel: "Cancel",
}, },
eventHandlers:{ eventHandlers:{
'apply.daterangepicker':function(ev,picker){ 'apply.daterangepicker':function(ev,picker){
//$scope.execute(); //$scope.execute();
} }
} }
}; };
$scope.execute = function() { $scope.execute = function() {

6
admin/app/controllers/fdd/webmessage/webmessageoption.controller.js
View File

@ -11,24 +11,22 @@ app.controller('WebMessageOptionController', function(
endDate: moment() endDate: moment()
}; };
$scope.dtOptions = { $scope.dtOptions = {
timePicker: false, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerIncrement: 1, timePickerIncrement: 1,
timePickerSeconds: true, timePickerSeconds: true,
startView:2, startView:2,
autoApply: true, autoApply: true,
locale:{ locale:{
format: 'YYYY-MM-DD', format: 'YYYY-MM-DDTHH:mm:ss',
applyLabel: "OK", applyLabel: "OK",
cancelLabel: "Cancel", cancelLabel: "Cancel",
}, },
eventHandlers:{ eventHandlers:{
'apply.daterangepicker':function(ev,picker){ 'apply.daterangepicker':function(ev,picker){
//$scope.execute(); //$scope.execute();
} }
} }
}; };
$scope.execute = function() { $scope.execute = function() {

6
admin/app/controllers/fdd/wechatmessage/wechatmessageoption.controller.js
View File

@ -11,24 +11,22 @@ app.controller('WechatMessageOptionController', function(
endDate: moment() endDate: moment()
}; };
$scope.dtOptions = { $scope.dtOptions = {
timePicker: false, timePicker: true,
timePicker24Hour: true, timePicker24Hour: true,
timePickerIncrement: 1, timePickerIncrement: 1,
timePickerSeconds: true, timePickerSeconds: true,
startView:2, startView:2,
autoApply: true, autoApply: true,
locale:{ locale:{
format: 'YYYY-MM-DD', format: 'YYYY-MM-DDTHH:mm:ss',
applyLabel: "OK", applyLabel: "OK",
cancelLabel: "Cancel", cancelLabel: "Cancel",
}, },
eventHandlers:{ eventHandlers:{
'apply.daterangepicker':function(ev,picker){ 'apply.daterangepicker':function(ev,picker){
//$scope.execute(); //$scope.execute();
} }
} }
}; };
$scope.execute = function() { $scope.execute = function() {

4
admin/views/fdd/emailmessage.html
View File

@ -5,7 +5,9 @@
<div class="form-group no-margin"> <div class="form-group no-margin">
<label>{{'COMMON.DATE' | translate}}</label> <label>{{'COMMON.DATE' | translate}}</label>
<textarea rows="2" date-range-picker class="form-control date-picker" type="text" <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> </div>
</form> </form>
</div> </div>

5
admin/views/fdd/textmessage.html
View File

@ -4,7 +4,10 @@
<form role="form"> <form role="form">
<div class="form-group no-margin"> <div class="form-group no-margin">
<label>{{'COMMON.DATE' | translate}}</label> <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> </div>
</form> </form>
</div> </div>

5
admin/views/fdd/webmessage.html
View File

@ -4,7 +4,10 @@
<form role="form"> <form role="form">
<div class="form-group no-margin"> <div class="form-group no-margin">
<label>{{'COMMON.DATE' | translate}}</label> <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> </div>
</form> </form>
</div> </div>

5
admin/views/fdd/wechatmessage.html
View File

@ -4,7 +4,10 @@
<form role="form"> <form role="form">
<div class="form-group no-margin"> <div class="form-group no-margin">
<label>{{'COMMON.DATE' | translate}}</label> <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> </div>
</form> </form>
</div> </div>