Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r27185 -r27224
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 27185)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 27224)
@@ -845,9 +845,11 @@
 
 /**
  * 校验外来器械包申请单并且“提交”/“提交并打印”.
+ * @param id 单记录id
  * @param needPrint	是否需要打印
+ * @param ismodify  是否是点击修改按钮 fasle是，true不是
  */
-function checkAndsubmintForeignTousseForm(needPrint) {
+function checkAndsubmintForeignTousseForm(id,needPrint,ismodify) {
 	if (!foreignTousseForm.getForm().isValid()) {
 		showResult('请正确填写表单各值');
 		return false;
@@ -876,7 +878,13 @@
 				top.Ext4.getCmp('foreignTousseInfo').setValue(JSON.stringify(foreignTousseInfoArray));
 			}
 		}
-		submintForeignTousseForm(ACTION_TYPE_ADD, needPrint);
+		
+		if(id != "" && !ismodify){//不是新添加的单,并且是点击修改按钮
+			submintForeignTousseForm(ACTION_TYPE_UPDATE, needPrint);
+		}else{
+			submintForeignTousseForm(ACTION_TYPE_ADD, needPrint);
+		}
+		
 	}
 }
 
@@ -1002,8 +1010,9 @@
  * 打开外来器械包申请单的窗口.
  * @param id		外来器械包申请单
  * @param formType	操作类型
+ * @param ismodify 是点击修改按钮还是点击姓名列的文字链接打开弹窗的
  */
-function openForeignTousseForm(id, formType){
+function openForeignTousseForm(id, formType,ismodify){
 	foreignTousseApplicationId = id;
 	currentWashClassifyType = null;
 	
@@ -1365,8 +1374,8 @@
 		},{
 			text : '提交',
 			id : 'commitBtn',
-			hidden:(id != ""),
-			//hidden:(id != "" && ismodify),//点击姓名列的文字链接和点击工具栏的修改按钮，隐藏提交按钮
+			//hidden:(id != ""),
+			hidden:(id != "" && ismodify),//点击姓名列的文字链接和点击工具栏的修改按钮，隐藏提交按钮
 			handler : function() {	
 				if(document.getElementById("imageIdsAndGoodsName")){
 					goodsNameImageFile = document.getElementById("imageIdsAndGoodsName").value;
@@ -1381,13 +1390,15 @@
 						goodsNameVideoFile = JSON.parse(goodsNameVideoFile);
 					}
 				}				
-				checkAndsubmintForeignTousseForm(false);
+				checkAndsubmintForeignTousseForm(id,false,ismodify);
 			}
 		},{
 			text : '提交并打印',
-			hidden:(id != ""),
+			id : 'commitPrintBtn',
+			hidden:(id != "" && ismodify),//点击姓名列的文字链接和点击工具栏的修改按钮，隐藏提交按钮
+			//hidden:(id != ""),
 			handler : function() {
-				checkAndsubmintForeignTousseForm(true);
+				checkAndsubmintForeignTousseForm(id,true,ismodify);
 			}
 		},{
 			text : '确认归还',
@@ -2582,12 +2593,18 @@
 			url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!loadForeignTousseApplication.do',
 			method : 'GET',
 			waitMsg : '正在加载数据，请稍候',
-			success : function(form, action) {
+			success : function(form, action) { 
+				if(top.Ext4.getCmp("applicant").getValue() != curUserName){
+					showResult("该申请单只能由申请人修改!");
+					top.Ext4.getCmp('commitBtn').hide();
+					top.Ext4.getCmp('commitPrintBtn').hide();
+				}
 				//点击修改按钮并且已经在回收页面打开过，不准修改，隐藏提交按钮
-				/*if(!ismodify && action.result.data.readed == 1){
+				if(!ismodify && action.result.data.readed == 1){
 					showResult("该申请单已经被回收人员查阅，不允许自行修改!");
 					top.Ext4.getCmp('commitBtn').hide();
-				}*/
+					top.Ext4.getCmp('commitPrintBtn').hide();
+				}
 				//初始化供应商联系人值
 				var contactName = action.result.data.supplierContactName;
 				top.Ext4.getCmp('supplierContactName').setRawValue(contactName);
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r27172 -r27224
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 27172)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 27224)
@@ -87,13 +87,15 @@
 	</operation:authorize>
 	
 	var today = '<%=request.getAttribute("today")%>';
+	var curUserName = '<%=request.getAttribute("userName")%>';
 	var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
 	var supplyRoomCoding = '<%=request.getAttribute("supplyRoomCoding")%>';
 	
 	var actionType_confirmReturn  = '<%=ForeignTousseApplication.ACTION_TYPE_CONFIRM_RETURN%>';  //确认归还
 	var ACTION_TYPE_EARLY_RETURN  = '<%=ForeignTousseApplication.ACTION_TYPE_EARLY_RETURN%>';  //提前归还
 	var ACTION_TYPE_ADD  = '<%=ForeignTousseApplication.ACTION_TYPE_ADD%>';  //新增
 	var ACTION_TYPE_INTERFERE  = '<%=ForeignTousseApplication.ACTION_TYPE_INTERFERE%>';  //干预
+	var ACTION_TYPE_UPDATE  = '<%=ForeignTousseApplication.ACTION_TYPE_UPDATE%>';  //修改
     var foreignTousseApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION%>';//外来器械包申请单
     
   	//包大小定义
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r27176 -r27224
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 27176)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 27224)
@@ -53,7 +53,7 @@
 	);
 }
 
-function loadFormData(){
+function loadFormData(grid,ismodify){
 	var records = grid.getSelectionModel().getSelections();
 
 	if (records.length == 0) {
@@ -63,7 +63,7 @@
 		showResult("一次只能修改一个"+entityName+"！");
 		return false;
 	}
-	openForeignTousseForm(records[0].data.id,"apply");
+	openForeignTousseForm(records[0].data.id,"apply",ismodify);
 }
 
 /**
@@ -72,7 +72,7 @@
  * 页面中需要定义 modify(v,data) 函数
  */
 function modify(v,data){
-	loadFormData();
+	loadFormData(grid,true);
 }
 
 function renderColor(v, p, record){
@@ -219,7 +219,7 @@
 		id : 'editTbar',
 		hidden : SSTS_ForeignTousseApplication_Update,
 		handler : function() {
-			loadFormData(grid);
+			loadFormData(grid,false);
 		}
 	}, '-', {
 		text : '删除',