Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r12641 -r12643
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12641)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12643)
@@ -2349,22 +2349,38 @@
 		var deliverStatus = recyclingApplication.deliverStatus;
 		var recyclingStatus = recyclingApplication.recyclingStatus;
 		var committedStatus = recyclingApplication.committedStatus;
+		var endStatus = recyclingApplication.endStatus;
 		var printed = recyclingApplication.printed;
 		var isReaded = false;
 		if(recyclingApplication.readed == 1){
 			isReaded = true;
 		}
 		var hiddenCommitButton = false;
 		var hiddenSaveButton = false;
-		if((committedStatus && isReaded) || printed != unPrint){
-			 hiddenCommitButton = true;
+
+		//供应室用户
+		if(isCssdUser == 'true'){
+			//已打印
+			if(printed != unPrint){
+				hiddenCommitButton = true;
+			//已提交、已回收已发货已终止 不能修改
+			}else if(committedStatus && ((recyclingStatus == partRecycle || recyclingStatus == recycled) || 
+				     deliverStatus != awaitDeliver || (endStatus == end || endStatus == partEnd))){
+				hiddenCommitButton = true;
+			}
+		//临床科室用户
+		}else{
+			//已提交已阅读、已打印不能修改
+			if((committedStatus && isReaded) || printed != unPrint){
+				hiddenCommitButton = true;
+			}
 		}
 		if(committedStatus){
 			hiddenSaveButton = true;
 		}
 		
 		var hiddenReturnButton = true;
-		if (hiddenCommitButton && hiddenSaveButton
+		if (isCssdUser == 'true' && committedStatus
 				&& (recyclingStatus == awaitRecycling || recyclingStatus == "")
 				&& deliverStatus == awaitDeliver) {
 			hiddenReturnButton = false;