Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r16220 -r16222 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 16220) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 16222) @@ -610,6 +610,7 @@ {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 : 130,dataIndex : 'srSituationComfirmTime',hidden : !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm)}, {header : "结束时间",width : 125,dataIndex : 'endDate',renderer : myDateFormatByMinute}, {header : "灭菌目的",width : 120,dataIndex : 'sterilizationPurpose'}, {header : "灭菌炉",width : 160,dataIndex : 'sterilizer.name'}, @@ -634,6 +635,7 @@ {type : 'string',dataIndex : 'sterilizationUser'}, {type : 'string',dataIndex : 'finishComfirmer'}, {type : 'string',dataIndex : 'srSituationComfirmer'}, + {type : 'string',dataIndex : 'srSituationComfirmTime'}, {type : 'date',dataIndex : 'startDate'}, {type : 'date',dataIndex : 'endDate'}, {type : 'string',dataIndex : 'sterilizationPurpose'}, @@ -649,6 +651,7 @@ {name : 'sterilizationUser'}, {name : 'finishComfirmer'}, {name : 'srSituationComfirmer'}, + {name : 'srSituationComfirmTime'}, {name : 'startDate'}, {name : 'sterilizationPurpose'}, {name : 'sterilizationType'},