Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js =================================================================== diff -u -r41151 -r41452 --- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41151) +++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js (.../washAndDisinfectView.js) (revision 41452) @@ -392,6 +392,19 @@ return buttonGroup; } }, + { + header: "参数确认", sortable: false, hidden:!sstsConfig.enableParameterFileConfirmation, renderer: function (v, p, record) { + if (record.data.washDataAmount > 0 || record.data.washDataType > 0) { + if(record.data.cleaningParaConfirmationMan == ''){ + return "

待确认

"; + }else { + return "

已确认

"; + } + }else { + return ''; + } + } + }, { id: 'autoWidthColumn', header: "清洗总数", width: 140, dataIndex: 'washMaterialAmount', sortable: false } ]; // 是否有清洗机需要确认完成 @@ -445,6 +458,7 @@ { name: 'washDataType' }, { name: 'washMaterialAmount' }, { name: 'washStatus' }, + { name: 'cleaningParaConfirmationMan' }, { name: 'hasPicture' } ];