Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js =================================================================== diff -u -r15983 -r16220 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js (.../sterilizationRecordCompleteForm.js) (revision 15983) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordCompleteForm.js (.../sterilizationRecordCompleteForm.js) (revision 16220) @@ -322,6 +322,7 @@ success : function(response, options) { var result = Ext.decode(response.responseText); showResult(result.message); + grid.dwrReload(); }, failure : function(response, options) { var result = Ext.decode(response.responseText); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r16003 -r16220 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 16003) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 16220) @@ -609,6 +609,7 @@ {header : "灭菌员",width : 60,dataIndex : 'sterilizationUser', renderer : renderCallModifyFunction}, {header : "开始时间",width : 125,dataIndex : 'startDate',renderer : myDateFormatByMinute}, {header : "确认完成人",width : 70,dataIndex : 'finishComfirmer'}, + {header : "灭菌情况确认人",width : 110,dataIndex : 'srSituationComfirmer',hidden : !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm)}, {header : "结束时间",width : 125,dataIndex : 'endDate',renderer : myDateFormatByMinute}, {header : "灭菌目的",width : 120,dataIndex : 'sterilizationPurpose'}, {header : "灭菌炉",width : 160,dataIndex : 'sterilizer.name'}, @@ -632,6 +633,7 @@ filters : [ {type : 'string',dataIndex : 'sterilizationUser'}, {type : 'string',dataIndex : 'finishComfirmer'}, + {type : 'string',dataIndex : 'srSituationComfirmer'}, {type : 'date',dataIndex : 'startDate'}, {type : 'date',dataIndex : 'endDate'}, {type : 'string',dataIndex : 'sterilizationPurpose'}, @@ -646,6 +648,7 @@ {name : 'id'}, {name : 'sterilizationUser'}, {name : 'finishComfirmer'}, + {name : 'srSituationComfirmer'}, {name : 'startDate'}, {name : 'sterilizationPurpose'}, {name : 'sterilizationType'},