Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js
===================================================================
diff -u -r14745 -r14787
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 14745)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringForm.js	(.../qualitymonitoringForm.js)	(revision 14787)
@@ -1,7 +1,9 @@
 var qualityMonitoringWin = null;
 var disableShowImageButton = false;
 var materialDefinitionStore;
-var i = 0;
+var tousseDefinitionStore;
+var materialItemCount = 0;
+var tousseItemCount = 0;
 var qualityMonitoringId;
 var formPanel;
 var qualityMonitoringSterilizationID;
@@ -314,6 +316,54 @@
 				if(top.Ext.getCmp('itemsFieldSet')){
 					top.Ext.getCmp('itemsFieldSet').doLayout();
 				}
+				if(result.data.scope == "器械包"){
+					top.Ext.getCmp('material').setVisible(false);   
+					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(false);
+					top.Ext.getCmp('amount').setVisible(false);   
+					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(false);
+					hideExtractCheckMaterial();
+					top.Ext.getCmp('tempBarcode').setVisible(true);   
+					top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('recycle').setVisible(true);   
+					top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('tousseName').setVisible(true);   
+					top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('repacking').setVisible(true);   
+					top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('addExtractCheckTousse').setVisible(false);
+					top.Ext.getCmp('addExtractCheckMaterial').setVisible(false);
+				}else if(result.data.scope == "材料"){
+					top.Ext.getCmp('tempBarcode').setVisible(false);   
+					top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(false);
+					top.Ext.getCmp('recycle').setVisible(false);   
+					top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(false);
+					top.Ext.getCmp('tousseName').setVisible(false);   
+					top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(false);
+					top.Ext.getCmp('repacking').setVisible(false);   
+					top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(false);
+					top.Ext.getCmp('material').setVisible(true);   
+					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('amount').setVisible(true);   
+					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
+					//showExtractCheckMaterial();
+					top.Ext.getCmp('addExtractCheckTousse').setVisible(false);
+					top.Ext.getCmp('addExtractCheckMaterial').setVisible(true);
+				}else{
+					top.Ext.getCmp('material').setVisible(true);   
+					top.Ext.getCmp('material').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('amount').setVisible(true);   
+					top.Ext.getCmp('amount').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('tempBarcode').setVisible(true);   
+					top.Ext.getCmp('tempBarcode').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('recycle').setVisible(true);   
+					top.Ext.getCmp('recycle').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('tousseName').setVisible(true);   
+					top.Ext.getCmp('tousseName').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('repacking').setVisible(true);   
+					top.Ext.getCmp('repacking').getEl().up('.x-form-item').setDisplayed(true);
+					top.Ext.getCmp('addExtractCheckTousse').setVisible(false);
+					top.Ext.getCmp('addExtractCheckMaterial').setVisible(true);
+				}
 			}
 		},
 		failure : function(response, options) {
@@ -397,17 +447,17 @@
 		});
 	}
 }
-function addExtractCheckTousse(){
-	i++;
+function addExtractCheckMaterial(){
+	materialItemCount++;
 	var setLeft = top.Ext.getCmp('setLeft');
 	var setRight = top.Ext.getCmp('setRight');
 	
 	var items = new Array();
 	var items2 = new Array();
 	items = {
 			xtype : 'combo',
-			id : "material"+i,
-			name : 'material'+i,
+			id : "material"+materialItemCount,
+			name : 'material'+materialItemCount,
 			fieldLabel : '抽检器械',
 			queryParam : 'spell',
 			minChars : 0,
@@ -429,8 +479,8 @@
 	items2 = {
 			xtype : 'numberfield',
 			allowDecimals : false,
-			name : 'amount'+i,
-			id : "amount"+i,
+			name : 'amount'+materialItemCount,
+			id : "amount"+materialItemCount,
 			fieldLabel : "数量",
 			anchor : '95%'
 		};
@@ -439,12 +489,126 @@
 	setLeft.doLayout();
 	setRight.doLayout();
 }
+
+function hideExtractCheckMaterial(){
+	if(materialItemCount > 0){
+		for(var i=1;i<materialItemCount+1;i++){
+			top.Ext.getCmp("material"+i).setVisible(false);
+			top.Ext.getCmp("material"+i).getEl().up('.x-form-item').setDisplayed(false);
+			top.Ext.getCmp('amount'+i).setVisible(false);   
+			top.Ext.getCmp('amount'+i).getEl().up('.x-form-item').setDisplayed(false);
+		}
+	}
+}
+
+function addExtractCheckTousse(){
+	tousseItemCount++;
+	var setLeft = top.Ext.getCmp('setLeft');
+	var setRight = top.Ext.getCmp('setRight');
+	
+	var items1 = new Array();
+	var items2 = new Array();
+	var items3 = new Array();
+	var items4 = new Array();
+	items1 = {
+			xtype : 'textfield',
+			name : 'tempBarcode'+tousseItemCount,
+			id : 'tempBarcode'+tousseItemCount,
+			fieldLabel : "器械包条码",
+			listeners : {
+				specialkey : function(field,e){
+					if(e.getKey() == 13){
+						//alert(field.getId());
+						getTousseInstanceNameAndResponsiblePerson(field.getValue(), top.Ext.getCmp('inspectItem').getValue(), materialDefinitionStore);
+						field.setValue('');
+					}
+				}
+			},
+			anchor : '95%'
+		};
+	items2 = {
+			id : 'tempBarcode'+tousseItemCount+1,
+			name : 'tempBarcode'+tousseItemCount+1,
+			fieldLabel :  '重新回收',
+			xtype : 'checkbox',
+			inputValue :  '重新回收',
+			listeners:{
+				check:function( thiz, checked ){
+					if(checked){
+						top.Ext.getCmp('isRecycle').setValue('是');
+						top.Ext.getCmp('repacking').setValue(false);
+					}else{
+						top.Ext.getCmp('isRecycle').setValue('否');
+					}
+				}
+			}
+		};
+	items3 = {
+		xtype : 'combo',
+		id : 'tempBarcode'+tousseItemCount+2,
+		name : 'tempBarcode'+tousseItemCount+2,
+		fieldLabel : '器械包名称',
+		queryParam : 'spell',
+		minChars : 0,
+		valueField : 'name',
+		displayField : 'name',
+		store : tousseDefinitionStore,
+		forceSelection : true,
+		lazyInit : true,
+		triggerAction : 'all',
+		hideTrigger : true,
+		typeAhead : false,
+		anchor : '95%',
+		listeners : {
+			select : function(combo, record, index) {
+				combo.setValue(record.data.name);
+				top.Ext.getCmp('tousseDefinitionId').setValue(record.data.id);
+				//加载责任人
+				
+			},
+			blur : function(field){
+				if(!top.Ext.getCmp('tousseName').getRawValue()){
+					top.Ext.getCmp('tousseDefinitionId').setValue('');
+				}
+				//重新加载包内的材料
+				materialDefinitionStore.reload();
+			}
+		}
+	};
+	items4 = {
+		id : 'tempBarcode'+tousseItemCount+3,
+		name : 'tempBarcode'+tousseItemCount+3,
+		fieldLabel :  '重新装配',
+		xtype : 'checkbox',
+		inputValue :  '重新装配',
+		listeners:{
+			check:function( thiz, checked ){
+				if(checked){
+					top.Ext.getCmp('isRepacking').setValue('是');
+					top.Ext.getCmp('recycle').setValue(false);
+				}else{
+					top.Ext.getCmp('isRepacking').setValue('否');
+				}
+			}
+		}
+	};
+
+	setLeft.add(items1);
+	setLeft.add(items2);
+	setRight.add(items3);
+	setRight.add(items4);
+	setLeft.doLayout();
+	setRight.doLayout();
+	top.Ext.getCmp('tempBarcode'+tousseItemCount+1).disable();
+	top.Ext.getCmp('tempBarcode'+tousseItemCount+3).disable();
+}
 function addQualityMonitoring(id) {
 	if(id==null||id=='undentified'){
 		id="";
 	}
 	qualityMonitoringId = id;
-	i=0;
+	materialItemCount=0;
+	tousseItemCount=0;
 	materialDefinitionStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getMaterialDefinitionData.do?selectType=material',
@@ -465,8 +629,7 @@
 			} 
 		}
 	});
-	
-	var tousseDefinitionStore = new Ext.data.Store({
+	tousseDefinitionStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do',
 			method : 'POST'
@@ -750,11 +913,18 @@
 			}]
 		}],
 		buttons : [{
-			text : '添加抽检器械',
+			id : 'addExtractCheckTousse',
+			text : '添加抽检器械包',
 			handler : function(){
 				addExtractCheckTousse();
 			}
 		},{
+			id : 'addExtractCheckMaterial',
+			text : '添加抽检器械',
+			handler : function(){
+				addExtractCheckMaterial();
+			}
+		},{
 			id : 'saveBtn',
 			text : '保存',
 			handler : function(){
@@ -956,7 +1126,7 @@
 		plain : true,
 		items : [ formPanel ]
 	});
-	
+
 	qualityMonitoringWin.show();
 	if(id != null && id != ''){
 		Ext.Ajax.request({