Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r19486 -r19487
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 19486)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 19487)
@@ -1,8 +1,9 @@
-var supplyRoom1Store;
-var supplyRoom1Store2;
-var supplyRoom1Store3;
-var supplyRoom1Store5;
-var supplyRoom1Store6;
+var supplyRoomStoreFirstSupplyRoom;
+var supplyRoomStoreSecondSupplyRoom;
+var supplyRoomStoreApply;
+var supplyRoomStoreSettleAccount;
+var supplyRoomStoreUseRecordToApplicationNotInvoice;
+var supplyRoomStoreTousseOperation;
 var sterilingTypeStore;
 var packageTypeStore;
 var configWinHeight = top.screen.height > 1000 ? 700 : 600;
@@ -14,23 +15,23 @@
 
 /**
  * 科室申领配置，结算科室配置查询对应的科室
- * @param supplyRoom1Store 对应的数据源
+ * @param supplyRoomStore 对应的数据源
  * @param keyWordId 搜索的关键字
  * @param queryResultId 显示结果节点的id
  */
-function searchSupplyRoom1Store(supplyRoom1Store, keyWordId, queryResultId) {
+function searchSupplyRoomStore(supplyRoomStore, keyWordId, queryResultId) {
     var keyWord = Ext.getCmp(keyWordId).getValue();
     var count = 0;
 	//先清除高亮标记
-    supplyRoom1Store.each(function (item) {
+    supplyRoomStore.each(function (item) {
         item.set('isFind', false);
     });
     //如果关键搜索为空,则不进行搜索
     if (Ext.isEmpty(keyWord)){
         setQueryResultTips(queryResultId, '');
         return;
     }
-    supplyRoom1Store.findBy(function (item) {
+    supplyRoomStore.findBy(function (item) {
         var reg = new RegExp(keyWord, 'i');
         if (item.get('name').search(reg) != -1 || item.get('spell').search(reg) != -1){
             //如果找到该记录,设计高亮标记
@@ -51,8 +52,8 @@
     queryResult.setText(tips);
 }
 
-function removeGridItem(supplyRoom1){
-	var obj = Ext.getCmp(supplyRoom1);
+function removeGridItem(supplyRoom){
+	var obj = Ext.getCmp(supplyRoom);
 	var rows = obj.getSelectionModel().getSelections();// 返回值为
 	var store = obj.getStore();
 	if (rows) {
@@ -81,56 +82,56 @@
 }
 
 function moveTopGridItem3() {
-	var rows = Ext.getCmp('supplyRoom3').getSelectionModel().getSelections();// 返回值为所点击的行
+	var rows = Ext.getCmp('supplyRoomApply').getSelectionModel().getSelections();// 返回值为所点击的行
 	if (rows) {
 		for ( var i = 0; i < rows.length; i++) {
-			var index = supplyRoom1Store3.indexOf(rows[i]);
+			var index = supplyRoomStoreApply.indexOf(rows[i]);
 			if (index != 0) {
-				supplyRoom1Store3.remove(rows[i]);
-				supplyRoom1Store3.insert(0, rows[i]);
+				supplyRoomStoreApply.remove(rows[i]);
+				supplyRoomStoreApply.insert(0, rows[i]);
 			}
 		}
 	}
 }
 
 function moveUpGridItem3() {
-	var rows = Ext.getCmp('supplyRoom3').getSelectionModel().getSelections();// 返回值为所点击的行
+	var rows = Ext.getCmp('supplyRoomApply').getSelectionModel().getSelections();// 返回值为所点击的行
 	if (rows) {
 		for ( var i = 0; i < rows.length; i++) {
-			var index = supplyRoom1Store3.indexOf(rows[i]);
+			var index = supplyRoomStoreApply.indexOf(rows[i]);
 			if (index != 0) {
-				var nextRecord = supplyRoom1Store3.getAt(index - 1);
-				supplyRoom1Store3.remove(rows[i]);
-				supplyRoom1Store3.insert(index - 1, rows[i]);
+				var nextRecord = supplyRoomStoreApply.getAt(index - 1);
+				supplyRoomStoreApply.remove(rows[i]);
+				supplyRoomStoreApply.insert(index - 1, rows[i]);
 			}
 		}
 	}
 }
 
 function moveDownGridItem3() {
-	var rows = Ext.getCmp('supplyRoom3').getSelectionModel().getSelections();// 返回值为所点击的行
+	var rows = Ext.getCmp('supplyRoomApply').getSelectionModel().getSelections();// 返回值为所点击的行
 	if (rows) {
 		for ( var i = 0; i < rows.length; i++) {
-			var index = supplyRoom1Store3.indexOf(rows[i]);
-			var total = supplyRoom1Store3.getCount();
+			var index = supplyRoomStoreApply.indexOf(rows[i]);
+			var total = supplyRoomStoreApply.getCount();
 			if (index != total - 1) {
-				var nextRecord = supplyRoom1Store3.getAt(index + 1);
-				supplyRoom1Store3.remove(rows[i]);
-				supplyRoom1Store3.insert(index + 1, rows[i]);
+				var nextRecord = supplyRoomStoreApply.getAt(index + 1);
+				supplyRoomStoreApply.remove(rows[i]);
+				supplyRoomStoreApply.insert(index + 1, rows[i]);
 			}
 		}
 	}
 }
 
 function moveBottomGridItem3() {
-	var rows = Ext.getCmp('supplyRoom3').getSelectionModel().getSelections();// 返回值为所点击的行
+	var rows = Ext.getCmp('supplyRoomApply').getSelectionModel().getSelections();// 返回值为所点击的行
 	if (rows) {
 		for ( var i = 0; i < rows.length; i++) {
-			var index = supplyRoom1Store3.indexOf(rows[i]);
-			var total = supplyRoom1Store3.getCount();
+			var index = supplyRoomStoreApply.indexOf(rows[i]);
+			var total = supplyRoomStoreApply.getCount();
 			if (index != total - 1) {
-				supplyRoom1Store3.remove(rows[i]);
-				supplyRoom1Store3.insert(total - 1, rows[i]);
+				supplyRoomStoreApply.remove(rows[i]);
+				supplyRoomStoreApply.insert(total - 1, rows[i]);
 			}
 		}
 	}
@@ -237,7 +238,7 @@
 		]
 	});
 	
-	supplyRoom1Store = new Ext.data.Store({
+	supplyRoomStoreFirstSupplyRoom = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
 			method : 'POST'
@@ -246,7 +247,7 @@
 		reader : rd
 	});
 	
-	supplyRoom1Store2 = new Ext.data.Store({
+	supplyRoomStoreSecondSupplyRoom = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
 			method : 'POST'
@@ -256,7 +257,7 @@
 	});
 	
 	//申领科室
-	supplyRoom1Store3 = new Ext.data.Store({
+	supplyRoomStoreApply = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=3',
 			method : 'POST'
@@ -265,7 +266,7 @@
 	});
 	
 	//结算科室
-	supplyRoom1Store4 = new Ext.data.Store({
+	supplyRoomStoreSettleAccount = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=4',
 			method : 'POST'
@@ -274,23 +275,23 @@
 	});
 
 	//使用记录转申请单不发货科室配置
-    supplyRoom1Store5 = new Ext.data.Store({
+    supplyRoomStoreUseRecordToApplicationNotInvoice = new Ext.data.Store({
         proxy : new Ext.data.HttpProxy({
             url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=5',
             method : 'POST'
         }),
         reader : rd
     });
     // 器械位置流转科室
-	supplyRoom1Store6 = new Ext.data.Store({
+	supplyRoomStoreTousseOperation = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfig.do?type=6',
 			method : 'POST'
 		}),
 		reader : rd
 	});
 	//一级供应室配置的表格列头
-	var cm = new Ext.grid.ColumnModel( [ {
+	var cmFirstSupplyRoom = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
@@ -310,15 +311,15 @@
 		header:'操作',
 		width : 100,
 		renderer: function(v,p,record){
-			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" title=\"删除\" onclick=\"removeGridItem('supplyRoom1') \">";
+			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" title=\"删除\" onclick=\"removeGridItem('supplyRoomFirstSupplyRoom') \">";
 			str += "&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/web/arrow_next.png\" title=\"服务全部临床科室\" onclick=\"addServiceAllClinicOrgUnit('"+record.data["departId"]+"','"+record.data["name"]+"') \">";
 			return str;
 		},
 		menuDisabled:true,
 		dataIndex:'id'
 	} ]);
 	
-	var cm2 = new Ext.grid.ColumnModel( [ {
+	var cmSecondSupplyRoom = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
@@ -344,15 +345,15 @@
 		header:'删除',
 		width : 100,
 		renderer: function(v,p,record){
-			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoom2') \">";
+			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoomSecondSupplyRoom') \">";
 			str += "&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/web/arrow_next.png\" title=\"服务全部临床科室\" onclick=\"addServiceAllClinicOrgUnit('"+record.data["departId"]+"','"+record.data["name"]+"') \">";
 			return str;
 		},
 		menuDisabled : true,
 		dataIndex:'id'
 	} ]);
 	
-	var cm3 = new Ext.grid.ColumnModel( [ {
+	var cmApply = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
@@ -381,18 +382,18 @@
 		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');\">";
+            var str = "<img src=\"" + WWWROOT + "/images/web/tango-icon-go-top.png\" onclick=\"gridOperation.operationMove(motionObj.getTop(),'supplyRoomApply');\">"
+                + "&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/web/tango-icon-go-up.png\" onclick=\"gridOperation.operationMove(motionObj.getUp(),'supplyRoomApply');\">"
+                + "&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/web/tango-icon-go-down.png\" onclick=\"gridOperation.operationMove(motionObj.getDown(),'supplyRoomApply');\">"
+                + "&nbsp;&nbsp;<img src=\"" + WWWROOT + "/images/web/tango-icon-go-bottom.png\" onclick=\"gridOperation.operationMove(motionObj.getBottom(),'supplyRoomApply');\">";
             return str;
 		},
 		menuDisabled:true,
 		dataIndex:'id'
         }
 	]);
 	
-	var cm4 = new Ext.grid.ColumnModel( [ {
+	var cmSettleAccount = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
@@ -417,14 +418,14 @@
 		header:'删除',
 		width : 100,
 		renderer: function(v,p,record){
-			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoom4') \">";
+			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoomSettleAccount') \">";
 			return str;
 		},
 		menuDisabled : true,
 		dataIndex:'id'
 	} ]);
 	
-	var cm6 = new Ext.grid.ColumnModel( [ {
+	var cmTousseOperation = new Ext.grid.ColumnModel( [ {
 		id : 'id',
 		dataIndex : 'id',
 		hidden :true
@@ -449,7 +450,7 @@
 		header:'删除',
 		width : 100,
 		renderer: function(v,p,record){
-			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoom6') \">";
+			var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoomTousseOperation') \">";
 			return str;
 		},
 		menuDisabled : true,
@@ -461,18 +462,18 @@
 		return buildJSONStringFromStore(store);
 	}
 	function getGridData() {
-		$Id('supplyRoom_type_first_supplyRoom').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoom1Store);
+		$Id('supplyRoom_type_first_supplyRoom').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreFirstSupplyRoom);
 		// 二级供应室
-		$Id('supplyRoom_type_second_supplyRoom').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoom1Store2);
+		$Id('supplyRoom_type_second_supplyRoom').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreSecondSupplyRoom);
 		// 科室申领配置
-		$Id('supplyRoom_type_apply').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoom1Store3);
+		$Id('supplyRoom_type_apply').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreApply);
 		// 结算科室配置
-		$Id('supplyRoom_type_settleAccount').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoom1Store4);
+		$Id('supplyRoom_type_settleAccount').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreSettleAccount);
 		
-		var supplyRoomStore5 = Ext.getCmp("supplyRoom5").getStore();
-		$Id('supplyRoom_type_userecord_to_application_not_invoice').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStore5);
+		var supplyRoomStoreUseRecordToApplicationNotInvoice = Ext.getCmp("supplyRoomUseRecordToApplicationNotInvoice").getStore();
+		$Id('supplyRoom_type_userecord_to_application_not_invoice').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreUseRecordToApplicationNotInvoice);
 		// 器械位置流转科室
-		$Id('supplyRoom_type_tousse_operation').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoom1Store6);
+		$Id('supplyRoom_type_tousse_operation').value = setRecordSequenceAndGetSupplyRoomItemsStr(supplyRoomStoreTousseOperation);
 	}
 	
 	var taskGroupJsonStore = new Ext.data.SimpleStore({
@@ -1399,9 +1400,9 @@
     	layout:'fit',
     	items:[
     		 new Ext.grid.EditorGridPanel({
-					id : 'supplyRoom1',
-					store : supplyRoom1Store,
-					cm : cm,
+					id : 'supplyRoomFirstSupplyRoom',
+					store : supplyRoomStoreFirstSupplyRoom,
+					cm : cmFirstSupplyRoom,
 					width:document.body.offsetWidth-20,
 					height:document.body.offsetHeight-94,
 					frame : false,
@@ -1417,8 +1418,8 @@
 						text : '选择科室  :'
 					},{
 						xtype : 'combo',
-						id : 'departName1',
-						name : 'departName1',
+						id : 'departNameFirstSupplyRoom',
+						name : 'departNameFirstSupplyRoom',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'id',
@@ -1436,9 +1437,9 @@
 						text : '添加',
 						iconCls : 'btn_ext_add',
 						handler : function() {
-						    var name =Ext.getCmp('departName1').getRawValue(); 
-						    var departId =Ext.getCmp('departName1').getValue();
-						    addGridItem(supplyRoom1Store,name,departId,"departName1");
+						    var name =Ext.getCmp('departNameFirstSupplyRoom').getRawValue(); 
+						    var departId =Ext.getCmp('departNameFirstSupplyRoom').getValue();
+						    addGridItem(supplyRoomStoreFirstSupplyRoom,name,departId,"departNameFirstSupplyRoom");
 						}
 					}]
 				})
@@ -1450,9 +1451,9 @@
     	layout:'fit',
     	items:[
 			new Ext.grid.EditorGridPanel({
-					id : 'supplyRoom2',
-					store : supplyRoom1Store2,
-					cm : cm2,
+					id : 'supplyRoomSecondSupplyRoom',
+					store : supplyRoomStoreSecondSupplyRoom,
+					cm : cmSecondSupplyRoom,
 					autoExpandColumn : 'deleteItem',
 					enableHdMenu : false,
 					width:document.body.offsetWidth-12,
@@ -1473,8 +1474,8 @@
 						text : '选择科室  :'
 					},{
 						xtype : 'combo',
-						id : 'departName2',
-						name : 'departName2',
+						id : 'departNameSecondSupplyRoom',
+						name : 'departNameSecondSupplyRoom',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'id',
@@ -1493,21 +1494,21 @@
 						text : '添加',
 						iconCls : 'btn_ext_add',
 						handler : function() {
-						    var name =Ext.getCmp('departName2').getRawValue(); 
-						    var departId =Ext.getCmp('departName2').getValue();
-						    addGridItem(supplyRoom1Store2,name,departId,"departName2");
+						    var name =Ext.getCmp('departNameSecondSupplyRoom').getRawValue(); 
+						    var departId =Ext.getCmp('departNameSecondSupplyRoom').getValue();
+						    addGridItem(supplyRoomStoreSecondSupplyRoom,name,departId,"departNameSecondSupplyRoom");
 						}
 					},{
                         text : '搜索科室名称:'
                     },{
                         xtype : 'textfield',
-                        id : 'keyWord2',
+                        id : 'keyWordSecondSupplyRoom',
                         anchor : '100%',
                         allowBlank : true,
                         listeners : {
                             specialkey : function(field, ee) {
                                 if (ee.getKey() == Ext.EventObject.ENTER) {
-                                    searchSupplyRoom1Store(supplyRoom1Store2, 'keyWord2', 'queryResult2');
+                                    searchSupplyRoomStore(supplyRoomStoreSecondSupplyRoom, 'keyWordSecondSupplyRoom', 'queryResultSecondSupplyRoom');
                                 }
                             }
                         }
@@ -1516,11 +1517,11 @@
                         text: '查询',
                         iconCls: 'icon_search',
                         handler: function () {
-                            searchSupplyRoom1Store(supplyRoom1Store2, 'keyWord2', 'queryResult2');
+                            searchSupplyRoomStore(supplyRoomStoreSecondSupplyRoom, 'keyWordSecondSupplyRoom', 'queryResultSecondSupplyRoom');
                         }
                     },'->',{
                         text : '',
-                        id : 'queryResult2'
+                        id : 'queryResultSecondSupplyRoom'
                     }]
 				}) 
     	]
@@ -1531,9 +1532,9 @@
     	layout:'fit',
     	items:[
 			new Ext.grid.EditorGridPanel({
-				id : 'supplyRoom3',
-				store : supplyRoom1Store3,
-				cm : cm3,
+				id : 'supplyRoomApply',
+				store : supplyRoomStoreApply,
+				cm : cmApply,
 				autoScroll:true,
 				frame : false,
 				viewConfig: {
@@ -1554,8 +1555,8 @@
 				},{
 					xtype : 'combo',
 					fieldLabel : '申请科室',
-					id : 'departName3',
-					name : 'departName3',
+					id : 'departNameApply',
+					name : 'departNameApply',
 					queryParam : 'spell',
 					minChars : 0,
 					valueField : 'id',
@@ -1575,9 +1576,9 @@
 					text : '添加',
 					iconCls : 'btn_ext_add',
 					handler : function() {
-					    var name =Ext.getCmp('departName3').getRawValue(); 
-					    var departId =Ext.getCmp('departName3').getValue();
-					    addGridItem(supplyRoom1Store3,name,departId,"departName3");
+					    var name =Ext.getCmp('departNameApply').getRawValue(); 
+					    var departId =Ext.getCmp('departNameApply').getValue();
+					    addGridItem(supplyRoomStoreApply,name,departId,"departNameApply");
 					}
 				},{
 					text : '添加全部',
@@ -1591,7 +1592,7 @@
 								for(var index = 0;index < lenth;index++){
 									var name = result.data[index].name; 
 								    var departId = result.data[index].id;
-								    addGridItem(supplyRoom1Store3,name,departId,"");
+								    addGridItem(supplyRoomStoreApply,name,departId,"");
 								}
 							},
 							failure : function(response, options) {
@@ -1604,7 +1605,7 @@
 					iconCls : 'btn_ext_application_del',
 					handler : function() {
 						
-						removeGridItem('supplyRoom3');
+						removeGridItem('supplyRoomApply');
 					}
 				},{
 			
@@ -1614,20 +1615,20 @@
 						
 						top.Ext.MessageBox.confirm("请确认","确定要删除所有申领科室吗？",function(btn){
 							if(btn == "yes"){
-								supplyRoom1Store3.removeAll();
+								supplyRoomStoreApply.removeAll();
 							}
 						});
 					}
 				},{
 					text : '复制到结算科室',
 					iconCls : 'icon_systemset',
 					handler : function() {
-						var count = supplyRoom1Store3.getCount();
+						var count = supplyRoomStoreApply.getCount();
 						for(var i = 0;i < count;i++){
-							var record = supplyRoom1Store3.getAt(i);
+							var record = supplyRoomStoreApply.getAt(i);
 							var name = record.data['name']; 
 						    var departId = record.data['departId'];
-						    addGridItem(supplyRoom1Store4, name, departId, "");
+						    addGridItem(supplyRoomStoreSettleAccount, name, departId, "");
 						}
 					}
 				},
@@ -1656,13 +1657,13 @@
                     text : '搜索科室名称:'
 				},{
                     xtype : 'textfield',
-					id : 'keyWord3',
+					id : 'keyWordApply',
                     anchor : '100%',
                     allowBlank : true,
                     listeners : {
                         specialkey : function(field, ee) {
                             if (ee.getKey() == Ext.EventObject.ENTER) {
-                                searchSupplyRoom1Store(supplyRoom1Store3, 'keyWord3', 'queryResult3');
+                                searchSupplyRoomStore(supplyRoomStoreApply, 'keyWordApply', 'queryResultApply');
                             }
                         }
                     }
@@ -1671,11 +1672,11 @@
 					text: '查询',
 					iconCls: 'icon_search',
 					handler: function () {
-                        searchSupplyRoom1Store(supplyRoom1Store3, 'keyWord3', 'queryResult3');
+                        searchSupplyRoomStore(supplyRoomStoreApply, 'keyWordApply', 'queryResultApply');
                     }
                 },'->',{
                     text : '',
-                    id : 'queryResult3'
+                    id : 'queryResultApply'
                 }]
 			})
     	]
@@ -1686,9 +1687,9 @@
     	layout:'fit',
     	items:[
 			new Ext.grid.EditorGridPanel({
-				id : 'supplyRoom4',
-				store : supplyRoom1Store4,
-				cm : cm4,
+				id : 'supplyRoomSettleAccount',
+				store : supplyRoomStoreSettleAccount,
+				cm : cmSettleAccount,
 				autoExpandColumn : 'deleteItem',
 				enableHdMenu : false,
 				frame : false,
@@ -1709,8 +1710,8 @@
 					text : '选择科室  :'
 				},{
 					xtype : 'combo',
-					id : 'departName4',
-					name : 'departName4',
+					id : 'departNameSettleAccount',
+					name : 'departNameSettleAccount',
 					queryParam : 'spell',
 					minChars : 0,
 					valueField : 'id',
@@ -1725,13 +1726,12 @@
 					allowBlank : true,
 					anchor : '97%'
 				},{
-
 					text : '添加',
 					iconCls : 'btn_ext_add',
 					handler : function() {
-					    var name =Ext.getCmp('departName4').getRawValue(); 
-					    var departId =Ext.getCmp('departName4').getValue();
-					    addGridItem(supplyRoom1Store4,name,departId,"departName4");
+					    var name =Ext.getCmp('departNameSettleAccount').getRawValue(); 
+					    var departId =Ext.getCmp('departNameSettleAccount').getValue();
+					    addGridItem(supplyRoomStoreSettleAccount,name,departId,"departNameSettleAccount");
 					}
 				},
 				{
@@ -1741,21 +1741,21 @@
 						
 						top.Ext.MessageBox.confirm("请确认","确定要删除所有结算科室吗？",function(btn){
 							if(btn == "yes"){
-								supplyRoom1Store4.removeAll();
+								supplyRoomStoreSettleAccount.removeAll();
 							}
 						});
 					}
 				},{
 					text : '搜索科室名称:'
 				},{
 					xtype : 'textfield',
-					id : 'keyWord4',
+					id : 'keyWordSettleAccount',
 					anchor : '100%',
 					allowBlank : true,
 					listeners : {
 						specialkey : function(field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
-								searchSupplyRoom1Store(supplyRoom1Store4, 'keyWord4', 'queryResult4');
+								searchSupplyRoomStore(supplyRoomStoreSettleAccount, 'keyWordSettleAccount', 'queryResultSettleAccount');
 							}
 						}
 					}
@@ -1764,11 +1764,11 @@
 					text: '查询',
 					iconCls: 'icon_search',
 					handler: function () {
-                        searchSupplyRoom1Store(supplyRoom1Store4, 'keyWord4', 'queryResult4');
+                        searchSupplyRoomStore(supplyRoomStoreSettleAccount, 'keyWordSettleAccount', 'queryResultSettleAccount');
 					}
 				},'->',{
                         text : '',
-						id : 'queryResult4'
+						id : 'queryResultSettleAccount'
 				}]
 			})
     	]
@@ -1779,8 +1779,8 @@
     	layout:'fit',
     	items:[
 			new Ext.grid.EditorGridPanel({
-				id : 'supplyRoom5',
-				store : supplyRoom1Store5,
+				id : 'supplyRoomUseRecordToApplicationNotInvoice',
+				store : supplyRoomStoreUseRecordToApplicationNotInvoice,
 				cm : new Ext.grid.ColumnModel( [ {
 					id : 'id',
 					dataIndex : 'id',
@@ -1807,7 +1807,7 @@
 					header:'删除',
 					width : 100,
 					renderer: function(v,p,record){
-						var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoom5') \">";
+						var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"removeGridItem('supplyRoomUseRecordToApplicationNotInvoice') \">";
 						return str;
 					},
 					menuDisabled : true,
@@ -1833,8 +1833,8 @@
 					text : '选择科室  :'
 				},{
 					xtype : 'combo',
-					id : 'departName5',
-					name : 'departName5',
+					id : 'departNameUseRecordToApplicationNotInvoice',
+					name : 'departNameUseRecordToApplicationNotInvoice',
 					queryParam : 'spell',
 					minChars : 0,
 					valueField : 'id',
@@ -1852,9 +1852,9 @@
 					text : '添加',
 					iconCls : 'btn_ext_add',
 					handler : function() {
-					    var name =Ext.getCmp('departName5').getRawValue(); 
-					    var departId =Ext.getCmp('departName5').getValue();
-					    addGridItem(Ext.getCmp("supplyRoom5").getStore(),name,departId,"departName5");
+					    var name =Ext.getCmp('departNameUseRecordToApplicationNotInvoice').getRawValue(); 
+					    var departId =Ext.getCmp('departNameUseRecordToApplicationNotInvoice').getValue();
+					    addGridItem(Ext.getCmp("supplyRoomUseRecordToApplicationNotInvoice").getStore(),name,departId,"departNameUseRecordToApplicationNotInvoice");
 					}
 				},
 				{
@@ -1864,21 +1864,21 @@
 					handler : function() {
 						top.Ext.MessageBox.confirm("请确认","确定要删除所有科室吗？",function(btn){
 							if(btn == "yes"){
-								Ext.getCmp("supplyRoom5").getStore().removeAll();
+								Ext.getCmp("supplyRoomUseRecordToApplicationNotInvoice").getStore().removeAll();
 							}
 						});
 					}
 				},{
 					text : '搜索科室名称:'
 				},{
 					xtype : 'textfield',
-					id : 'keyWord5',
+					id : 'keyWordUseRecordToApplicationNotInvoice',
 					anchor : '100%',
 					allowBlank : true,
 					listeners : {
 						specialkey : function(field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
-								searchSupplyRoom1Store(supplyRoom1Store5, 'keyWord5', 'queryResult5');
+								searchSupplyRoomStore(supplyRoomStoreUseRecordToApplicationNotInvoice, 'keyWordUseRecordToApplicationNotInvoice', 'queryResultUseRecordToApplicationNotInvoice');
 							}
 						}
 					}
@@ -1887,11 +1887,11 @@
 					text: '查询',
 					iconCls: 'icon_search',
 					handler: function () {
-						searchSupplyRoom1Store(supplyRoom1Store5, 'keyWord5', 'queryResult5');
+						searchSupplyRoomStore(supplyRoomStoreUseRecordToApplicationNotInvoice, 'keyWordUseRecordToApplicationNotInvoice', 'queryResultUseRecordToApplicationNotInvoice');
 					}
 				},'->',{
 					text : '',
-					id : 'queryResult5'
+					id : 'queryResultUseRecordToApplicationNotInvoice'
 				}]
 			})
     	]
@@ -1902,9 +1902,9 @@
     	layout:'fit',
     	items:[
 			new Ext.grid.EditorGridPanel({
-				id : 'supplyRoom6',
-				store : supplyRoom1Store6,
-				cm : cm6,
+				id : 'supplyRoomTousseOperation',
+				store : supplyRoomStoreTousseOperation,
+				cm : cmTousseOperation,
 				autoExpandColumn : 'deleteItem',
 				enableHdMenu : false,
 				frame : false,
@@ -1925,8 +1925,8 @@
 					text : '选择科室  :'
 				},{
 					xtype : 'combo',
-					id : 'departName6',
-					name : 'departName6',
+					id : 'departNameTousseOperation',
+					name : 'departNameTousseOperation',
 					queryParam : 'spell',
 					minChars : 0,
 					valueField : 'id',
@@ -1945,9 +1945,9 @@
 					text : '添加',
 					iconCls : 'btn_ext_add',
 					handler : function() {
-					    var name =Ext.getCmp('departName6').getRawValue(); 
-					    var departId =Ext.getCmp('departName6').getValue();
-					    addGridItem(supplyRoom1Store6,name,departId,"departName6");
+					    var name =Ext.getCmp('departNameTousseOperation').getRawValue();
+					    var departId =Ext.getCmp('departNameTousseOperation').getValue();
+					    addGridItem(supplyRoomStoreTousseOperation,name,departId,"departNameTousseOperation");
 					}
 				},
 				{
@@ -1957,21 +1957,21 @@
 						
 						top.Ext.MessageBox.confirm("请确认","确定要删除所有结算科室吗？",function(btn){
 							if(btn == "yes"){
-								supplyRoom1Store6.removeAll();
+								supplyRoomStoreTousseOperation.removeAll();
 							}
 						});
 					}
 				},{
 					text : '搜索科室名称:'
 				},{
 					xtype : 'textfield',
-					id : 'keyWord6',
+					id : 'keyWordTousseOperation',
 					anchor : '100%',
 					allowBlank : true,
 					listeners : {
 						specialkey : function(field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
-								searchSupplyRoom1Store(supplyRoom1Store6, 'keyWord6', 'queryResult6');
+								searchSupplyRoomStore(supplyRoomStoreTousseOperation, 'keyWordTousseOperation', 'queryResultTousseOperation');
 							}
 						}
 					}
@@ -1980,11 +1980,11 @@
 					text: '查询',
 					iconCls: 'icon_search',
 					handler: function () {
-                        searchSupplyRoom1Store(supplyRoom1Store6, 'keyWord6', 'queryResult6');
+                        searchSupplyRoomStore(supplyRoomStoreTousseOperation, 'keyWordTousseOperation', 'queryResultTousseOperation');
 					}
 				},'->',{
                         text : '',
-						id : 'queryResult6'
+						id : 'queryResultTousseOperation'
 				}]
 			})
     	]
@@ -2220,8 +2220,8 @@
 	                    	var result = Ext.decode(response.responseText);
 	                    	myMask.hide();
 	                    	if(result.success){
-	                    		supplyRoom1Store.reload();
-	        		  			supplyRoom1Store2.reload();
+	                    		supplyRoomStoreFirstSupplyRoom.reload();
+	        		  			supplyRoomStoreSecondSupplyRoom.reload();
 	        					showResult('保存成功');
 	                    	}else{
 	                    		showResult(result.message);
@@ -2417,39 +2417,39 @@
 	
 	var count = 0;
 	
-  	supplyRoom1Store.load({  
+  	supplyRoomStoreFirstSupplyRoom.load({  
   	    callback: function(records, options, success){  
   	    	count++;
   			hideMask(count,myMask);
   	    }  
   	});
-	supplyRoom1Store2.load({  
+	supplyRoomStoreSecondSupplyRoom.load({  
   	    callback: function(records, options, success){  
   	    	count++;
   			hideMask(count,myMask);
   	    }  
   	});
-	supplyRoom1Store3.load({  
+	supplyRoomStoreApply.load({  
   	    callback: function(records, options, success){  
   	    	count++;
   			hideMask(count,myMask);
   	    }  
   	});
-	supplyRoom1Store4.load({  
+	supplyRoomStoreSettleAccount.load({  
   	    callback: function(records, options, success){  
   	    	count++;
   			hideMask(count,myMask);
   	    }  
   	});
 	
-	var supplyRoomStore5 = Ext.getCmp("supplyRoom5").getStore();
-	supplyRoomStore5.load({  
+	var supplyRoomStoreUseRecordToApplicationNotInvoice = Ext.getCmp("supplyRoomUseRecordToApplicationNotInvoice").getStore();
+	supplyRoomStoreUseRecordToApplicationNotInvoice.load({  
   	    callback: function(records, options, success){  
   	    	count++;
   			hideMask(count,myMask);
   	    }  
   	});
-	supplyRoom1Store6.load({  
+	supplyRoomStoreTousseOperation.load({  
   	    callback: function(records, options, success){  
   	    	count++;
   			hideMask(count,myMask);