Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r33591 -r33749
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 33591)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 33749)
@@ -15,7 +15,6 @@
 //定义首篮筐的label变量
 var beginBarcodeLabel = '扫描条码:';
 var hiddenEndBarcode = true;//隐藏尾篮筐
-var useRecordOperationRoomAllowBlank = false;
 var idCardBarcodePaperTypeStore = null;
 if(sstsConfig.disableLoadToVirtualBasket == false){
 	beginBarcodeLabel = '条码/篮筐(首):';
@@ -2484,9 +2483,17 @@
 						id : "belongDepartNames",
 						msgTarget:'side',
 						readOnly:true,
+						style:"cursor: pointer;",
 						onTriggerClick : function(){
 							setDepartOrgUnit2('belongDepartCodes' , 'belongDepartNames' ,'hiddenTableDataStr');
 						},
+						listeners:{
+							render:function(item){
+								item.getEl().on('click', function(p){  
+									setDepartOrgUnit2('belongDepartCodes' , 'belongDepartNames' ,'hiddenTableDataStr');
+						  		}); 
+							}
+						},
 						triggerClass : 'x-form-search-trigger',
 						anchor : '100%'
 					}]
@@ -2517,6 +2524,33 @@
 						triggerClass : 'x-form-search-trigger',
 						anchor : '100%'
 					}]
+				}, {
+					columnWidth : 1,
+					layout : 'form',
+					labelWidth : fontSize == 12 ? 90 : 100,
+					labelAlign:"right",
+					hidden : !sstsConfig.enableInstrumentSetTypeSetting,
+					items:[{
+						//用于保存时：传递器械包种类id
+						xtype : 'hidden',
+						id : 'tousseSetType',
+						name : 'tousseSetType'
+					},{
+						xtype : 'trigger',
+						fieldLabel : "器械包种类",
+						allowBlank : true,
+						name : "tousseSetTypeName",
+						id : "tousseSetTypeName",
+						msgTarget:'side',
+						readOnly:true,
+						onTriggerClick : function(){
+							var ids = top.Ext.getCmp('tousseSetType').getValue();
+							var names = top.Ext.getCmp('tousseSetTypeName').getValue();
+							setInstrumentSetType('tousseSetType' , 'tousseSetTypeName' , ids, names);
+						},
+						triggerClass : 'x-form-search-trigger',
+						anchor : '100%'
+					}]
 				},{
 		    	   columnWidth : colWidth,
 			       layout : 'form',
@@ -2969,7 +3003,7 @@
 				}
 				var ids = [];
 				var names = [];
-				if(tousseDefinition.instrumentSetTypeJSONArray.length > 0){
+				if(tousseDefinition.instrumentSetTypeJSONArray && tousseDefinition.instrumentSetTypeJSONArray.length > 0){
 					for(var i=0;i<tousseDefinition.instrumentSetTypeJSONArray.length;i++){
 						ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id;
 						names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name;
@@ -2980,6 +3014,17 @@
 					top.Ext.getCmp('instrumentSetType').setValue('');
 					top.Ext.getCmp('instrumentSetTypeName').setValue('');
 				}
+				if(tousseDefinition.tousseSetTypeJSONArray &&tousseDefinition.tousseSetTypeJSONArray.length > 0){
+					for(var i=0;i<tousseDefinition.tousseSetTypeJSONArray.length;i++){
+						ids[i] = tousseDefinition.tousseSetTypeJSONArray[i].id;
+						names[i] = tousseDefinition.tousseSetTypeJSONArray[i].name;
+					}
+					top.Ext.getCmp('tousseSetType').setValue(ids.join(';'));
+					top.Ext.getCmp('tousseSetTypeName').setValue(names.join(';'));
+				}else {
+					top.Ext.getCmp('tousseSetType').setValue('');
+					top.Ext.getCmp('tousseSetTypeName').setValue('');
+				}
 				if(tousseDefinition.printBOMwhenPrintLabel == ''){
 					top.Ext.getCmp('printBOMwhenPrintLabel').setValue('否');
 				}
@@ -3079,6 +3124,8 @@
 	var belongOrgUnitCodes = top.Ext.getCmp('belongDepartCodes').getValue();
 	//所属种类
 	var instrumentSetType = top.Ext.getCmp('instrumentSetType').getValue();
+	//器械包种类
+	var tousseSetType = top.Ext.getCmp('tousseSetType').getValue();
 	var materials = [];
 	// 设置序号
 	setMaterialSequence();
@@ -3154,6 +3201,7 @@
 						materialDefinitionConfigResult : JSON.stringify(materials),
 						belongOrgUnitCodes : belongOrgUnitCodes,
 						instrumentSetTypeIds:instrumentSetType,
+						tousseSetTypeIds:tousseSetType,
 						belongOrgUnit : JSON.stringify(belongOrgUnit),
 						expendTousseImg:expendTousseImg,
 						expendInstructionBook:expendInstructionBook,
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js
===================================================================
diff -u -r33706 -r33749
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js	(.../setDepartOrgUnitForm.js)	(revision 33706)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/setDepartOrgUnitForm.js	(.../setDepartOrgUnitForm.js)	(revision 33749)
@@ -311,7 +311,7 @@
 			html: '<iframe id="thisIframe" name="thisIframe" src="' + WWWROOT + '/common/changeDepartment.jsp" width="100%" height="100%" frameborder=0></iframe>'
 		}],
 		buttons: [{
-			text: '保存',
+			text: '确定',
 			handler: function () {
 				var hiddenTableDataStr = top.document.getElementById('setDepartWindow').getElementsByTagName('iframe')[0].contentWindow.document.getElementById('hiddenTableData').value;
 				if (hiddenTableDataStr !== '') {