Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r32761 -r32836
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32761)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 32836)
@@ -145,7 +145,7 @@
 /*
  *IE8以下兼容document.getElementsByClassName
  */
-function documentGetElementsByClassName(className,doc) {
+function documentGetElementsByClassName(className, doc) {
     var element = doc || document;
     if (!element.getElementsByClassName) {
         element.getElementsByClassName = function (className) {
@@ -199,7 +199,7 @@
 function getServerTime(format, extObj, fieldId, myFn, url) {
     extObj.Ajax.request({
         url: url || WWWROOT + '/system/serverTimeAction!getServerDateTime.do',
-        async:false,
+        async: false,
         params: { dateformat: format },
         success: function (response, options) {
             var result = extObj.decode(response.responseText);
@@ -3452,48 +3452,48 @@
     return result;
 }
 //打印材料清单(包含了装配页面,聚合包页面,器械包定义页面)
-function printTousseDefinitionMaterial(ids,lists) {
+function printTousseDefinitionMaterial(ids, lists) {
     TousseDefinitionTableManager.getTousseDefinition(ids, function (jsonStr) {
         var result = JSON.parse(jsonStr);
         if (result.success) {
             var tousses = result.tousseDefinitions;
             var currentDateTime = result.currentDateTime || '';
-            if(currentDateTime !== ''){
+            if (currentDateTime !== '') {
                 currentDateTime = currentDateTime.split(' ')[0];
             }
             if (tousses != null && tousses.length > 0) {
-                if(sstsConfig.printBOMwhenPrintLabel){
+                if (sstsConfig.printBOMwhenPrintLabel) {
                     Ext.MessageBox.progress('打印中', '请稍候...');
                     var curNumber = 0;
-                    if(lists){
-                        for(var k=0;k<lists.length;k++){
+                    if (lists) {
+                        for (var k = 0; k < lists.length; k++) {
                             var packAmount = lists[k].packAmount;
                             var tousseName = lists[k].tousseName;
                             var count = Number(packAmount) * tousses.length;
                             for (var j = 0; j < Number(packAmount); j++) {
                                 for (var i = 0; i < tousses.length; i++) {
                                     var toussedef = tousses[i];
-                                    if(tousseName == toussedef.name){
+                                    if (tousseName == toussedef.name) {
                                         toussedef.currentDateTime = currentDateTime;
                                         ++curNumber;
                                         Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                                        printTousseDefinitionMaterialsInTousseView(toussedef, 0,'BOMprinter');
+                                        printTousseDefinitionMaterialsInTousseView(toussedef, 0, 'BOMprinter');
                                     }
                                 }
                             }
                         }
-                    }else {
+                    } else {
                         var count = tousses.length;
                         for (var i = 0; i < tousses.length; i++) {
                             var toussedef = tousses[i];
                             toussedef.currentDateTime = currentDateTime;
                             ++curNumber;
                             Ext.MessageBox.updateProgress((curNumber) / count, '第' + (curNumber) + '个,共' + count + '个');
-                            printTousseDefinitionMaterialsInTousseView(toussedef, 0,'BOMprinter');
+                            printTousseDefinitionMaterialsInTousseView(toussedef, 0, 'BOMprinter');
                         }
                     }
                     hideMessageBox(false);
-                }else {
+                } else {
                     top.Ext.Msg.show({
                         title: '输入打印份数',
                         msg: '打印份数：',
@@ -4253,13 +4253,13 @@
 
 // 获取谷歌浏览器版本
 function getChromeVersion() {
-    var arr = navigator.userAgent.split(' '); 
+    var arr = navigator.userAgent.split(' ');
     var chromeVersion = '';
-    for(var i=0;i < arr.length;i++){
-        if(/chrome/i.test(arr[i]))
-        chromeVersion = arr[i]
+    for (var i = 0; i < arr.length; i++) {
+        if (/chrome/i.test(arr[i]))
+            chromeVersion = arr[i]
     }
-    if(chromeVersion){
+    if (chromeVersion) {
         return Number(chromeVersion.split('/')[1].split('.')[0]);
     } else {
         return false;
@@ -4268,64 +4268,64 @@
 
 //FSSDERMYY-13：打开拍摄功能
 function openCameraPhotoWindow(params, callback) {
-	var version = getChromeVersion();
-	if (version < 62) {
-		showResult("请使用62以上版本的chrome浏览器!", null, sstsConfig.messagePauseTimeOnPackingPage);
-		return;
-	}
+    var version = getChromeVersion();
+    if (version < 62) {
+        showResult("请使用62以上版本的chrome浏览器!", null, sstsConfig.messagePauseTimeOnPackingPage);
+        return;
+    }
 
-	var tousseDefinitionId = params.tousseDefinitionId || '';
-	var isLook = params.isLook;
-	var imageIds = params.imageIds || '';
-	var videoIds = params.videoIds || '';
-	var imageType = params.imageType || '';
-	var videoType = params.videoType || '';
-	var goodsName = params.goodsName || '';
-    if(goodsName !== ''){
+    var tousseDefinitionId = params.tousseDefinitionId || '';
+    var isLook = params.isLook;
+    var imageIds = params.imageIds || '';
+    var videoIds = params.videoIds || '';
+    var imageType = params.imageType || '';
+    var videoType = params.videoType || '';
+    var goodsName = params.goodsName || '';
+    if (goodsName !== '') {
         goodsName = encodeURIComponent(goodsName)
     }
     var barcode = params.barcode || '';
     var tousseItemId = params.tousseItemId || '';
     var tousseId = params.tousseId || '';
     var invoicePlanId = params.invoicePlanId || '';
     var imgType = params.imgType || '';
-	var urls;
-	if (imgType == 2) {
+    var urls;
+    if (imgType == 2) {
         urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&packingTaskId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode;
-	} else {
-		urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode;
-	}
-    if(tousseItemId !== '' || tousseId !== ''){
+    } else {
+        urls = WWWROOT + '/disinfectsystem/test/videoAndImg.jsp?goodsName=' + goodsName + '&imageType=' + imageType + '&videoType=' + videoType + '&objectId=' + tousseDefinitionId + '&videoIds=' + videoIds + '&imageIds=' + imageIds + '&isLook=' + isLook + '&barcode=' + barcode;
+    }
+    if (tousseItemId !== '' || tousseId !== '') {
         urls += '&tousseItemId=' + tousseItemId + '&tousseId=' + tousseId + '&invoicePlanId=' + invoicePlanId;
     }
-	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;
-				if (callback) {
-					callback(returnValue)
-				}
-			}
-		}, 1000);
-	}
+    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;
+                if (callback) {
+                    callback(returnValue)
+                }
+            }
+        }, 1000);
+    }
 }
 
 //GDSZYY-102：删除器械包
-function deleteProxyDisinfectionItem(nodeId){
+function deleteProxyDisinfectionItem(nodeId) {
     var proxyDisinfectionTree = top.Ext.getCmp('proxyDisinfectionTree');
-	var item = proxyDisinfectionTree.getNodeById(nodeId);
-	if (item.attributes.type == '器械包') {
-		top.Ext.getCmp('totalAmountOfTousses').setValue(parseInt(top.Ext.getCmp('totalAmountOfTousses').getValue(), 10) - 1);
-	} else {
-		var count = 0;
-		item.eachChild(function (pNode) {
-			count++;
-		});
-		top.Ext.getCmp('totalAmountOfTousses').setValue(parseInt(top.Ext.getCmp('totalAmountOfTousses').getValue(), 10) - count);
-	}
-	item.remove();
+    var item = proxyDisinfectionTree.getNodeById(nodeId);
+    if (item.attributes.type == '器械包') {
+        top.Ext.getCmp('totalAmountOfTousses').setValue(parseInt(top.Ext.getCmp('totalAmountOfTousses').getValue(), 10) - 1);
+    } else {
+        var count = 0;
+        item.eachChild(function (pNode) {
+            count++;
+        });
+        top.Ext.getCmp('totalAmountOfTousses').setValue(parseInt(top.Ext.getCmp('totalAmountOfTousses').getValue(), 10) - count);
+    }
+    item.remove();
 }
\ No newline at end of file