Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js
===================================================================
diff -u -r28503 -r31997
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js	(.../interfereForeignTousseApplicationForm.js)	(revision 28503)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js	(.../interfereForeignTousseApplicationForm.js)	(revision 31997)
@@ -364,6 +364,111 @@
      barcodeField.setValue("");
 }
 
+ // 拍照
+ function openCameraWindow() {
+    if (!isSplitComplete()) {
+        return false;
+    }
+    var records = childPackagePanel.getSelectionModel().getSelections();
+    if (records.length == 0) {
+        showResult("请选择要上传照片的包！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+        return false;
+    }
+    if (records.length != 1) {
+        showResult("只能选择一个包！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+        return false;
+    }
+    var data = records[0].data;
+    imageIdsArry = data.imageIdsArry;
+    if(!imageIdsArry){
+        data.imageIdsArry = [];
+        imageIdsArry = data.imageIdsArry;
+    }
+    videoIdsArry = data.videoIdsArry;
+    if(!videoIdsArry){
+        data.videoIdsArry = [];
+        videoIdsArry = data.videoIdsArry;
+    }
+    var tousseDefinitionId = '';
+    takeImgAndVideoSplit(imageIdsArry,videoIdsArry,false,tousseDefinitionId);
+}
+
+function isSplitComplete(){
+    var waitSplitMaterialStore = top.Ext.getCmp("splitMaterialGrid2").getStore();
+    var splitedMaterialStore = top.Ext.getCmp("splitMaterialGrid3").getStore();
+    
+    var v = waitSplitMaterialStore.getCount();
+    if(v > 0 && !sstsConfig.allowForeignToussePartSplitWhenPacking){
+         showResult("待拆分的材料部分未拆分！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+         return false;
+    }
+    v = splitedMaterialStore.getCount();
+    if(v > 0){
+         showResult("已拆分的材料部分未拆分！" , null , sstsConfig.messagePauseTimeOnPackingPage);
+         return false;
+    }
+    return true;
+}
+
+function takeImgAndVideoSplit(imageIdsArry,videoIdsArry,isLook,tousseDefinitionId){
+	var imageType = '包实例装配采集图片';
+	if(Ext4.chromeVersion < 62){
+	   showResult("请使用62以上版本的chrome浏览器!" , null , sstsConfig.messagePauseTimeOnPackingPage);
+		return ;
+	}
+	if(imageIdsArry != undefined){
+		var imageIds = imageIdsArry.join(",");
+	}
+	
+	if(videoIdsArry != undefined){
+		var videoIds = videoIdsArry.join(",");
+	}
+	
+	if(imageIds == ""){
+		imageIds = null;
+	}
+	
+	if(videoIds == ""){
+		videoIds = null;
+	}
+	tousseName = "";
+	
+	var urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName='+ tousseName +'&imageType='+imageType+'&videoType=装配采集视频&objectId='+tousseDefinitionId+'&videoIds='+videoIds+'&imageIds='+imageIds+'&isLook='+isLook;
+    var videoImgWin = openFullSizeWindowWithName(urls,true,'图片视频拍摄');
+	if(videoImgWin != null ){
+        videoImgWin.focus(); 
+        var loop = setInterval(function() {
+            if(videoImgWin.closed) {
+                clearInterval(loop);
+                videoImgWin.focus(); 
+                var returnValue = videoImgWin.returnValue;
+                var childPackageStore = top.Ext.getCmp("splitMaterialGrid").getStore();
+                var item = [];
+                for(var i=0;i<childPackageStore.getCount();i++){
+                    var record = childPackageStore.getAt(i);
+                    item[i] = new addSplitMaterial({
+                        tousseName : record.get('tousseName'),
+                        tousseNameAlias : record.get('tousseNameAlias'),
+                        materialNames :record.get('materialNames'),
+                        materialsJsonArray : record.get('materialsJsonArray'),
+                        packingType : record.get('packingType'),
+                        bigPackage : record.get('bigPackage'),
+                        toolAmount : record.get('toolAmount'),
+                        implantAmount : record.get('implantAmount'),
+                        sterilingType:record.get('sterilingType'),
+                        partialSplitForeignTousse:record.get('partialSplitForeignTousse'),
+                        rowNum:record.get('rowNum'),
+                        imageIdsArry:returnValue?record.get('imageIdsArry'):[],
+                        videoIdsArry:returnValue?record.get('videoIdsArry'):[]
+                    }); 
+                }
+                childPackageStore.removeAll();
+                top.Ext.getCmp("splitMaterialGrid").getStore().add(item);
+            }
+        }, 1000);
+	}
+}
+
 function splitForeignTousse(applicationId,foreignTousseName,supplierName,tousseItemId,packageType){
     //器械报基础信息
     tempforeignTousseName = foreignTousseName;
@@ -571,6 +676,32 @@
                 	showResult("已拆分的器械包不能为空！");
                     return false;
                 }
+
+                if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse){
+                    var isHasImgOrVideo = true;
+                    var msg = '';
+                    var childPackageStore = top.Ext.getCmp("splitMaterialGrid").getStore();
+                    for ( var i = 0; i < childPackageStore.getCount(); i++) {
+                        var record = childPackageStore.getAt(i);
+                        var imageIdsArry = record.get("imageIdsArry");
+                        var videoIdsArry = record.get("videoIdsArry");
+                        if(!record.get("partialSplitForeignTousse")){
+                            if(typeof imageIdsArry == 'object' && typeof videoIdsArry == 'object'){
+                                if(imageIdsArry.length == 0 || videoIdsArry.length == 0){
+                                    isHasImgOrVideo = false;
+                                    msg = "还有拆分小包未上传图片，不能装配，请先上传照片！";
+                                }
+                            }else {
+                                isHasImgOrVideo = false;
+                                msg = "还有拆分小包未上传图片，不能装配，请先上传照片！";
+                            }
+                        }
+                    }
+                    if(!isHasImgOrVideo){
+                        showResult(msg);
+                        return
+                    }
+                }
                 
                 top.Ext.MessageBox.buttonText.yes="确定";
                 top.Ext.MessageBox.buttonText.cancel="取消"; 
@@ -618,6 +749,12 @@
                     }
                 });
             }
+        },{
+            text : '拍摄',
+            hidden : !sstsConfig.showCameraPhoto,
+            handler : function() {
+            	openCameraWindow();
+            }
         }]
     });
     
@@ -780,7 +917,35 @@
         header : "器械包名称",
         dataIndex : 'tousseName',
         width : 160,
-        menuDisabled: true
+        menuDisabled: true,
+        renderer: function(v,p,record,index){
+            if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                if(record.data.partialSplitForeignTousse){
+                    p.css='tousseName_background'; 
+                }
+                if(record.data.imageIdsArry || record.data.videoIdsArry || record.data.haveImageFileAmount){
+                    var imageIdsArry = record.data.imageIdsArry || [];
+                    var videoIdsArry = record.data.videoIdsArry || [];
+                    if(imageIdsArry.length > 0 || videoIdsArry.length > 0 || record.data.haveImageFileAmount){
+                        p.css='tousseName_background_1'; 
+                    }
+                }
+            }else if(sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && !sstsConfig.allowForeignToussePartSplitWhenPacking){
+                if(record.data.imageIdsArry && record.data.videoIdsArry || record.data.haveImageFileAmount){
+                    var imageIdsArry = record.data.imageIdsArry || [];
+                    var videoIdsArry = record.data.videoIdsArry || [];
+                    if(imageIdsArry.length > 0 || videoIdsArry.length > 0 || record.data.haveImageFileAmount){
+                        p.css='tousseName_background_1'; 
+                    }
+                }
+            }else if(!sstsConfig.enableCheckUploadPhotoBeforePackingForeignTousse && sstsConfig.allowForeignToussePartSplitWhenPacking){
+                if(record.data.partialSplitForeignTousse){
+                    p.css='tousseName_background'; 
+                }
+            }
+
+            return '<span style="white-space: break-spaces;">'+v+'</span>';
+        }
     },{
         id : 'bigPackage',
         header : "超大超重包",
@@ -841,8 +1006,15 @@
             {name : 'materialNames'},
             {name : 'packingType'},
             {name : 'total'},
-            {name : 'bigPackage'}
-            
+            {name : 'bigPackage'},{
+                name : 'partialSplitForeignTousse'
+            },{
+                name : 'haveImageFileAmount'
+            },{
+                name : 'imageIdsArry'
+            },{
+                name : 'haveImageFileAmount'
+            }
         ]
     });
     //初始化加载器械包
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp
===================================================================
diff -u -r29513 -r31997
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp	(.../interfereForeignTousseApplicationView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp	(.../interfereForeignTousseApplicationView.jsp)	(revision 31997)
@@ -27,7 +27,13 @@
 	var curUserName = '<%=request.getAttribute("userName")%>';
     var foreignToussePriceOfSysParams = 0;
     var IMAGE_TYPE_TOUSSE  = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数
+    //显示加急级别和加急数量
+    var SSTS_ShowUrgentLevelAndUrgentAmount = false;
+	<operation:authorize ifAnyGranted="SSTS_ShowUrgentLevelAndUrgentAmount">
+		SSTS_ShowUrgentLevelAndUrgentAmount = true;
+	</operation:authorize>
 </script>
+</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>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>