Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r25038 -r25111
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 25038)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 25111)
@@ -285,11 +285,11 @@
 	        	packingMenu.showAt(e.getXY());
 	        });
         }
-        if (comboToussePackingImg){
-        	comboToussePackingImg.on('mouseenter', function(e) {
-        		comboToussePackingMenu.showAt(e.getXY());
-	        });
-        }
+//        if (comboToussePackingImg){
+//        	comboToussePackingImg.on('mouseenter', function(e) {
+//        		comboToussePackingMenu.showAt(e.getXY());
+//	        });
+//        }
         if (reviewPackingImg){
 	        reviewPackingImg.on('mouseenter', function(e) {
 	        	reviewPackingMenu.showAt(e.getXY());
@@ -819,7 +819,7 @@
 			return returnContent;
 		}
 		
-		if(itemId != 'packing' && itemId != 'comboToussePacking' && itemId != 'reviewPacking' && itemId !='sterilizationRecord'){
+		if(itemId != 'packing'  && itemId != 'reviewPacking' && itemId !='sterilizationRecord'){
 			//region 只有临床用户且配了版本2或者3才能看到科室申领版本2或者3的图标还有申请单图标
 			//如果当前图标是科室申领的时候,如果该用户是临床科室且配了版本2或者3,隐藏该图标
 			if (itemId == 'recyclingApplication' && globalIsSupplyRoomUser == 'false' && (sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3)){
@@ -1020,6 +1020,9 @@
 	//jquery使用下面这一句
 	$("#card_box").tabs("select",personalDesktopTitle);
 }
+function closeTab(title){
+	$("#card_box").tabs('close',title);
+}
 function onTabClose(title){
 	//关闭tab 则显示个人桌面，并把tab对应打开的页面所在的div删除
 	if(title){
Index: ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js
===================================================================
diff -u -r25043 -r25111
--- ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 25043)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/comboToussePackingView.js	(.../comboToussePackingView.js)	(revision 25111)
@@ -5,6 +5,7 @@
 var packing = false;
 var waitAmount = {};
 var fromPortal = false;
+var waitComboTousseGridEditing = false;
 /**
  * 聚合包装配界面
  */
@@ -469,8 +470,12 @@
 	})
     
     comboTousseStore.on("beforeload", function(thiz, options) {
-    	comboTousseStore.proxy.extraParams["comboTousseOrgUnitCoding"] = top.Ext4.getCmp("comboToussePacking_orgUnit").getValue();
-    	
+    	if(isSelectionValidate('comboToussePacking_orgUnit')){
+    		comboTousseStore.proxy.extraParams["comboTousseOrgUnitCoding"] = top.Ext4.getCmp("comboToussePacking_orgUnit").getValue();
+    	}else{
+    		comboTousseStore.proxy.extraParams["comboTousseOrgUnitCoding"] = null;
+    	}
+    	comboTousseStore.proxy.extraParams["spell"] = top.Ext4.getCmp("comboTousseName").getRawValue();
 	});
     
   //申请科室Store
@@ -499,14 +504,16 @@
 		minChars : 0,
 		valueField : 'id',
 		displayField : 'name',
-		queryParam : 'spell',
+//		queryParam : 'spell',
+		queryParam: false,
 		width : 180,
 		store : comboTousseStore,
-		forceSelection : true,
+//		forceSelection : true,
 		lazyInit : true,
 		triggerAction : 'all',
 		hideTrigger : false,
 		typeAhead : false,
+		queryCaching: false,
 		allowBlank : true,
 //		editable:false,
 		listeners : {
@@ -576,32 +583,43 @@
 						}
 					});
 				}
-			},beforequery: function(queryPlan, eOpts){
-//            	以后可能会需要打开
-//            	var comboToussePacking_orgUnit = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
-//            	if(isUndefinedOrNullOrEmpty(comboToussePacking_orgUnit)){
-//            		showResult('请选择科室!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-//            		return false;
-//            	}
-            },beforeselect: function(combo, record, index, eOpts){
-//            	以后可能会需要打开
-//            	var comboToussePacking_orgUnit = top.Ext4.getCmp('comboToussePacking_orgUnit').getValue();
-//            	if(isUndefinedOrNullOrEmpty(comboToussePacking_orgUnit)){
-//            		showResult('请选择科室!' , null , sstsConfig.messagePauseTimeOnPackingPage);
-//            		return false;
-//            	}
-            }
+			}
 		}
     }];
     
-    var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel');
+    var selModel = top.Ext4.create('top.Ext4.selection.CheckboxModel',{
+    	mode:'SIMPLE'
+    });
     var waitComboTousseGrid = top.Ext4.create('cellEditingGrid', {
     	id : 'waitComboTousseGrid',
     	title : '器械包列表',
-    	height: 328,
+//    	viewConfig: {
+//            forceFit: true
+//        },
     	selModel: selModel,
     	border : false,
     	tbar : tbar,
+    	listeners: {
+    	    beforedeselect: function(sm, record, index, eOpts ) {
+    	    	if(waitComboTousseGridEditing){
+    	    		return false;
+    	    	}
+    	    	return true;
+    	    },
+    	    beforeedit: function( editor, context, eOpts ) {
+//    	    	context.record.data.editing = true;
+    	    	waitComboTousseGridEditing = true;
+    	    	return true;
+    	    },
+    	    canceledit: function( editor, context, eOpts ) {
+//    	    	context.record.data.editing = false; 
+    	    	waitComboTousseGridEditing = false;
+     	    },
+     	    edit: function( editor, context, eOpts ) {
+//     	    	context.record.data.editing = false; 
+     	    	waitComboTousseGridEditing = false;
+     	    }
+    	},
     	store: new Ext4.data.Store({
     		fields : [
         	    {name : 'id',mapping : 'id'},
@@ -681,8 +699,6 @@
     var comboTousseDataGrid = top.Ext4.create('cellEditingGrid', {
 		id : 'comboTousseDataGrid',
 		title : '聚合包列表',
-//		width:300,
-    	height: 328,
     	border : false,
     	selModel: comboTousseDataGrid_selModel,
 		store: new Ext4.data.Store({
@@ -698,7 +714,7 @@
         }),
         listeners:{
 			edit :function(editor, context){
-				if(context.colIdx != 2){
+				if(context.field != 'amount'){
 					return;
 				}
 				// 刷新可装配数量
@@ -1020,24 +1036,39 @@
             margin :'5 0 0 0',
             pageSize : 100,
             store : appDepartJsonStore,
-            forceSelection : true,
+//            forceSelection : true,
 			lazyInit : true,
 			triggerAction : 'all',
 			hideTrigger : true,
 			typeAhead : false,
 //            allowBlank : !sstsConfig.sterilizerNotAllowBlank,
             anchor : '80%',
             listeners : {
-                select : function(combo, record, index) {
-                	top.Ext4.getCmp("comboTousseName").setValue('');
+//                select : function(combo, record, index) {
+//                	top.Ext4.getCmp("comboTousseName").setValue('');
+//                	var waitComboTousseStore = top.Ext4.getCmp("waitComboTousseGrid").getStore();
+//    				waitComboTousseStore.removeAll();
+//    				var comboGrid = top.Ext4.getCmp("comboGrid").getStore();
+//    				comboGrid.removeAll();
+//    				var comboTousseDataGrid = top.Ext4.getCmp("comboTousseDataGrid").getStore();
+//    				comboTousseDataGrid.removeAll();
+//    				
+//    				comboTousseStore.reload();
+//                },
+                change: function(combo, newValue, oldValue, eOpts){
+//                	top.Ext4.getCmp("comboTousseName").setValue('');
                 	var waitComboTousseStore = top.Ext4.getCmp("waitComboTousseGrid").getStore();
     				waitComboTousseStore.removeAll();
     				var comboGrid = top.Ext4.getCmp("comboGrid").getStore();
     				comboGrid.removeAll();
     				var comboTousseDataGrid = top.Ext4.getCmp("comboTousseDataGrid").getStore();
     				comboTousseDataGrid.removeAll();
     				
-    				comboTousseStore.reload();
+//    				comboTousseStore.reload({
+//    				    params : {
+//    				    	spell: top.Ext4.getCmp("comboTousseName").getValue()
+//    				    }
+//    				});
                 }
             }
         }],
@@ -1060,32 +1091,34 @@
     var comboTousseWin = new top.Ext4.window.Window( {
     	id : 'comboTousseWin',
         title : '装配聚合包',
-        width : 1000,
-        height: 500,
-        resizable :false,
+        width : '95%',
+        height: '95%',
 		modal : true,
 		border : false,
 		plain : true,
-		layout : 'border',
+		layout : 'anchor',
         items : [{
-            region : 'north',
             height : 130,
+            anchor: '100%',
             layout : 'fit',
             items : [packingComboToussePanel]
         }, {
             region : 'center',
-            height : 250,
-            layout : 'column',
+            anchor: '100% -130',
+            layout : 'hbox',
+            align: 'stretch',
             items : [
             {
-                layout : 'form',
-                columnWidth : 0.4,
+            	autoScroll: true,
+            	height:'100%',
+                layout : 'fit',
+                flex: 40,
                 items : [ waitComboTousseGrid ]
             },{
                 layout : 'form',
-                columnWidth : 0.05,
                 buttonAlign:'center',
-                height : 328,
+                height:'100%',
+                width:50,
                 items : [
                 {   height :60,
                     border:false
@@ -1142,13 +1175,21 @@
                     }
                 } ]
             }, {
-                layout : 'form',
-                columnWidth : 0.55,
+            	height:'100%',
+            	flex: 55,
+            	autoScroll: true,
+                layout : 'fit',
                 items : [ comboTousseDataGrid ]
             } ]
         }]
     });
     
+    comboTousseWin.on('close',function(w){
+    	if(fromPortal){
+    		top.closeTab('装配聚合包');
+    	}
+    });
+    
     comboTousseWin.show();
     
     if (sstsConfig.printLabelWhenReviewing == true){
@@ -1460,4 +1501,23 @@
 		return true;
     }
     
+    function isSelectionValidate(cmpId){
+    	var cmp = top.Ext4.getCmp(cmpId);
+    	var rawValue = cmp.getRawValue();
+    	if(isUndefinedOrNullOrEmpty(rawValue)){
+    		return false;
+    	}
+    	var dr = cmp.findRecordByDisplay(rawValue);
+    	if(!dr){
+    		return false;
+    	}
+        var value = cmp.getValue();
+        var vr = cmp.findRecordByValue(value);
+        
+        if(dr == vr){
+        	return true;
+        }
+        return false;
+    }
+    
 }