Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r14686 -r14719
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14686)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14719)
@@ -2715,7 +2715,8 @@
 	}else if(type == tousseLeaseApplicationForm){
 		addAndEditTousseLease(id);
 	}else if(type == disinfectGoodsApplicationForm){
-		addAndEditUntracableTousse(id,null,"01",function(){});
+		// addAndEditUntracableTousse(id,null,"01",function(){});
+		RecyclingApplicationTableManager.getRecyclingApplicationAndVerifyEdit(id,setRecyclingApplicationForm);
 	}else if(type == foreignTousseApplicationForm){
 		addAndEditForeignTousseApplication(id);
 	}else if(type == customTousseApplicationForm){
@@ -2776,7 +2777,7 @@
 		if(type == comboApplicationForm || type == recyclingCreateApplicationForm){
 			comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus);
 		}
-		else if(type == tousseApplicationForm || type == diposableGoodsApplicationForm){
+		else if(type == tousseApplicationForm || type == diposableGoodsApplicationForm || type == disinfectGoodsApplicationForm){
 			comboApplication(recyclingApplication.id,"true",hiddenCommitButton,hiddenSaveButton,hiddenReturnButton,type, recyclingApplication.committedStatus);
 		}
 		
@@ -2841,7 +2842,8 @@
 	if(type==customTousseApplicationForm) {//自定义器械包申请单
 		cell = "<a href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==disinfectGoodsApplicationForm){//消毒物品申请单
-		cell = "<a href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
+		cell = "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+		// cell = "<a href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==foreignTousseApplicationForm){//外来器械包申请单
 		cell = "<a href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 	} else if(type == tousseLeaseApplicationForm){
@@ -3277,7 +3279,8 @@
 				handleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType;
 				
 				comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
-				addAndEditUntracableTousse('',0,"01",function(){});
+				comboApplication(0, "true",false,false,true,disinfectGoodsApplicationForm, false);//待发货
+				// addAndEditUntracableTousse('',0,"01",function(){});
 			}
 		},{
 			text : '申请外来器械',