Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r33512 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 33512)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 33909)
@@ -184,6 +184,16 @@
 .pageFirst,.pagePrev,.pageNext,.pageLast {
 	width: 20px;
 }
+
+.x-form-clear-trigger {
+    background-image: url(${ctx}/ext/fontSize${fontSize}/resources/images/default/form/clear-trigger.gif);
+    cursor: pointer;
+}
+
+.x-form-search-trigger {
+    background-image: url(${ctx}/ext/fontSize${fontSize}/resources/images/default/form/search-trigger.gif);
+    cursor: pointer;
+}
 </style>
 <!-- ImageShow 样式定义结束 -->
 <!-- alertDiv样式 -->
@@ -564,6 +574,7 @@
 	teachingVideo = true;
 }
 var IMAGE_TYPE_TOUSSE  = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数
+var profile = '${profile}';
 </script>
 
 <%@ include file="/disinfectsystem/print/print.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r33903 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 33903)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 33909)
@@ -182,7 +182,9 @@
 	top.Ext4.getCmp('roomNumber').setValue(patientInfo.roomNumber);
 	top.Ext4.getCmp('bedNumber').setValue(patientInfo.bedNumber);
 	//ZSYY-320：外来器械注释医生的字段
-	//top.Ext4.getCmp('doctor').setValue(patientInfo.doctorName);
+	if(profile !== 'zsyy'){
+		top.Ext4.getCmp('doctor').setValue(patientInfo.doctorName);
+	}
 	top.Ext4.getCmp('surgery').setValue(patientInfo.operation);
 	//手术时间需要特殊处理,需要将年和月之间的-符替换成/
 	if(patientInfo.operationTime){
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r33814 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 33814)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 33909)
@@ -1090,7 +1090,7 @@
 				},
 				blur:function(field, event, eOpts){
 					var data = currentRecord.data;
-					
+
 					if(field.lastValue == null){
 						return;
 					}
@@ -1338,7 +1338,7 @@
                     			return true;
                     		}else{  
 								// 点击消毒物品包数量的单元格，是整包清洗或者编辑项为加急数量时允许编辑，SSTS-359加急级别也可以编辑
-                    			if (record.get('isApplyEntireTousse') == "是" || 'urgentAmount' == context.field || 'urgentLevel' == context.field){
+                    			if (record.get('isApplyEntireTousse') == "是" || 'urgentAmount' == context.field || 'urgentLevel' == context.field || 'remarkOfApplyGoods' == context.field){
                     				return true;
                     			}else{
                     				showResult(record.get('name') + "只能按材料申请，请填写材料数量！");
@@ -1352,11 +1352,17 @@
                 				showResult(parentNode.get('name') + "只能按包申请，请填写包数量！");
                 				return false;
                 			}else{
+								if(context.field == 'remarkOfApplyGoods'){
+									return false;
+								}
                 				return true;
                 			}
                     	}
                     },
                     edit:function(editor, context, eOpts){
+						if(context.field == 'remarkOfApplyGoods'){
+							return;
+						}
 						var totalPrice;
 						var originalValue = context.originalValue;
 						var record = context.record;
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r32117 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 32117)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 33909)
@@ -602,8 +602,7 @@
 if (notInWhiteList(sstsConfig, 'deliveryManage')) {
 	SSTS_Invoice_End = true;
 }
-
-
+var profile = '${profile}';
 </script>
 	
 	
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
===================================================================
diff -u -r33199 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp	(.../interfereForeignTousseApplicationView.jsp)	(revision 33199)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp	(.../interfereForeignTousseApplicationView.jsp)	(revision 33909)
@@ -26,6 +26,7 @@
 	var PACKAGE_SIZE_CENTER = '<%=TousseDefinition.PACKAGE_SIZE_CENTER%>';
 	var PACKAGE_SIZE_SMALL = '<%=TousseDefinition.PACKAGE_SIZE_SMALL%>';
 	var curUserName = '<%=request.getAttribute("userName")%>';
+    var profile = '${profile}';
     //图片类型(申请采集图片)
     var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>';
 	//视频类型(申请采集视频)
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
===================================================================
diff -u -r33103 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp	(.../historyPackingView.jsp)	(revision 33103)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp	(.../historyPackingView.jsp)	(revision 33909)
@@ -102,6 +102,7 @@
 	var currentDepartName = '<%=request.getAttribute("supplyRoomName")%>';
 	var entityName = '代理灭菌';
 	var editMode = true;
+    var profile = '${profile}';
 	var SSTS_ProxyDisinfection_Update = true;
     var pageName = 'historyPackingView';
 	<operation:authorize ifAnyGranted="SSTS_ProxyDisinfection_Update">
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r33447 -r33909
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 33447)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 33909)
@@ -136,6 +136,7 @@
 	var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>';
     var foreignToussePriceOfSysParams = '<%=pageContext.getAttribute("foreignToussePriceOfSysParams")%>';
 	var IMAGE_TYPE_TOUSSE  = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数
+	var profile = '${profile}';
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>