Index: ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js =================================================================== diff -u -r22269 -r22303 --- ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js (.../finishedApprovalTaskRecordView.js) (revision 22269) +++ ssts-web/src/main/webapp/systemmanage/workFlow/finishedApprovalTaskRecordView.js (.../finishedApprovalTaskRecordView.js) (revision 22303) @@ -110,6 +110,7 @@ minWidth : 300, maxWidth : 450, filterable : true, + sortable : false, filter : { type : 'string' }, @@ -121,6 +122,7 @@ minWidth : 250, maxWidth : 350, filterable : true, + sortable : false, filter : { type : 'string' } @@ -130,6 +132,7 @@ width : 150, minWidth : 150, filterable : true, + sortable : false, filter : { type : 'string' }, @@ -149,6 +152,7 @@ dataIndex : 'handleTime', width : 200, filterable : true, + sortable : false, filter : { type : 'date' }, @@ -169,6 +173,7 @@ dataIndex : '', width : 200, filterable : true, + sortable : false, filter : { type : 'string' }, @@ -193,13 +198,12 @@ } } var approvalResult = Ext4.getCmp('approvalResultCombo').getValue(); + document.getElementById("gridSearchInput-inputEl").value = ''; //清掉grid自带搜索框的显示值 + approvalRecordGrid.extraParams.query = '';//清除grid自带的查询字段query值,因为当你把输入框的值清掉之后,点击form表单的查询,仍会发送带有query的值 approvalRecordGrid.extraParams.startDateSearch = startDateSearch; approvalRecordGrid.extraParams.endDateSearch = endDateSearch; approvalRecordGrid.extraParams.approvalResult = approvalResult; Ext4.getCmp('forgonPagingToolBar').moveFirst(); //从第一页开始 - Ext4.getCmp('startDateSearch').setValue(''); - Ext4.getCmp('endDateSearch').setValue(''); - Ext4.getCmp('approvalResultCombo').setValue(''); } @@ -222,7 +226,7 @@ searchText:'查询', width: 150, //禁止那些列参与查询 - disableIndexes:["responseTime"] + disableIndexes:["responseTime","approvalResult"] }), tbar : [{ xtype : 'label', Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js =================================================================== diff -u -r22294 -r22303 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22294) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskForm.js (.../workFlowApprovalTaskForm.js) (revision 22303) @@ -301,7 +301,6 @@ function Pass(nodeDefinition_id,formId){ - var tUserStore=null;//速度太慢,考虑放在打开的瞬间传过来 Ext4.Ajax.request({ async:false, @@ -376,7 +375,8 @@ flex: 1, listeners: { //监听 render : function(combo) {//渲染 - if(taskUserStore.getCount()>0) + var taskUserStoreCount = taskUserStore.getCount(); + if(taskUserStoreCount > 0 && taskUserStoreCount == 1) combo.setValue(taskUserStore.getAt(0).data['userId']);//第一个值 } } Index: ssts-web/src/main/webapp/forgon4/extents/features/GridSearching.js =================================================================== diff -u -r22244 -r22303 --- ssts-web/src/main/webapp/forgon4/extents/features/GridSearching.js (.../GridSearching.js) (revision 22244) +++ ssts-web/src/main/webapp/forgon4/extents/features/GridSearching.js (.../GridSearching.js) (revision 22303) @@ -92,7 +92,7 @@ /** * @cfg {String} minCharsTipText Tooltip to display if minChars is > 0 */ - minCharsTipText: '至少输入{0}个字符', + minCharsTipText: '至少输入{0}个字符并回车查询', /** * @cfg {String} mode Use 'remote' for remote stores or 'local' for local stores. If mode is local @@ -139,7 +139,7 @@ * @cfg {Ext4.Panel/String} toolbarContainer Panel (or id of the panel) which contains toolbar we want to render * search controls to (defaults to this.grid, the grid this plugin is plugged-in into) */ - + //attachEvents: function() { // this.grid = this.view.up('gridpanel'); // if(this.grid.rendered) @@ -190,9 +190,10 @@ // add input field (TwinTriggerField in fact) this.field = Ext4.create('Ext.ux.TwinTriggerField', { + id:'gridSearchInput', width: this.width, qtip: 'ddd', - selectOnFocus: undefined === this.selectOnFocus ? true : this.selectOnFocus, + selectOnFocus: undefined == this.selectOnFocus ? true : this.selectOnFocus, trigger1Cls: 'x-form-clear-trigger', //triggerCls: 'x-form-trigger', // the default trigger2Cls: 'x-form-search-trigger',