Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r32215 -r32227
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 32215)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 32227)
@@ -2518,6 +2518,17 @@
 		} else {
 			top.Ext4.getCmp('package1').focus('', 10);
 		}
+
+		//GGSRMYY-147
+		if(!SSTS_UpdateAppDepartAndSettleAccountsDepart){
+			top.Ext4.getCmp('depart').setReadOnly(true);
+			top.Ext4.getCmp('settleAccountsDepart').setReadOnly(true);
+		
+			top.Ext4.getCmp('depart').setValue($Id('depart').value);
+			top.Ext4.getCmp('settleAccountsDepart').setValue($Id('depart').value);
+			top.Ext4.getCmp('departCoding').setValue($Id('departCoding').value);
+			top.Ext4.getCmp('settleAccountsDepartCoding').setValue($Id('departCoding').value);
+		}
 	} else if (recyclingApplication) {
 		$('#hiddenRecyclingApplicantID').val(id);
 		//设置“申请单id”、“流水号”、“发货状态”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“仓库编码”、“项目”12个属性
@@ -2607,17 +2618,6 @@
 		loadProduction({}, false , recyclingApplication);
 	}
 
-	//GGSRMYY-147
-	if(!SSTS_UpdateAppDepartAndSettleAccountsDepart){
-		top.Ext4.getCmp('depart').setReadOnly(true);
-		top.Ext4.getCmp('settleAccountsDepart').setReadOnly(true);
-	
-		top.Ext4.getCmp('depart').setValue($Id('depart').value);
-		top.Ext4.getCmp('settleAccountsDepart').setValue($Id('depart').value);
-		top.Ext4.getCmp('departCoding').setValue($Id('departCoding').value);
-		top.Ext4.getCmp('settleAccountsDepartCoding').setValue($Id('departCoding').value);
-	}
-
 	/**
 	 * 加载已经申请的物品（包括申领模版的）.
 	 * @param para					格式{applicationType:申请单类型,id:申请单id,reloadTemplate:申请科室的科室编码}