Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r39820 -r40302
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 39820)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 40302)
@@ -12,6 +12,9 @@
 var sterilizerTypeStore;
 var waitPackingJsonObj;
 var packingTousseBtnClick_mask = null;
+var hideTousseName;
+var hideTousseId;
+var tousseInstanceMaterialErrorDamageArray = [];
 
 //XJJQZYY-120：配置项改进为可配置为必填、选填
 //检查人
@@ -288,7 +291,9 @@
 	var taskGroup = getURLParameter("taskGroup", "") + "装配";
 	// 只有当装配界面是处于活动的Tab时，才刷新，以避免刷新后的界面为空白的问题
 	//	alert(tabTitle+','+taskGroup)
-	if (tabTitle == taskGroup) {
+	var newTabTitle = tabTitle.replace('（','(').replace('）',')');
+	var newTaskGroup = taskGroup.replace('（','(').replace('）',')');
+	if (newTabTitle == newTaskGroup) {
 		var waitPackingTreeGrid = Ext4.getCmp('waitPackingTreeGrid');
 		if (waitPackingTreeGrid != null && waitPackingTreeGrid.isVisible() == true) {
 			waitPackingTreeGrid.getStore().reload();
@@ -1872,7 +1877,7 @@
 		}
 		var taskType = idCardTaskNode.data.taskType;
 		// 是否已清洗
-		if ((taskType != taskType_returnGoods) && !idCardTaskNode.data.cleaned) {
+		if ((taskType != taskType_returnGoods && taskType != taskType_qualityMonitor) && !idCardTaskNode.data.cleaned) {
 			showMultipleResult('装配任务未清洗完成或清洗完成时间未到!', null, sstsConfig.messagePauseTimeOnPackingPage);
 			return;
 		}
@@ -2700,6 +2705,7 @@
 			{ xtype: 'hidden', id: 'task_id' },
 			{ xtype: 'hidden', id: 'isTraceable' },
 			{ xtype: 'hidden', id: 'hideTousseName' },
+			{ xtype: 'hidden', id: 'hideTousseId' },
 			{ xtype: 'hidden', id: 'hidePackedPhotographed' },
 			'->',
 			{
@@ -4000,6 +4006,7 @@
 		materialStore.load({ params: { tousseName: tousseName, tousseDefinitionId: td_id } });
 		Ext4.getCmp('isTraceable').setValue(isTraceable);
 		Ext4.getCmp('hideTousseName').setValue(tousseName);
+		Ext4.getCmp('hideTousseId').setValue(td_id);
 		Ext4.getCmp('task_id').setValue(taskId);
 		showTousseImgBtns();
 	}
@@ -4150,22 +4157,14 @@
 			id: "addMaterialQualityMonitoring",
 			handler: function () {
 				materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+				hideTousseName = Ext4.getCmp("hideTousseName").getValue();
+				hideTousseId = Ext4.getCmp("hideTousseId").getValue();
 				otherPartAddQM = true;
 				var washRecordIds = getWashRecordIds();
-				var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
-				var map = {}, tousseItems = [];
-				Ext4.each(records, function (pNode) {
-					if (pNode.childNodes.length == 0) {
-						var ai = pNode;
-						if (!map[ai.get('tousseName')]) {
-							tousseItems.push({
-								tousseName: ai.parentNode.get('tousseName'),
-								tousseID: ai.parentNode.get('tousseID')
-							});
-							map[ai.get('tousseName')] = ai;
-						}
-					}
-				});
+				var tousseItems = [{
+					tousseName: hideTousseName,
+					tousseID: hideTousseId
+				}];
 				if (washRecordIds.length > 1) {
 					addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
 					showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
@@ -4339,22 +4338,14 @@
 				iconCls: 'btn_ext_application_add',
 				handler: function () {
 					materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+					hideTousseName = Ext4.getCmp("hideTousseName").getValue();
+					hideTousseId = Ext4.getCmp("hideTousseId").getValue();
 					otherPartAddQM = true;
 					var washRecordIds = getWashRecordIds();
-					var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
-					var map = {}, tousseItems = [];
-					Ext4.each(records, function (pNode) {
-						if (pNode.childNodes.length == 0) {
-							var ai = pNode;
-							if (!map[ai.get('tousseName')]) {
-								tousseItems.push({
-									tousseName: ai.parentNode.get('tousseName'),
-									tousseID: ai.parentNode.get('tousseID')
-								});
-								map[ai.get('tousseName')] = ai;
-							}
-						}
-					});
+					var tousseItems = [{
+						tousseName: hideTousseName,
+						tousseID: hideTousseId
+					}];
 					if (washRecordIds.length > 1) {
 						addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
 						showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
@@ -4371,22 +4362,14 @@
 				iconCls: 'btn_ext_application_add',
 				handler: function () {
 					materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection();
+					hideTousseName = Ext4.getCmp("hideTousseName").getValue();
+					hideTousseId = Ext4.getCmp("hideTousseId").getValue();
 					otherPartAddQM = true;
 					var washRecordIds = getWashRecordIds();
-					var records = Ext4.getCmp('waitPackingTreeGrid').getView().getChecked();
-					var map = {}, tousseItems = [];
-					Ext4.each(records, function (pNode) {
-						if (pNode.childNodes.length == 0) {
-							var ai = pNode;
-							if (!map[ai.get('tousseName')]) {
-								tousseItems.push({
-									tousseName: ai.parentNode.get('tousseName'),
-									tousseID: ai.parentNode.get('tousseID')
-								});
-								map[ai.get('tousseName')] = ai;
-							}
-						}
-					});
+					var tousseItems = [{
+						tousseName: hideTousseName,
+						tousseID: hideTousseId
+					}];
 					if (washRecordIds.length > 1) {
 						addQualityMonitoringByResponPart(responsibilityPart, washRecordIds[0], tousseItems);
 						showMultipleResult('所选择的物品关联到了多条清洗记录，清洗信息将自动填写最早的清洗记录！');
@@ -7587,7 +7570,7 @@
 			},
 			failure: function () { myMask.hide(); }
 		});
-	}
+	}	
 
 	// BJ309YY-9:提示标识牌的使用次数
 	function noticeIdCardUseAmount(tousseName,barcode,idCardUseAmount) {
@@ -7880,7 +7863,8 @@
 						break;
 					}
 				}
-				if (isPrint == '是') {
+				if (isPrint == '是' || tousseType == '敷料包' || taskType == taskType_application || taskType == taskType_returnGoods
+				|| taskType == taskType_qualityMonitor) {
 					showPackButton(isPrint, isReview, tousseType, printBOMwhenPrintLabel);
 				} else {
 					Ext4.getCmp('save_print').hide();
@@ -8743,7 +8727,7 @@
 						failure: function () { myMask.destroy(); }
 					});
 				}
-			}],
+			}], 
 			items: [{
 				layout: 'column',
 				region: 'north',