Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js =================================================================== diff -u -r16511 -r16514 --- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 16511) +++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js (.../routineMonitoringView.js) (revision 16514) @@ -129,6 +129,45 @@ }; } +//返回炉次显示框 质量监测 +function createQualityMonitoringElementSterNameQW(value){ + return { + columnWidth : .5, + layout : 'form', + labelWidth : 90, + items : [{ + xtype : 'textfield', + fieldLabel : '炉次', + maxLength : '30', + id : 'configItemOptionSterNameQW', + name : 'configItemOptionSterNameQW', + allowBlank : true, + readOnly : true, + value : value, + anchor : '95%' + }] + }; +} +// 返回炉号显示框 质量监测 +function createQualityMonitoringElementSterFreQW(value){ + return { + columnWidth : .5, + layout : 'form', + labelWidth : 90, + items : [{ + xtype : 'textfield', + fieldLabel : '炉号', + maxLength : '30', + id : 'configItemOptionSterFreQW', + name : 'configItemOptionSterFreQW', + allowBlank : true, + readOnly: true, + value : value, + anchor : '95%' + }] + }; +} + function createQualityMonitoringItemElement(type,id,name,allowBlank,options,value,isTriggerItem){ var hideElement = false; if('是' == isTriggerItem && (value == null || value == "")){ @@ -522,6 +561,11 @@ top.Ext.getCmp('scope2').setValue(result.data.scope); top.Ext.getCmp('optionAmount2').setValue(''); var items = new Array(); + // 如果显示炉次炉号,添加表单 + if(result.data.showSterilizerNumFrequency == '是'){ + items.push(createQualityMonitoringElementSterNameQW('')); + items.push(createQualityMonitoringElementSterFreQW('')); + } for(var i = 0 ; i< result.data.items.length ; i++){ var item = result.data.items[i]; if(top.Ext.getCmp('optionAmount2').getValue() == null || top.Ext.getCmp('optionAmount2').getValue() == ''){ @@ -922,7 +966,11 @@ top.Ext.getCmp('remark2').setValue(result.data.remark); top.Ext.getCmp('optionAmount2').setValue(''); - + // 如果显示炉次炉号,添加表单 + if(result.showSterNameAndFre == '是'){ + items.push(createQualityMonitoringElementSterNameQW(result.data.sterilizerName)); + items.push(createQualityMonitoringElementSterFreQW(result.data.sterilizerFrequency)); + } for(var i = 0 ; i < result.data.items.length ; i++){ var item = result.data.items[i].definitionItem; if(top.Ext.getCmp('optionAmount2').getValue() == null || top.Ext.getCmp('optionAmount2').getValue() == ''){ @@ -1694,6 +1742,11 @@ }else{ top.Ext.getCmp('tousseName2').setValue(result.tousseName); } + if( !isUndefinedOrNullOrEmpty(top.Ext.getCmp('configItemOptionSterNameQW')) ){ + // 显示炉次和炉号 + top.Ext.getCmp('configItemOptionSterNameQW').setValue(result.sterilizerName); + top.Ext.getCmp('configItemOptionSterFreQW').setValue(result.sterileFrequency); + } top.Ext.getCmp('barcode2').setValue(tempBarcode); top.Ext.getCmp('tousseInstanceId2').setValue(result.tousseInstanceId); if(result.tousseDefinitionId){