Browse Source

已审核禁用保存/查询列表时间区间BUG

zhuth 7 years ago
parent
commit
f71fc12281

+ 1 - 1
frontend/saas-web/app/view/core/form/FormPanel.js

@@ -104,7 +104,7 @@ Ext.define('saas.view.core.form.FormPanel', {
                     text: '保存',
                     text: '保存',
                     handler: 'onSave',
                     handler: 'onSave',
                     bind: {
                     bind: {
-                        disabled: '{!base.valid}'
+                        disabled: '{!base.valid || '+ me._statusCodeField + ' == "AUDITED" || ' + me._statusCodeField + ' == "OPEN"}'
                     }
                     }
                 }, {
                 }, {
                     xtype: 'button',
                     xtype: 'button',

+ 1 - 1
frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -227,7 +227,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
             var from = value.from,
             var from = value.from,
             to = value.to;
             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') {
         }else if(xtype == 'combobox' || xtype == 'combo') {
             conditionValue = '\'' + value + '\'';
             conditionValue = '\'' + value + '\'';
         }else if(xtype == 'multicombo') {
         }else if(xtype == 'multicombo') {