Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r36626 -r36630
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 36626)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 36630)
@@ -869,9 +869,9 @@
 									responsibilityPart:sessionItem.responPartName,
 									ids:sessionItem.ids
 								}, arr);
-								enableRecycleAndRepacking();
-								top.Ext.getCmp('disabledBarcode').enable();
 							}
+						}else {
+							top.Ext.getCmp('disabledBarcode').enable();
 						}
 					}
 				} else if (result.data.scope == "无") {
@@ -984,7 +984,9 @@
 		} else if (tousseType == PACKAGE_TYPE_FOREIGN
 			|| tousseType == PACKAGE_TYPE_SPLIT
 			|| tousseType == '敷料包' || toussedefRecycling == '否') {
-			disableRecycleCanRepacking();
+			if(!sessionItem){
+				disableRecycleCanRepacking();
+			}
 		} else {
 			enableRecycleAndRepacking();
 		}
@@ -2530,7 +2532,7 @@
 		top.Ext.getCmp('tempBarcode' + tousseItemCount + "_" + 3).disable();
 		top.Ext.getCmp('tempBarcode' + tousseItemCount + "_" + 14).setValue(true)
 		top.Ext.getCmp('responsibilityPart').disable();
-		top.Ext.getCmp('addExtractCheckTousseBtnC').setVisible(false);
+		top.Ext.getCmp('addExtractCheckTousseBtnC').el.dom.style.opacity = 0;
 	}
 	if(sstsConfig.enableRepeatPrintingLabelsAddQualityMonitoringFunction){
 		var responsibilityPart = top.Ext.getCmp('responsibilityPart').getValue();
@@ -2649,71 +2651,57 @@
 			top.Ext.getCmp('formName').setValue("");
 			top.Ext.getCmp("formDefinitionId").setValue("");
 			top.Ext.getCmp("name").setValue("");
-		} else if (responPartName == '其他环节' || responPartName == '装配管理') {
+		} else if (responPartName == '其他环节') {
 			var arr = []
-			setTimeout(function () {
-				var scope;
-				if (top.Ext.getCmp('scope')) {
-					scope = top.Ext.getCmp('scope').getValue();
+			var scope;
+			if (top.Ext.getCmp('scope')) {
+				scope = top.Ext.getCmp('scope').getValue();
+			}
+			if(scope == '器械包'){
+				for(var i=0;i<tousseItems.length;i++){
+					arr.push({
+						barcode:tousseItems[i].data.barcode,
+						tousseInstanceId:tousseItems[i].data.id,
+						tousseName:tousseItems[i].data.tousseDefinitionName + '('+tousseItems[i].data.barcode+')',
+						amount:tousseItems[i].data.amount,
+						orderNumber:(i+1),
+						isRecycle:'否',
+						isRePacking:'否',
+						isDiscard:'否',
+						scope:scope,
+						showInput:true
+					});
 				}
-				if (scope == '器械包') {
-					if (tousseItems.length > 0) {
-						for (var i = 0; i < tousseItems.length; i++) {
-							var tousseDefinitionName = tousseItems[i].data.tousseDefinitionName || tousseItems[i].data['tousseDefinition.name'] || tousseItems[i].data['tousseName'];
-							var barcode = tousseItems[i].data.barcode || tousseItems[i].data.tousseBarcode;
-							arr.push({
-								id: tousseItems[i].data.id,
-								barcode: barcode,
-								tousseInstanceId: tousseItems[i].data.id,
-								tousseName: tousseDefinitionName + '(' + barcode + ')',
-								amount: tousseItems[i].data.amount || 1,
-								orderNumber: (i + 1),
-								isRecycle: '否',
-								isRePacking: '否',
-								isDiscard: '否',
-								isReprint: '是',
-								scope: scope,
-								showInput: true
-							});
-						}
-						loadTousseMsg({
-							responsibilityPart:responPartName,
-							ids:ids
-						}, arr);
-						enableRecycleAndRepacking();
-						top.Ext.getCmp('disabledBarcode').enable();
+				loadTousseMsg({},arr);
+				if(!ids){
+					enableRecycleAndRepacking();
+					top.Ext.getCmp('disabledBarcode').enable();
+				}
+			}else if(scope == '材料和器械包'){
+				if(tousseItems.length > 0){
+					for(var i=0;i<tousseItems.length;i++){
+						var result = getTousseInstanceMsg(tousseItems[i].data.barcode);
+						arr.push({
+							barcode:tousseItems[i].data.barcode,
+							tousseInstanceId:tousseItems[i].data.id,
+							tousseDefinitionId:result.tousseDefinitionId,
+							tousseName:tousseItems[i].data.tousseDefinitionName + '('+tousseItems[i].data.barcode+')',
+							amount:tousseItems[i].data.amount,
+							orderNumber:(i+1),
+							isRecycle:'否',
+							isRePacking:'否',
+							isDiscard:'否',
+							scope:scope,
+							showInput:true
+						});
 					}
-				} else if (scope == '材料和器械包') {
-					if (tousseItems.length > 0) {
-						for (var i = 0; i < tousseItems.length; i++) {
-							var tousseDefinitionName = tousseItems[i].data.tousseDefinitionName || tousseItems[i].data['tousseDefinition.name'] || tousseItems[i].data['tousseName'];
-							var barcode = tousseItems[i].data.barcode || tousseItems[i].data.tousseBarcode;
-							var result = getTousseInstanceMsg(barcode);
-							arr.push({
-								id: tousseItems[i].data.id,
-								barcode: barcode,
-								tousseInstanceId: tousseItems[i].data.id,
-								tousseDefinitionId: result.tousseDefinitionId,
-								tousseName: tousseDefinitionName + '(' + barcode + ')',
-								amount: tousseItems[i].data.amount || 1,
-								orderNumber: (i + 1),
-								isRecycle: '否',
-								isRePacking: '否',
-								isDiscard: '否',
-								isReprint: '是',
-								scope: scope,
-								showInput: true
-							});
-						}
-						loadMateriaAndTousselMsg({
-							responsibilityPart:responPartName,
-							ids:ids
-						}, arr);
+					loadMateriaAndTousselMsg({},arr);
+					if(!ids){
 						enableRecycleAndRepacking();
 						top.Ext.getCmp('disabledBarcode').enable();
 					}
 				}
-			}, 500);
+			}
 		}
 		top.Ext.getCmp('responsibilityPart').setValue(responPartName);
 	}, 500);
@@ -4235,7 +4223,10 @@
 						top.Ext.getCmp('tempBarcode').disable();
 						top.Ext.getCmp('tousseName').disable();
 						top.Ext.getCmp('responsibilityPart').disable();
-						top.Ext.getCmp('addExtractCheckTousseBtnC').setVisible(false);
+						top.Ext.getCmp('addExtractCheckTousseBtnC').el.dom.style.opacity = 0;
+						top.Ext.getCmp('recycle').disable();
+						top.Ext.getCmp('repacking').disable();
+						top.Ext.getCmp('disabledBarcode').disable();
 					}
 				}
 			}
@@ -4254,7 +4245,11 @@
 			if (!showInput) {
 				addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true);
 			} else if (scope == '器械包' || scope == '材料和器械包') {
-				addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, showInput, qualityMonitoringInstance.ids);
+				var isShowInput = true;
+				if(qualityMonitoringInstance.ids){
+					isShowInput = false;
+				}
+				addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, isShowInput, qualityMonitoringInstance.ids);
 			}
 		}
 	}
@@ -4386,7 +4381,7 @@
 						top.Ext.getCmp('tempBarcode').disable();
 						top.Ext.getCmp('tousseName').disable();
 						top.Ext.getCmp('responsibilityPart').disable();
-						top.Ext.getCmp('addExtractCheckTousseBtnC').setVisible(false);
+						top.Ext.getCmp('addExtractCheckTousseBtnC').el.dom.style.opacity = 0;
 					}
 				}
 			}
@@ -4411,7 +4406,11 @@
 				if (!showInput) {
 					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true);
 				} else if (scope == '器械包' || scope == '材料和器械包') {
-					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, showInput, qualityMonitoringInstance.ids);
+					var isShowInput = true;
+					if(qualityMonitoringInstance.ids){
+						isShowInput = false;
+					}
+					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, isShowInput, qualityMonitoringInstance.ids);
 				}
 				if (scope == '材料和器械包' && showInput == true) {
 					addExtractCheckMaterial("", "", 1, "", "", "", true, "", "", true, "", "", orderNumber, tousseDefinitionId);
@@ -4439,7 +4438,11 @@
 				if (!showInput) {
 					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true);
 				} else if (scope == '器械包' || scope == '材料和器械包') {
-					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, showInput);
+					var isShowInput = true;
+					if(qualityMonitoringInstance.ids){
+						isShowInput = false;
+					}
+					addExtractCheckTousse(tousseName, barcode, tousseInstanceId, amount, orderNumber, isRecycle, isRePacking, isDiscard, "", "", "", "", true, isShowInput, qualityMonitoringInstance.ids);
 				}
 				if (scope == '材料和器械包' && showInput == true) {
 					addExtractCheckMaterial("", "", 1, "", "", "", true, "", "", true, "", "", orderNumber, tousseDefinitionId);