Browse Source

解析ConMonthField条件value

zhuth 7 years ago
parent
commit
07c634c764
1 changed files with 2 additions and 6 deletions
  1. 2 6
      frontend/saas-web/app/view/core/report/ReportPanel.js

+ 2 - 6
frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -570,13 +570,9 @@ Ext.define('saas.view.core.report.ReportPanel', {
             conditionValue = Ext.Date.format(new Date(from), 'Y-m-d H:i:s');
         }else if(me.isContainsAny(xtypes, ['conmonthfield'])) {
             var from = value.from,
-            to = value.to,
-            fy = Math.floor(Number(from)/100),
-            fm = Math.floor(Number(from)%100),
-            ty = Math.floor(Number(to)/100),
-            tm = Math.floor(Number(to)%100);
+            to = value.to;
 
-            conditionValue = Ext.Date.format(new Date(fy+'/'+fm), 'Y-m-d 00:00:00') + ',' + Ext.Date.format(new Date(ty+'/'+tm), 'Y-m-d 23:59:59');
+            conditionValue = from + ',' + to;
         }else if(me.isContainsAny(xtypes, ['condatefield'])) {
             var from = value.from,
             to = value.to;