Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r32575 -r32909 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 32575) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 32909) @@ -367,7 +367,7 @@ labelWidth : 90, items : [{ xtype : 'textfield', - fieldLabel : '炉次', + fieldLabel : '炉号', maxLength : '30', id : isAdd ? 'configItemOptionSterName'+'_'+amount :'configItemOptionSterName', name : 'configItemOptionSterName', @@ -390,7 +390,7 @@ labelWidth : 90, items : [{ xtype : 'textfield', - fieldLabel : '炉号', + fieldLabel : '炉次', maxLength : '30', id : isAdd ? 'configItemOptionSterFre'+'_'+amount :'configItemOptionSterFre', name : 'configItemOptionSterFre', @@ -1008,8 +1008,8 @@ //2、如果有炉号炉次,则需要设值 if(!isUndefinedOrNullOrEmpty(Ext.getCmp('configItemOptionSterName'))){ - Ext.getCmp('configItemOptionSterName').setValue(result.sterileFrequency); - Ext.getCmp('configItemOptionSterFre').setValue(result.sterilizerName); + Ext.getCmp('configItemOptionSterName').setValue(result.sterilizerName); + Ext.getCmp('configItemOptionSterFre').setValue(result.sterileFrequency); } @@ -2029,8 +2029,8 @@ //设置炉号炉次 if(fisrtWrapper.id == "tousseInfoFieldSet"){//代表是第一个块 if(Ext.getCmp('configItemOptionSterName')){ - Ext.getCmp('configItemOptionSterName').setValue(result.sterileFrequency); - Ext.getCmp('configItemOptionSterFre').setValue(result.sterilizerName); + Ext.getCmp('configItemOptionSterName').setValue(result.sterilizerName); + Ext.getCmp('configItemOptionSterFre').setValue(result.sterileFrequency); } }else{//代表是添加的块 var rememberNum3 = rememberNum; @@ -2969,8 +2969,8 @@ var items = new Array(); // 如果显示炉次炉号,添加表单 if(result.showSterNameAndFre == '是'){ - items.push(createQualityMonitoringElementSterName(result.data.sterilizerFrequency,"","")); - items.push(createQualityMonitoringElementSterFre(result.data.sterilizerName,"","")); + items.push(createQualityMonitoringElementSterName(result.data.sterilizerName,"","")); + items.push(createQualityMonitoringElementSterFre(result.data.sterilizerFrequency,"","")); } if(result.data.scope == "灭菌炉记录"){ Ext.getCmp('sterilizationRecordInfo').setVisible(true);