|
|
@@ -345,12 +345,12 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
|
|
|
getConditionValue: function(xtype, value) {
|
|
|
var conditionValue;
|
|
|
if(xtype == 'datefield') {
|
|
|
- conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s');
|
|
|
+ conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
|
|
|
}else if(xtype == 'condatefield') {
|
|
|
var from = value.from,
|
|
|
to = value.to;
|
|
|
|
|
|
- conditionValue = Ext.Date.format(new Date(from), 'Y-m-d h:i:s') + ',' + Ext.Date.format(new Date(to), 'Y-m-d h:i:s');
|
|
|
+ conditionValue = Ext.Date.format(new Date(from), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(to), 'Y-m-d 23:59:59');
|
|
|
}else if(xtype == 'combobox' || xtype == 'combo') {
|
|
|
conditionValue = '\'' + value + '\'';
|
|
|
}else if(xtype == 'multicombo') {
|