Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js =================================================================== diff -u -r40815 -r40816 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40815) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js (.../qualitymonitoringInstanceForm.js) (revision 40816) @@ -2279,8 +2279,6 @@ top.Ext.getCmp('addBtnAll').setVisible(true); //top.Ext.getCmp('addExtractCheckTousse').setVisible(false); //top.Ext.getCmp('addExtractCheckMaterial').setVisible(true); - materialCountRecords = null; - materialMsg = null; addMaterialAndAmount(); addMaterialMsg(); //隐藏监测项 @@ -2358,8 +2356,6 @@ //top.Ext.getCmp('addExtractCheckTousse').setVisible(true); //top.Ext.getCmp('addExtractCheckMaterial').setVisible(true); // 添加抽检器械和数量 - materialCountRecords = null; - materialMsg = null; addMaterialAndAmount(); addMaterialMsg(); //隐藏监测项 @@ -2515,10 +2511,14 @@ function addMaterialAndAmount() { if (materialCountRecords != null && materialCountRecords != 'undefined' && materialCountRecords.length > 0) { var maerialName = top.Ext.getCmp('material').getValue(); + var tousseName = top.Ext.getCmp('tousseName').getValue(); if (!isUndefinedOrNullOrEmpty(maerialName)) { // 如果已经打开了,再选择其他的监测项,不再添加材料数据 return; } + if (isUndefinedOrNullOrEmpty(tousseName)) { + materialCountRecords = null; + } for (var i = 0; i < materialCountRecords.length; i++) { var materialName = materialCountRecords[i].data["name"]; @@ -2538,10 +2538,14 @@ function addMaterialMsg() { if (materialMsg != null && materialMsg != 'undefined' && materialMsg.length > 0) { var maerialName = top.Ext.getCmp('material').getValue(); + var tousseName = top.Ext.getCmp('tousseName').getValue(); if (!isUndefinedOrNullOrEmpty(maerialName)) { // 如果已经打开了,再选择其他的监测项,不再添加材料数据 return; } + if (isUndefinedOrNullOrEmpty(tousseName)) { + materialMsg = null; + } for (var i = 0; i < materialMsg.length; i++) { var materialName = materialMsg[i].materialName; var count = materialMsg[i].amount;