Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp
===================================================================
diff -u -r34244 -r34900
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp	(.../foreignTousseView.jsp)	(revision 34244)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp	(.../foreignTousseView.jsp)	(revision 34900)
@@ -44,6 +44,8 @@
 <script type="text/javascript">
 var imageTypeTousse = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
 var imageTypeToussePacking = '<%=ImageFile.IMAGE_TYPE_TOUSSEPACKING%>';
+var imageTypeWashGuide = '<%=ImageFile.IMAGE_TYPE_TOUSSE_WASHGUIDE%>';
+var vidoeTypeTousseWashTeaching = '<%=VideoFile.VIDEO_TYPE_TOUSSE_WASH_TEACHING%>';
 var ftDefaultSterilingMethod = "${ftDefaultSterilingMethod}";
 var isPriceReadOnly = <%=request.getAttribute("isPriceReadOnly")%>;
 var userName = '${loginUserData.userFullName}';
@@ -126,6 +128,8 @@
 <script type="text/javascript" src="${ctx}/dwr/util.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="foreignTousseView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="uploadImageManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/tousseUploadImageManager.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/tousseUploadVideoManager.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js?version=${svnRevision}"></script>
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js
===================================================================
diff -u -r34893 -r34900
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34893)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js	(.../foreignTousseDefinitionForm.js)	(revision 34900)
@@ -841,6 +841,46 @@
     			uploadToussePackingImageFile(imageTypeSpecification,id);
     		  }	  
       	  }, {
+			text: '清洗操作指引',
+			hidden: id == 0 ? true : false,
+			menu: new top.Ext.menu.Menu({
+				items: [{
+					text: '清洗指引图片',
+					id: 'washGuideImageFile',
+					handler: function () {
+						var tousseName = top.Ext.getCmp('name').getValue();
+						uploadToussePackingImageFile(imageTypeWashGuide, id, tousseName);
+					}
+				}, {
+					text: '清洗教学视频',
+					id: 'washGuideVedio',
+					handler: function () {
+						var tousseName = top.Ext.getCmp('name').getValue();
+						uploadToussePackingVideoFile(vidoeTypeTousseWashTeaching, id, tousseName);
+					}
+				}]
+			})
+		}, {
+			text: '装配教学',
+			hidden: id == 0 ? true : false,
+			menu: new top.Ext.menu.Menu({
+				items: [{
+					text: '装配教学图片',
+					id: 'uploadToussePackingImageFile',
+					handler: function () {
+						var tousseName = top.Ext.getCmp('name').getValue();
+						uploadToussePackingImageFile(imageTypeToussePacking, id, tousseName);
+					}
+				}, {
+					text: '装配教学视频',
+					id: 'uploadVedio',
+					handler: function () {
+						var tousseName = top.Ext.getCmp('name').getValue();
+						uploadToussePackingVideoFile(videoType, id, tousseName);
+					}
+				}]
+			})
+		}, {
 			text: '配包注意事项',
 			hidden: id == 0 ? true : false,
 			handler: function () {
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r34080 -r34900
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34080)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34900)
@@ -417,6 +417,7 @@
 									var params = {
 										resolution: '1980',
 										tousseDefinitionID: objectId,
+										imgName: '清洗操作指引图片',
 										tousseName: encodeURIComponent(tousseName),
 										number: 1
 									}
@@ -469,6 +470,7 @@
 		listeners: {
 			'click': function (node, e) {
 				var type = node.attributes.type;
+				console.log(type)
 				if (type == '材料') {
 					return;
 				}
@@ -478,6 +480,7 @@
 				var params = {
 					resolution: '1980',
 					tousseDefinitionID: objectId,
+					imgName: '清洗操作指引图片',
 					tousseName: encodeURIComponent(tousseName),
 					number: 1
 				}
@@ -676,6 +679,7 @@
 								var params = {
 									resolution: '1980',
 									tousseDefinitionID: objectId,
+									imgName: '清洗操作指引图片',
 									tousseName: encodeURIComponent(tousseName),
 									number: 1
 								}