Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r41066 -r41116
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41066)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41116)
@@ -15,6 +15,7 @@
 var hideTousseName;
 var hideTousseId;
 var tousseInstanceMaterialErrorDamageArray = [];
+var otherPartAddQM = false;
 
 //XJJQZYY-120：配置项改进为可配置为必填、选填
 //检查人
@@ -70,12 +71,26 @@
 var getPackingMaterialsForCheck = new newMap();
 var clickItemId = '';
 
-//SZSDSRMYY-54
+//SZSDSRMYY-54：默认责任环节为【清洗消毒】
 var responsibilityPart = '清洗消毒'
 if (sstsConfig.defaultResponsibilityPartInPackingModule) {
 	responsibilityPart = sstsConfig.defaultResponsibilityPartInPackingModule;
 }
 
+//BJDXZLYY-69：质量监测改为Iframe模式
+function openQualityMonitoringWashWin(responPartName, washRecordId, tousseItems, ids, remarks) {
+	var params = {
+		title: '质量监测信息',
+		width: 900,
+		height: 550,
+		id: 'qualityMonitoringWin',
+		url: WWWROOT + '/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.jsp?otherPartAddQM='+ otherPartAddQM
+	}
+	getFormByIframeUtil(params, function (contentWindow) {
+		contentWindow.loadDataForPacking(responPartName, washRecordId, tousseItems, ids, remarks, materialCountRecords);
+	});
+}
+
 var packingPageAutoSetSterilizationProgramAfterSelectTousse = true;
 var allowForeignToussePartiallyPacking = false;
 var taskGroupObj = null;
@@ -4305,12 +4320,12 @@
 					tousseID: hideTousseId
 				}];
 				if (washRecordIds.length > 1) {
-					addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
+					openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0], tousseItems);
 					showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
 				} else if (washRecordIds.length == 1) {
-					addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
+					openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0], tousseItems);
 				} else {
-					addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems);
+					openQualityMonitoringWashWin(responsibilityPart, '', tousseItems);
 				}
 			}
 		}],
@@ -4512,12 +4527,12 @@
 						}
 					}
 					if (washRecordIds.length > 1) {
-						addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
+						openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
 						showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
 					} else if (washRecordIds.length == 1) {
-						addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
+						openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
 					} else {
-						addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems, '', remarks);
+						openQualityMonitoringWashWin(responsibilityPart, '', tousseItems, '', remarks);
 					}
 				}
 			})
@@ -4560,12 +4575,12 @@
 						}
 					}
 					if (washRecordIds.length > 1) {
-						addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
+						openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
 						showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
 					} else if (washRecordIds.length == 1) {
-						addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
+						openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0], tousseItems, '', remarks);
 					} else {
-						addQualityMonitoringByResponPart(responsibilityPart, '', tousseItems, '', remarks);
+						openQualityMonitoringWashWin(responsibilityPart, '', tousseItems, '', remarks);
 					}
 				}
 			})
@@ -7251,12 +7266,12 @@
 						if (btn == 'no') {
 							var washRecordIds = getWashRecordIds();
 							if (washRecordIds.length > 1) {
-								addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0]);
+								openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0]);
 								showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
 							} else if (washRecordIds.length == 1) {
-								addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0]);
+								openQualityMonitoringWashWin(responsibilityPart, washRecordIds[0]);
 							} else {
-								addQualityMonitoringByResponPart(responsibilityPart);
+								openQualityMonitoringWashWin(responsibilityPart);
 							}
 						}
 					}