Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r21838 -r21844
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21838)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21844)
@@ -81,7 +81,7 @@
 		//2、设置“提交并新建”按钮重新打开表单的参数对象
 	    setOpenFormObj(form, tousseGroups, specifyDisposableTypes);
 	
-		comboApplication(0,$Id('departCoding').value,false,false,true,form, tousseGroups, specifyDisposableTypes, false, '', null);
+		comboApplication(0,dirOrgCode,currentOrgUnitName,false,false,true,form, tousseGroups, specifyDisposableTypes, false, '', null);
 	}
 }
 
@@ -282,8 +282,7 @@
 
 //Ext4 结算科室Store
 var departJsonStore = new Ext4.data.JsonStore({
-	// pageSize : 15,
-	autoLoad : false,
+	autoLoad : true,
 	proxy : {
 		type : 'ajax',
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
@@ -298,24 +297,7 @@
 	    {name : 'name',mapping : 'name'}
 	  ]
 });
-departJsonStore.reload();
 
-//Ext4 项目store
-var projectStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!getAllProject.do',
-		reader : {
-			type : 'json',
-			root : 'data'
-		}
-	},
-	fields : [
-	    {name : 'projCode',mapping : 'projCode'},
-	    {name : 'projName',mapping : 'projName'}
-	  ]
-});
-
 //申请科室Store
 var appDepartJsonStoreExt2 = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -336,7 +318,7 @@
 var appDepartJsonStore = new Ext4.data.Store({
 	//limit参数，每页显示条数，默认为25
 	pageSize: isIE6OrIE7 ? 15 : 50,
-	autoLoad:false,
+	autoLoad: true,
 	proxy : {
 		type : 'ajax',
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
@@ -351,7 +333,6 @@
 	    {name : 'name',mapping : 'name'}
 	  ]
 });
-appDepartJsonStore.reload();
 
 var invoicePlanForTousseType_Tousse = "器械包";
 var invoicePlanForTousseType_Diposable = "一次性物品";
@@ -1683,7 +1664,7 @@
 				|| type == tousseApplicationForm
 				|| type == diposableGoodsApplicationForm
 				|| type == disinfectGoodsApplicationForm){
-			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,hiddenCommitButton,hiddenSaveButton,
+			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,recyclingApplication.depart,hiddenCommitButton,hiddenSaveButton,
 					hiddenReturnButton,type, '', specifyDisposableTypes,recyclingApplication.committedStatus,
 					recyclingApplication.handleDepartCoding,recyclingApplication);
 		}