Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r18320 -r18351
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 18320)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 18351)
@@ -1496,8 +1496,10 @@
 			}
 			
 			var deptName = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #depart")[0].getValue();
-			//如果菜单中已启用申领一次性物品增加项目选项功能并且申请科室为课教项目经费时,则判断项目是否已选,如果未选则进行提示
-			if(sstsConfig.showProjectNameSelectWhenApplyDiposableGoods == true && deptName == '科教项目经费'){
+			//如果菜单中已启用申领一次性物品增加项目选项功能并且申请科室为所配置的科室(科教项目经费、自筹科教配套)时,则判断项目是否已选,如果未选则进行提示
+			if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true 
+					&& sstsConfig.departsForInvoicePlanSelectProject
+					&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + deptName + ";") != -1){
 				if(!top.Ext4.getCmp('projCode').getValue() || top.Ext4.getCmp('projCode').getValue() == ''){
 					showResult("请选择项目!");
 					return;
@@ -2476,9 +2478,10 @@
 											}
 										});
 										
-										//如果菜单中已启用申领一次性物品增加项目选项功能并且申请科室为课教项目经费,则该下拉框给予显示(仅中山眼科增加)
-										if(sstsConfig.showProjectNameSelectWhenApplyDiposableGoods == true){
-											if(deptName == '科教项目经费'){
+										//如果菜单中已启用申领一次性物品增加项目选项功能并且申请科室为所配置的科室(科教项目经费、自筹科教配套),则该下拉框给予显示(仅中山眼科增加)
+										if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true){
+											if(sstsConfig.departsForInvoicePlanSelectProject
+													&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + deptName + ";") != -1){
 												top.Ext4.getCmp('projCode').setVisible(true);
 												projectStore.reload();//加载项目数据
 											}else{
@@ -2902,8 +2905,9 @@
 		var departCodingComp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #departCoding")[0];
 		departCodingComp.setRawValue($Id('departCoding').value);
 
-		if(sstsConfig.showProjectNameSelectWhenApplyDiposableGoods == true){
-			if($Id('depart').value == '科教项目经费'){
+		if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true){
+			if(sstsConfig.departsForInvoicePlanSelectProject
+					&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + $Id('depart').value + ";") != -1){
 				top.Ext4.getCmp('projCode').setVisible(true);
 				projectStore.reload();//加载项目数据
 			}else{
@@ -3282,8 +3286,9 @@
 		top.Ext4.getCmp("remark").setValue(recyclingApplication.remark);
 		
 		//如果启用了课题组接口功能且科室为科教项目经费
-		if(sstsConfig.showProjectNameSelectWhenApplyDiposableGoods == true){
-			if(recyclingApplication.depart == '科教项目经费'){
+		if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true){
+			if(sstsConfig.departsForInvoicePlanSelectProject
+					&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + recyclingApplication.depart + ";") != -1){
 				top.Ext4.getCmp('projCode').setVisible(true);
 				projectStore.reload();//加载项目数据
 				top.Ext4.getCmp('projCode').setValue(recyclingApplication.projCode);
@@ -3317,9 +3322,9 @@
 		// cell = "<a ck= class= \"formDetail\" href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==foreignTousseApplicationForm){//外来器械包申请单
 		cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
-	} else if(type == tousseLeaseApplicationForm){
+	} else if(type == tousseLeaseApplicationForm){//借物单
 		cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
-	} else if(type == foreignPorxyApplicationForm){
+	} else if(type == foreignPorxyApplicationForm){//外部代理灭菌单
 		cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else {
 		cell = "<a formDetail class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";