Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r27178 -r27185
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27178)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 27185)
@@ -18,7 +18,6 @@
var oldSupplierName = null; //不是新建记录旧的供应商名称
//外来器械申请单id
var foreignTousseApplicationId;
-var takeImgAndVideoWin;
//外来器械材料种类颜色管理
var washClassifyTypeColor = sstsConfig.washClassifyTypeColorManager || {
'平面类' : 'yellow-row',
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js
===================================================================
diff -u -r27182 -r27185
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 27182)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.js (.../videoAndImg.js) (revision 27185)
@@ -111,7 +111,11 @@
$(".spotlight-group").show();
$("#videoShow").hide();
$(".close_video").hide();
- $(".uploading").show();
+ if(isLook == 'true'){
+ $(".uploading").hide();
+ }else{
+ $(".uploading").show();
+ }
}
/*
@@ -414,6 +418,7 @@
}else{
$(".uploading").show();
}
+
//加载图片和视频
loadingVideoAndImg(imageIdsData,videoIdsData);
})
Index: ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp
===================================================================
diff -u -r27178 -r27185
--- ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp (.../videoAndImg.jsp) (revision 27178)
+++ ssts-web/src/main/webapp/disinfectsystem/test/videoAndImg.jsp (.../videoAndImg.jsp) (revision 27185)
@@ -21,7 +21,9 @@
var goodsName = '${param.goodsName}';
var imageIds = '${param.imageIds}';
var videoIds = '${param.videoIds}';
- var isLook = '${param.isLook}';
+ var isLook = '${param.isLook}';
+ imageIds = imageIds.replace(/"/g,"");
+ videoIds = videoIds.replace(/"/g,"");