Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r36313 -r36386 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 36313) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 36386) @@ -1229,7 +1229,8 @@ var columns = [ { header: "灭菌员", width: 120, dataIndex: 'sterilizationUser', renderer: renderCallModifyFunction }, { header: "开始时间", width: 125, dataIndex: 'startDate', renderer: myDateFormatByMinute }, - { header: "开炉确认人", width: 120, dataIndex: 'verifierAndReviewers', hidden:!sstsConfig.enableDoubleCheckOfSterilizationFunction }, + { header: "核查人", width: 120, dataIndex: 'verifier.fullName', hidden:!sstsConfig.enableDoubleCheckOfSterilizationFunction}, + { header: "复核人", width: 120, dataIndex: 'reviewers.fullName', hidden:!sstsConfig.enableDoubleCheckOfSterilizationFunction}, { header: "确认完成人", width: 70, dataIndex: 'finishComfirmer' }, { header: confirmUserName, width: 110, dataIndex: 'srSituationComfirmer', hidden: !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm) }, { header: confirmTimeName, width: 130, dataIndex: 'srSituationComfirmTime', hidden: !((sstsConfig.hasOwnProperty('sterilizationRecordFinishConfirm')) && sstsConfig.sterilizationRecordFinishConfirm) }, @@ -1306,7 +1307,8 @@ filters: [ { type: 'string', dataIndex: 'sterilizationUser' }, { type: 'string', dataIndex: 'finishComfirmer' }, - { type: 'string', dataIndex: 'verifierAndReviewers' }, + { type: 'string', dataIndex: 'verifier.fullName' }, + { type: 'string', dataIndex: 'reviewers.fullName' }, { type: 'string', dataIndex: 'srSituationComfirmer' }, { type: 'string', dataIndex: 'srSituationComfirmTime' }, { type: 'date', dataIndex: 'startDate' }, @@ -1332,7 +1334,8 @@ { name: 'id' }, { name: 'sterilizationUser' }, { name: 'finishComfirmer' }, - { name: 'verifierAndReviewers' }, + { name: 'verifier.fullName' }, + { name: 'reviewers.fullName' }, { name: 'srSituationComfirmer' }, { name: 'srSituationComfirmTime' }, { name: 'startDate' },