Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r16985 -r17205
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 16985)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 17205)
@@ -1252,7 +1252,8 @@
 			obj.put("departId", supplyRoomConfig.getOrgUnitCoding());
 			obj.put("name", supplyRoomConfig.getOrgUnitName());
 			obj.put("sequence", supplyRoomConfig.getSequence());
-			
+			obj.put("spell", supplyRoomConfig.getSpelling());
+
 			jsonArray.add(obj);
 		}
 		return jsonArray;
Index: ssts-web/src/main/webapp/js/extCompOperationUtil.js
===================================================================
diff -u -r16893 -r17205
--- ssts-web/src/main/webapp/js/extCompOperationUtil.js	(.../extCompOperationUtil.js)	(revision 16893)
+++ ssts-web/src/main/webapp/js/extCompOperationUtil.js	(.../extCompOperationUtil.js)	(revision 17205)
@@ -7,6 +7,9 @@
 
     var motionObj;
 
+    //extCompOperationUtil类中的ext对象
+    var localExtObj;
+
     //动作的常量
     var constants = {
         UP: 'up',
@@ -31,6 +34,13 @@
             }
             return motionObj;
         }
+        /**
+         * 设置本地的extJs对象
+         * @param extObj 需要设置的extJs对象
+         */
+        this.setExtObj = function (extObj) {
+            localExtObj = extObj;
+        }
     }
 
     //动作的类,用于获取上下最上最下的动作
@@ -61,8 +71,8 @@
          * @param gridId (可选)对应grid的Id
          */
         this.operationMove = function (motion, gridId) {
-            //从common.js获取对应的extJs对象版本
-            var extObj = getExtObj();
+            //先从当前类获取extJs对象,如果没有设置则从common.js获取对应的extJs对象版本
+            var extObj = localExtObj || getExtObj();
             //如果不传gridId,则使用页面中的grid对象
             var grid = extObj.getCmp(gridId) || grid;
             var store = grid.getStore();
@@ -97,10 +107,10 @@
                 operation.border = size - 1;
                 operation.pos = rowIndex + 1;
             }
-            else if (motion == 'top') {
+            else if (motion == motionObj.getTop()) {
                 operation.border = operation.pos = 0;
             }
-            else if (motion == 'bottom') {
+            else if (motion == motionObj.getBottom()) {
                 operation.border = operation.pos = size - 1;
             }
             else {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r17150 -r17205
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 17150)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp	(.../supplyRoomTypeView.jsp)	(revision 17205)
@@ -7,12 +7,13 @@
 </head>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <link rel="stylesheet" href="${ctx}/styles/main.css" type="text/css" />
-<script type="text/javascript" src="${ctx}/js/common.js" /></script>
+<script type="text/javascript" src="${ctx}/js/common.js"></script>
+<script type="text/javascript" src="${ctx}/js/extCompOperationUtil.js"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
-<script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
-<script type="text/javascript" src="${ctx }/dwr/interface/SupplyRoomConfigTableManager.js"></script>
-<script type="text/javascript" src="${ctx }/dwr/engine.js"></script>
-<script type="text/javascript" src="${ctx }/dwr/util.js"></script>
+<script type="text/javascript" src="${ctx}/js/extUtils.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/SupplyRoomConfigTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/engine.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 <script type="text/javascript" src="supplyRoomTypeForm.js"></script>
 <script type="text/javascript">
 var enableEditBtn = false;
@@ -31,5 +32,10 @@
 	<div id="formPanel" align="left" style="height:100%;width: 100%;"></div>
 </center>
 </div>
+<style>
+	.resultList table{
+		background-color:yellow;
+	}
+</style>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r17023 -r17205
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 17023)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 17205)
@@ -1,10 +1,55 @@
 var supplyRoom1Store;
 var supplyRoom1Store2;
 var supplyRoom1Store3;
+var supplyRoom1Store5;
 var sterilingTypeStore;
 var packageTypeStore;
 var configWinHeight = top.screen.height > 1000 ? 700 : 600;
 var configWinWidth = top.screen.width > 1280 ? 1920 : 1500;
+extCompOperationUtil.setExtObj(Ext);
+gridOperation = extCompOperationUtil.getGridOperation();
+motionObj = extCompOperationUtil.getMotionObj();
+
+
+/**
+ * 科室申领配置，结算科室配置查询对应的科室
+ * @param supplyRoom1Store 对应的数据源
+ * @param keyWordId 搜索的关键字
+ * @param queryResultId 显示结果节点的id
+ */
+function searchSupplyRoom1Store(supplyRoom1Store, keyWordId, queryResultId) {
+    var keyWord = Ext.getCmp(keyWordId).getValue();
+    var count = 0;
+	//先清除高亮标记
+    supplyRoom1Store.each(function (item) {
+        item.set('isFind', false);
+    });
+    //如果关键搜索为空,则不进行搜索
+    if (Ext.isEmpty(keyWord)){
+        setQueryResultTips(queryResultId, '');
+        return;
+    }
+    supplyRoom1Store.findBy(function (item) {
+        var reg = new RegExp(keyWord, 'i');
+        if (item.get('name').search(reg) != -1 || item.get('spell').search(reg) != -1){
+            //如果找到该记录,设计高亮标记
+            item.set('isFind', true);
+            count++;
+		}
+    });
+    setQueryResultTips(queryResultId, '<font style="color: red">共找到:' + count + '条记录</font>');
+}
+
+/**
+ * 设置查询结果的提示
+ * @param queryResultId 显示结果节点的id
+ * @param tips 要显示的提示信息
+ */
+function setQueryResultTips(queryResultId, tips) {
+    var queryResult = Ext.getCmp(queryResultId);
+    queryResult.setText(tips);
+}
+
 function removeGridItem(supplyRoom1){
 	var obj = Ext.getCmp(supplyRoom1);
 	var rows = obj.getSelectionModel().getSelections();// 返回值为
@@ -185,7 +230,8 @@
 		    {name : 'departId'},
 		    {name : 'name'},
 		    {name : 'sequence'},
-		    {name : 'newSequence'}
+		    {name : 'newSequence'},
+		    {name : 'spell'}
 		]
 	});
 	
@@ -224,16 +270,27 @@
 		}),
 		reader : rd
 	});
+
+	//使用记录转申请单不发货科室配置
+    supplyRoom1Store5 = new Ext.data.Store({
+        proxy : new Ext.data.HttpProxy({
+            url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=5',
+            method : 'POST'
+        }),
+        reader : rd
+    });
 	
 	//一级供应室配置的表格列头
 	var cm = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
 	},{
+        header : "科室编码",
 		id : 'departId',
 		dataIndex : 'departId',
-		hidden :true
+        width : 20,
+		hidden :false
 	},{
 		header : "科室名称",
 		dataIndex : 'name',
@@ -257,15 +314,23 @@
 		dataIndex : 'id',
 		hidden :true
 	},{
+        header : "科室编码",
 		id : 'departId',
 		dataIndex : 'departId',
-		hidden :true
+        width : 20,
+		hidden :false
 	},{
 		header : "科室名称",
 		dataIndex : 'name',
 		width : 220,
 		menuDisabled : true
 	},{
+        header : "科室拼音",
+        dataIndex : 'spell',
+        width : 20,
+        hidden :true,
+        menuDisabled : true
+    },{
 		id : 'deleteItem',
 		header:'删除',
 		width : 100,
@@ -285,32 +350,60 @@
 	},{
 		id : 'departId',
 		dataIndex : 'departId',
-		hidden :true
+        header : "科室编码",
+		width : 20,
+		hidden :false
 	},{
 		id : 'sequence',
 		dataIndex : 'sequence',
 		hidden :true
 	},{
+        header : "拼音",
+        id : 'spell',
+        dataIndex : 'spell',
+        hidden :true
+    },{
 		header : "科室名称",
 		dataIndex : 'name',
 		width : 220,
 		menuDisabled : true
-	}]);
+	}, {
+        id : 'deleteItem3',
+		header:'操作',
+		width : 100,
+		renderer: function(v,p,record){
+            var str = "<img src=" + WWWROOT + "'/images/web/tango-icon-go-top.png' onclick=\"gridOperation.operationMove(motionObj.getTop(),'supplyRoom3');\">"
+                + "&nbsp;&nbsp;<img src=" + WWWROOT + "'/images/web/tango-icon-go-up.png' onclick=\"gridOperation.operationMove(motionObj.getUp(),'supplyRoom3');\">"
+                + "&nbsp;&nbsp;<img src=" + WWWROOT + "'/images/web/tango-icon-go-down.png' onclick=\"gridOperation.operationMove(motionObj.getDown(),'supplyRoom3');\">"
+                + "&nbsp;&nbsp;<img src=" + WWWROOT + "'/images/web/tango-icon-go-bottom.png' onclick=\"gridOperation.operationMove(motionObj.getBottom(),'supplyRoom3');\">";
+            return str;
+		},
+		menuDisabled:true,
+		dataIndex:'id'
+        }
+	]);
 	
 	var cm4 = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
 	},{
+        header : "科室编码",
 		id : 'departId',
+        width : 20,
 		dataIndex : 'departId',
-		hidden :true
+		hidden :false
 	},{
 		header : "科室名称",
 		dataIndex : 'name',
 		width : 220,
 		menuDisabled : true
 	},{
+        header : "拼音",
+        id : 'spell',
+        dataIndex : 'spell',
+        hidden :true
+    },{
 		id : 'deleteItem',
 		header:'删除',
 		width : 100,
@@ -1308,7 +1401,10 @@
 					height:document.body.offsetHeight-94,
 					frame : false,
 					viewConfig: {
-			           forceFit:true
+						forceFit:true,
+						getRowClass: function(record, rowIndex){
+							return record.get("isFind") ? "resultList" : "";
+						}
 					},
 					bodyStyle : 'border:1px solid #9cbaef',
 					clicksToEdit : 1,
@@ -1325,6 +1421,7 @@
 						minChars : 0,
 						valueField : 'id',
 						displayField : 'name',
+						listWidth : 300,
 			//			width : 320,
 						store : departJsonStore,
 						forceSelection : true,
@@ -1342,7 +1439,31 @@
 						    var departId =Ext.getCmp('departName2').getValue();
 						    addGridItem(supplyRoom1Store2,name,departId,"departName2");
 						}
-					}]
+					},{
+                        text : '搜索科室名称:'
+                    },{
+                        xtype : 'textfield',
+                        id : 'keyWord2',
+                        anchor : '100%',
+                        allowBlank : true,
+                        listeners : {
+                            specialkey : function(field, ee) {
+                                if (ee.getKey() == Ext.EventObject.ENTER) {
+                                    searchSupplyRoom1Store(supplyRoom1Store2, 'keyWord2', 'queryResult2');
+                                }
+                            }
+                        }
+                    },{
+                        xtype: 'button',
+                        text: '查询',
+                        iconCls: 'icon_search',
+                        handler: function () {
+                            searchSupplyRoom1Store(supplyRoom1Store2, 'keyWord2', 'queryResult2');
+                        }
+                    },'->',{
+                        text : '',
+                        id : 'queryResult2'
+                    }]
 				}) 
     	]
 	});
@@ -1358,7 +1479,10 @@
 				autoScroll:true,
 				frame : false,
 				viewConfig: {
-			        forceFit:true
+			        forceFit:true,
+                    getRowClass: function(record, rowIndex){
+                        return record.get("isFind") ? "resultList" : "";
+                    }
 				},
 				width:document.body.offsetWidth-12,
 				height:document.body.offsetHeight-94,
@@ -1370,23 +1494,26 @@
 				tbar : [{
 					text : '选择科室  :'
 				},{
-							xtype : 'combo',
-							id : 'departName3',
-							name : 'departName3',
-							queryParam : 'spell',
-							minChars : 0,
-							valueField : 'id',
-							displayField : 'name',
-			//				width : 320,
-							store : departJsonStore,
-							forceSelection : true,
-							lazyInit : true,
-							triggerAction : 'all',
-							hideTrigger : true,
-							typeAhead : false,
-							allowBlank : true,
-							anchor : '97%'
-						},{
+					xtype : 'combo',
+					fieldLabel : '申请科室',
+					id : 'departName3',
+					name : 'departName3',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'name',
+					// width : 100,
+					store : departJsonStore,
+					listWidth : 300,
+					// matchFieldWidth: false,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					anchor : '97%'
+				},{
 					text : '添加',
 					iconCls : 'btn_ext_add',
 					handler : function() {
@@ -1445,9 +1572,8 @@
 						    addGridItem(supplyRoom1Store4, name, departId, "");
 						}
 					}
-				},{
-			
-					text : '上移到顶部',
+				}, {
+                        text : '上移到顶部',
 					handler : function() {
 						moveTopGridItem3();
 					}
@@ -1466,7 +1592,31 @@
 					handler : function() {
 						moveBottomGridItem3();
 					}
-				}]
+				},{
+                    text : '搜索科室名称:'
+				},{
+                    xtype : 'textfield',
+					id : 'keyWord3',
+                    anchor : '100%',
+                    allowBlank : true,
+                    listeners : {
+                        specialkey : function(field, ee) {
+                            if (ee.getKey() == Ext.EventObject.ENTER) {
+                                searchSupplyRoom1Store(supplyRoom1Store3, 'keyWord3', 'queryResult3');
+                            }
+                        }
+                    }
+                },{
+					xtype: 'button',
+					text: '查询',
+					iconCls: 'icon_search',
+					handler: function () {
+                        searchSupplyRoom1Store(supplyRoom1Store3, 'keyWord3', 'queryResult3');
+                    }
+                },'->',{
+                    text : '',
+                    id : 'queryResult3'
+                }]
 			})
     	]
 	});
@@ -1482,9 +1632,12 @@
 				autoExpandColumn : 'deleteItem',
 				enableHdMenu : false,
 				frame : false,
-				viewConfig: {
-			        forceFit:true
-				},
+                viewConfig: {
+                    forceFit:true,
+                    getRowClass: function(record, rowIndex){
+                        return record.get("isFind") ? "resultList" : "";
+                    }
+                },
 				width:document.body.offsetWidth-12,
 				height:document.body.offsetHeight-94,
 				bodyStyle : 'border:1px solid #9cbaef',
@@ -1504,13 +1657,15 @@
 					displayField : 'name',
 					store : departJsonStore,
 					forceSelection : true,
+                    listWidth : 300,
 					lazyInit : true,
 					triggerAction : 'all',
 					hideTrigger : true,
 					typeAhead : false,
 					allowBlank : true,
 					anchor : '97%'
 				},{
+
 					text : '添加',
 					iconCls : 'btn_ext_add',
 					handler : function() {
@@ -1520,7 +1675,6 @@
 					}
 				},
 				{
-			
 					text : '删除全部',
 					iconCls : 'btn_ext_application_del',
 					handler : function() {
@@ -1531,6 +1685,30 @@
 							}
 						});
 					}
+				},{
+					text : '搜索科室名称:'
+				},{
+					xtype : 'textfield',
+					id : 'keyWord4',
+					anchor : '100%',
+					allowBlank : true,
+					listeners : {
+						specialkey : function(field, ee) {
+							if (ee.getKey() == Ext.EventObject.ENTER) {
+								searchSupplyRoom1Store(supplyRoom1Store4, 'keyWord4', 'queryResult4');
+							}
+						}
+					}
+				},{
+					xtype: 'button',
+					text: '查询',
+					iconCls: 'icon_search',
+					handler: function () {
+                        searchSupplyRoom1Store(supplyRoom1Store4, 'keyWord4', 'queryResult4');
+					}
+				},'->',{
+                        text : '',
+						id : 'queryResult4'
 				}]
 			})
     	]
@@ -1542,27 +1720,29 @@
     	items:[
 			new Ext.grid.EditorGridPanel({
 				id : 'supplyRoom5',
-				store : new Ext.data.Store({
-					proxy : new Ext.data.HttpProxy({
-						url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=5',
-						method : 'POST'
-					}),
-					reader : rd
-				}),
+				store : supplyRoom1Store5,
 				cm : new Ext.grid.ColumnModel( [ {
 					id : 'id',
 					dataIndex : 'id',
 					hidden :true
 				},{
 					id : 'departId',
 					dataIndex : 'departId',
-					hidden :true
+                    header : '科室编码',
+                    width : 20,
+					hidden :false
 				},{
 					header : "科室名称",
 					dataIndex : 'name',
 					width : 220,
 					menuDisabled : true
 				},{
+                    header : "科室拼音",
+                    dataIndex : 'spell',
+                    width : 30,
+                    hidden :true,
+                    menuDisabled : true
+                },{
 					id : 'deleteItem',
 					header:'删除',
 					width : 100,
@@ -1576,9 +1756,12 @@
 				autoExpandColumn : 'deleteItem',
 				enableHdMenu : false,
 				frame : false,
-				viewConfig: {
-			        forceFit:true
-				},
+                viewConfig: {
+                    forceFit:true,
+                    getRowClass: function(record, rowIndex){
+                        return record.get("isFind") ? "resultList" : "";
+                    }
+                },
 				width:document.body.offsetWidth-12,
 				height:document.body.offsetHeight-94,
 				bodyStyle : 'border:1px solid #9cbaef',
@@ -1596,6 +1779,7 @@
 					minChars : 0,
 					valueField : 'id',
 					displayField : 'name',
+                    listWidth : 300,
 					store : departJsonStore,
 					forceSelection : true,
 					lazyInit : true,
@@ -1624,6 +1808,30 @@
 							}
 						});
 					}
+				},{
+					text : '搜索科室名称:'
+				},{
+					xtype : 'textfield',
+					id : 'keyWord5',
+					anchor : '100%',
+					allowBlank : true,
+					listeners : {
+						specialkey : function(field, ee) {
+							if (ee.getKey() == Ext.EventObject.ENTER) {
+								searchSupplyRoom1Store(supplyRoom1Store5, 'keyWord5', 'queryResult5');
+							}
+						}
+					}
+				},{
+					xtype: 'button',
+					text: '查询',
+					iconCls: 'icon_search',
+					handler: function () {
+						searchSupplyRoom1Store(supplyRoom1Store5, 'keyWord5', 'queryResult5');
+					}
+				},'->',{
+					text : '',
+					id : 'queryResult5'
 				}]
 			})
     	]