Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r20408 -r20616
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 20408)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 20616)
@@ -83,7 +83,7 @@
 	//设置打开表单的对象
     setOpenFormObj(tousseType, form, tousseGroups);
 	if (!isUndefinedOrNullOrEmpty(form)){
-		comboApplication(0,false,false,true,form, tousseGroups, false, '',false);
+		comboApplication(0,'',false,false,true,form, tousseGroups, false, '',false);
 	}
 }
 
@@ -1673,10 +1673,10 @@
 				|| type == tousseApplicationForm
 				|| type == diposableGoodsApplicationForm
 				|| type == disinfectGoodsApplicationForm){
-			comboApplication(recyclingApplication.id,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding,isInterveneAmount);
+			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, '', recyclingApplication.committedStatus,recyclingApplication.handleDepartCoding,isInterveneAmount);
 		}
 		
-		//设置“申请单id”、“流水号”、“发货状态”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“项目”11个属性
+		//设置“申请单id”、“流水号”、“发货状态”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“仓库编码”、“项目”12个属性
 		top.Ext4.getCmp("id").setValue(recyclingApplication.id);
 		top.Ext4.getCmp("serialNumber").setValue(recyclingApplication.serialNumber);
 		top.Ext4.getCmp("deliverStatus").setValue(deliverStatus);
@@ -1716,6 +1716,8 @@
 			}
 		}
 		
+		top.Ext4.getCmp('storeCode').setValue(recyclingApplication.storeCode);
+		
 		if(recyclingApplication.editable == 'false' || isInterveneAmount){  //不可编辑
 			departComp.setReadOnly(true);
 			top.Ext4.getCmp("settleAccountsDepart").setReadOnly(true);