Index: ssts-web/src/main/webapp/log/loggrid.js =================================================================== diff -u -r16949 -r17561 --- ssts-web/src/main/webapp/log/loggrid.js (.../loggrid.js) (revision 16949) +++ ssts-web/src/main/webapp/log/loggrid.js (.../loggrid.js) (revision 17561) @@ -1,4 +1,7 @@ var entityName = "日志"; +var grid; +var dateObj = forgonDateSetting.getDateObj(); +dateObj.init(Ext); function delChosenLog(grid){ var logIds = grid.getSelectedValues('id', ';'); @@ -20,7 +23,81 @@ alert("全部记录已删除！"); } } - + +/** + * 查询事件 + */ +function loadResult() { + var model = Ext.getCmp('model').getValue(); + var userName = Ext.getCmp('userName').getValue(); + var operationType = Ext.getCmp('operationType').getValue(); + var operationDescription = Ext.getCmp('operationDescription').getValue(); + if (dateObj.checkAndGetDateObj('startDate', 'endDate')){ + document.getElementById('parm_s_startTime').value = dateObj.startDate; + document.getElementById('parm_s_endTime').value = dateObj.endDate; + } + document.getElementById('parm_s_model').value = model; + document.getElementById('parm_s_userName').value = userName; + document.getElementById('parm_s_operationType').value = operationType; + //操作描述 + document.getElementById('parm_s_operationDescription').value = operationDescription; + grid.dwrReload(); +} + +/** + * 重置搜索条件 + */ +function resetSearchCondition() { + Ext.getCmp('userName').setValue(''); + Ext.getCmp('operationDescription').setValue(''); + Ext.getCmp('operationType').setValue(''); + Ext.getCmp('startDate').setValue(''); + Ext.getCmp('endDate').setValue(''); + document.getElementById('parm_s_startTime').value = ''; + document.getElementById('parm_s_endTime').value = ''; +} + +/** + * 创建日期的控件 + * @param idAndName 日期控件的id和name + * @param fieldLabel 日期控件的标签 + * @returns + */ +function createDatePart(idAndName, fieldLabel) { + return { + xtype: 'datefieldWithMin', + fieldLabel: fieldLabel, + name: idAndName, + id: idAndName, + readOnly: false, + editable: false, + format: 'Y-m-d H:i', + width: 130 + } +} + +/** + * 创建textfield的控件 + * @param idAndName textfield控件的id和name + * @param width textfield控件的宽度 + * @returns + */ +function createTextfield(idAndName, width) { + return { + xtype: 'textfield', + name: idAndName, + id: idAndName, + width: width ? width : 130, + listeners : { + specialkey : function(field, ee) { + if (ee.getKey() == Ext.EventObject.ENTER) { + loadResult(); + } + } + } + } +} + Ext.onReady(function(){ Ext.QuickTips.init(); //Ext.state.Manager.setProvider(new Ext.state.CookieProvider()); @@ -46,22 +123,20 @@ var columns = [ //{header: "ID", width: 50, sortable: true,resizable: true, menuDisabled: false, dataIndex: 'id'}, - {header: "日期", width: 70, renderer : gotoPage,dataIndex: 'logDate'}, - {header: "时间", width: 70, dataIndex: 'logTime'}, + {header: "日期", width: 140, renderer : gotoPage,dataIndex: 'logDateTime'}, {header: "用户ID", width: 70, dataIndex: 'userId'}, {header: "用户姓名", width: 70, dataIndex: 'username'}, {header: "用户IP", width: 100, dataIndex: 'userIP'}, {header: "SessionID", width: 200, dataIndex: 'sessionID',hidden:true}, {header: "功能模块", width: 70, align:'center', dataIndex: 'model'}, - {header: "操作类型", width: 70, align:'center', dataIndex: 'operationType',renderer:actionType}, + {header: "操作类型", width: 110, align:'center', dataIndex: 'operationType',renderer:actionType}, {id:'operationDescription',header: "操作描述", width: 100, align:'left', dataIndex: 'operationDescription',sortable: false} ]; var readerDetail = [ {name: 'id'}, - {name: 'logDate'}, - {name: 'logTime'}, + {name: 'logDateTime'}, {name: 'userId'}, {name: 'userIP'}, {name: 'sessionID'}, @@ -80,39 +155,129 @@ {type: 'string', dataIndex: 'username'}, {type: 'string', dataIndex: 'operationType'}, {type: 'string', dataIndex: 'operationDescription'}, - {type: 'string', dataIndex: 'logDate'}, - {type: 'string', dataIndex: 'logTime'} + {type: 'string', dataIndex: 'logDateTime'} ]}); - - var tbar= [{ - text:'全部删除', - tooltip:'删除所有'+entityName, - iconCls:'btn_remove', - handler:function(){delAllLog(grid);} - }, '-', { - text:'删除', - tooltip:'删除选择'+entityName, - iconCls:'btn_remove', - handler:function (){ - delChosenLog(grid); - grid.dwrReload(); + + var modelStore = new Ext.data.SimpleStore({ + fields: ['value'], + data: [ + ['发货'] + ,['申请模块'] + ,['申请单'] + ,['回收模块'] + ,['清洗模块'] + ,['装配模块'] + ,['审核模块'] + ,['灭菌装载模块'] + ,['审核模块或者灭菌装载或者灭菌模块'] + ,['审核模块或者灭菌装载模块'] + ,['一次性物品'] + ,['灭菌模块'] + ,['发货模块'] + ,['使用记录模块'] + ,['基础数据'] + ,['干预模块'] + ,['一次性物品回写'] + ,['器械包定义'] + ,['丢失报损模块'] + ,['借物管理模块'] + ,['签收模块'] + ] + } + ); + + var deletePart = { + text:'删除', + tooltip:'删除选择' + entityName, + iconCls:'btn_remove', + handler:function (){ + delChosenLog(grid); + grid.dwrReload(); + } + } + var deleteAllPart = { + text:'全部删除', + tooltip:'删除所有' + entityName, + iconCls:'btn_remove', + handler: function(){ + delAllLog(grid); + } + }; + var modelPart = { + xtype: 'combo', + fieldLabel: '功能模块', + width: 130, + listWidth: 150, + id: 'model', + name: 'model', + valueField: 'value', + displayField: 'value', + allowBlank: false, + editable: false, + value: '发货', + store: modelStore, + forceSelection: true, + mode: 'local', + triggerAction: 'all', + listeners: { + select: function (combo, record, index) { } - }]; + }, + anchor: '100%' + }; + var startDatePart = createDatePart('startDate', '开始日期'); + var endDatePart = createDatePart('endDate', '结束日期'); + var userNamePart = createTextfield('userName', 80); + var operationType = createTextfield('operationType'); + var operationDescriptionPart = createTextfield('operationDescription'); + var queryButton = { + text: '查询', + tooltip: '查询', + iconCls: 'icon_search', + handler: function(){ + loadResult(grid); + } + }; + var resetButton = { + tooltip: '清空搜索条件', + text: '清空', + iconCls: 'icon_set', + handler: resetSearchCondition + }; + + var tbar= [ + deleteAllPart, + '-', + deletePart, + {text: '功能模块:'}, + modelPart, + {text: '开始日期:'}, + startDatePart, + {text: '结束日期:'}, + endDatePart, + {text: '用户姓名:'}, + userNamePart, + {text: '操作描述:'}, + operationDescriptionPart, + {text: '操作类型:'}, + operationType, + queryButton, + resetButton + ]; var dwrCallParams = null; //所有grid之外的参数用这个方法传入,返回的是Map> Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function(){ - }; - var grid = new Ext.ux.ForgonPageGrid( - {title:entityName+'列表',tbar:tbar,pageSize:30, + grid = new Ext.ux.ForgonPageGrid( + {title:entityName+'列表',tbar:tbar,pageSize:30,id : 'logGrid', defaultSortField:'id',defaultSortDirection:'DESC', isCheckboxSelectionModel:true, isShowRowNumber:true, rememberSelected:false, - //isShowSearchField:false, + isShowSearchField:false, layout:'fit', plugins: filters, columns: columns,autoExpandColumn: 'operationDescription',frame:false}, readerDetail,