Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp
===================================================================
diff -u -r29513 -r31024
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp	(.../invoiceSign.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSign.jsp	(.../invoiceSign.jsp)	(revision 31024)
@@ -156,7 +156,11 @@
         barcodeTemp += '9';
     }else if(event.keyCode == 13){
     	if(!alertDivIsShow){
-    		loadBarcodeDevice(barcodeTemp);
+            if(sstsConfig.mustViewPackingPhotoBeforeForeignTousseSignAndUse){
+                loadTousseDefintionByBarcod(barcodeTemp);
+            }else {
+                loadBarcodeDevice(barcodeTemp);
+            }
     	}else{
     		var barcodeBtn = new BarcodeBtn(function(){closeDiv();});
     		barcodeBtn.processBarcode(barcodeTemp);
@@ -360,6 +364,164 @@
 	$("#abnormalMaterialsTable tr").remove();
 	$("#tousseBarcodes").val("");
 }
+//根据条码获取器械包类型和状态
+function loadTousseDefintionByBarcod(barcode){
+	$.ajax({
+        url : WWWROOT + '/disinfectSystem/tousseInstanceAction!loadTousseDefintionByBarcode.do',
+        type:'POST',
+        cache:false,
+		data:{barcode:barcode},
+        dataType:'json',
+		success : function(result) {
+			if((result.data.tousseType == "外来器械包" || result.data.tousseType == "外来器械拆分小包") && result.data.status == "已发货"){
+				if(result.data.tousseType == "外来器械包"){
+					loadingVideoAndImg(result.data.tousseDefinitionId, "装配采集图片",barcode);
+				}else if(result.data.tousseType == "外来器械拆分小包"){
+					loadingVideoAndImg(result.data.tousseInstanceId, "包实例装配采集图片",barcode);
+				}
+			}else {
+				loadBarcodeDevice(barcode,false);
+			}
+		}
+	})
+}
+//加载装配拍摄的图片
+function loadingVideoAndImg(objectId, imageType,barcode){
+	$.ajax({
+        url : WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageAndVideoInfo.do',
+        type:'POST',
+        cache:false,	
+		data : {
+			objectId:objectId,
+			imageType:imageType,
+			videoType:"装配采集视频"
+		},
+		dataType:'json',
+		success : function(result) {
+			if(result.success){
+				var imgArray = [];
+				if(result.imageArray.length > 0){
+					for(var i = 0;i < result.imageArray.length; i++){
+						var imgUrl =  WWWROOT +'/disinfectSystem/baseData/uploadImageAndVideoAction!getImageById.do?imageId='+ result.imageArray[i].id+'&original=true';
+						imgArray.push(imgUrl);
+					}
+				}			
+				showImg(imgArray,barcode);
+			}else {
+                if(sstsConfig.signTipsMessage){
+                    newAlert(result.message);
+                }else{
+                    alertDiv(result.message); 
+                } 
+            }
+		}
+	});
+}
+
+//显示图片
+function showImg(imgArray,barcode){
+	var page = 1;
+	var totalPage = imgArray.length;
+	var toolbarPage = new top.Ext.Toolbar.TextItem({
+		text : '第1页'
+	});
+	var toolbarTotalPage = new top.Ext.Toolbar.TextItem({
+		text : '共'+totalPage+'页'
+	});
+	
+	var imagePanel = new top.Ext.Panel({
+		id : 'imagePanel',
+		layout : 'fit',
+		height : 440,
+		items : [{
+		    xtype : 'box',
+		    id : 'browseImage',
+		    fieldLabel : "预览图片",
+		    autoEl : {
+				id : 'imageBrowse',
+				tag : 'img',
+				autoHeight:true,
+				src : Ext.BLANK_IMAGE_URL,
+				style : 'filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod=scale);',
+				complete : 'off'
+		    }
+		}]
+	});
+	var browseImage = imagePanel.findById('browseImage');
+	var url = imgArray[page-1] || WWWROOT+'/images/default.jpg';
+	browseImage.autoEl.src=url;
+	var showTousseImage = new top.Ext.Panel({
+		items : [{
+			xtype : 'panel',
+			id : 'pageToolbar',
+			bbar : ['->',{
+				xtype : 'button',
+        		text : '<<',
+        		tooltip :"上一页",
+        		handler : function(){
+        			if (page - 1 <= 0) {
+        				newAlert('已是第一页');
+        				return;
+        			}
+        			page = page - 1;
+        			var url = imgArray[page-1];
+        			var imageBrowse = top.Ext.get('imageBrowse');
+        			var image = imageBrowse.dom;
+        			image.src = url;// 覆盖原来的图片 
+        			var element = top.Ext.get(toolbarPage.el);
+        		    element.update('第' + page + '页');
+        		}
+			},
+			toolbarPage,
+			toolbarTotalPage,{
+        		xtype : 'button',
+        		text : '>>',
+        		tooltip :"下一页",
+        		handler : function() {
+        			if (page + 1 > totalPage) {
+        				newAlert('已是最后一页');
+        				return;
+        			}
+        			page = page + 1;
+        			var url = imgArray[page-1];
+        			var imageBrowse = top.Ext.get('imageBrowse');
+        			var image = imageBrowse.dom;
+        			image.src = url;// 覆盖原来的图片 
+        			var element = top.Ext.get(toolbarPage.el);
+        		    element.update('第' + page + '页');
+        		}
+        	}]
+		},imagePanel]
+	});
+	var signGoodsWin = new top.Ext.Window({
+		id : 'signGoodsWin',
+		title : '请根据下图核对包内材料，确认无误再点击确定签收！',
+		resizable: false,
+		width : 800,
+		height : 500,
+		border : false,
+		modal : true,
+		plain : true,
+		stateful: false,
+		items : [showTousseImage],
+		buttonAlign : 'center',
+		buttons : [{
+			text:"确定签收",
+			handler:function(){
+				loadBarcodeDevice(barcode);
+				signGoodsWin.close();
+		   	}
+		},{
+			text:"取消签收",
+			handler:function(){
+			   signGoodsWin.close();
+		   }
+		}]
+	});
+	
+	signGoodsWin.show();
+}
+
 function loadBarcodeDevice(barcode){
 	$.ajax({
            type:'POST',