Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r29182 -r29191 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29182) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29191) @@ -921,6 +921,20 @@ return true; } +// 广州市第八人民医院 篮筐重新置顶作为优先载入篮筐 +function topScannedBasket(event,that,user){ + if ( event && event.preventDefault ){ + event.preventDefault(); + }else{//IE中阻止函数器默认动作的方式 + window.event.returnValue = false; + } + if(user){ + $("#basketsUl").prepend($(that).parent().parent()); + }else { + $("#basketsUl").prepend($(that).parent()); + } +} + var btSave=false; function doSaveAction(){ if(submitCheck()){ @@ -931,7 +945,13 @@ var containerName = null; var washClassifyType = null; var sequence = null; - var classifiedItemsInfo = {}; + var classifiedItemsInfo = {}; + var sumCount = 0; + var currentCount = 0; + if($(this).find('.totalAmount').find('.sumCount')){ + sumCount = $(this).find('.totalAmount').find('.sumCount').text(); + currentCount = $(this).find('.totalAmount').find('.totalnum').text(); + } $(this).children().each(function(){ if($(this).is('input') && $(this).attr('type') == 'hidden'){ var baskethideStr = $(this).val(); @@ -959,6 +979,7 @@ obj.tousseDefinitionID = json.tousseDefinitionID; obj.idCardBarcode = json.idCardBarcode; obj.putBasketMaxAmount = json.putBasketMaxAmount; + obj.sumCount = parseInt(sumCount)-parseInt(currentCount); var isExist = false; var len = array.length; for(var j = 0;j < len;j++){ @@ -1276,15 +1297,22 @@ width = size.width; height = size.height; + + var areaWidth = width/bodyZoom*1; + var areaHeight = height/bodyZoom*1; + if(isIE()){ + areaWidth = width; + areaHeight = height; + } offsetTop = offsetTop*zoomRatio; layerIndex=layer.open({ type : 2, title : ['['+basketName + '] 已装载物品列表',true], content : 'basketLoadGoodsView.jsp?resolution=' + resolution + '&width=' + width + '&height=' + height + '&basketBarcode=' + basketBarcode + '&classifyBasketId=' + classifyBasketId, - area : [ width/bodyZoom*1 + 'px' , height/bodyZoom*1 +heightExtra + 'px'], + area : [ areaWidth + 'px' , areaHeight +heightExtra + 'px'], border : [5, 0.3, '#fff', true], closeBtn : [2 , true], - offset : [offsetTop+'px',(2600-(width/bodyZoom*1))/2+'px'] + offset : [offsetTop+'px',''] }); } function userContainer(that,sumAmount,basketName,basketBarcode,classifyBasketId,type){ @@ -1368,7 +1396,7 @@ var amountStyle = (result[i].percentage == 1)?'color:red':''; - basketElement += '' + (containerName) + '' + ''+imageButton+''; + basketElement += '' + (containerName) + '' + ''+imageButton+''; basketElement += '' + sumAmount + ''; basketElement += '
'+sumText+'
'; basketElement += ''; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r29183 -r29191 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29183) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29191) @@ -928,7 +928,7 @@ var barcodeElement = $(deleteButton).parent().prev().prev(); var amountElement = $(deleteButton).parent().prev(); var delElement = $(deleteButton).parent(); - var basketElement = $(deleteButton).parent().parent().parent(); + var basketElement = $(deleteButton).parent().parent(); var basketJSON = basketElement.find('input').eq(0); var basket = basketJSON.val()?JSON.parse(basketJSON.val()):{}; var item = hideElement.val()?JSON.parse(hideElement.val()):{}; @@ -943,7 +943,7 @@ name = item.materialName; tousseNameForMaterial = item.tousseName; $('dl[class="sed clearfix"]').each(function(){ - var basketEle = $(this).prev().prev().prev().prev().prev().prev().val() || $(this).prev().prev().prev().prev().prev().val(); + var basketEle = $(this).parent().find('input').eq(0).val(); if(basketEle !== ''){ var basketJSON = JSON.parse(basketEle); $(this).children().each(function(){ @@ -4979,7 +4979,8 @@ if(sigle){ basketGroupBarcodeArray[b_len] = item.basketBarcode; //添加篮筐 - var isBasketLoaded = false; + var isBasketLoaded = false; + var sum $("#basketsUl li").each(function(){ var hide = $(this).find('input'); var oldItem = JSON.parse(hide.val()); @@ -4991,7 +4992,7 @@ }); if(!isBasketLoaded){ - createBasketUiElement(item.basketBarcode,item.basketId,item.containerName,item.washClassifyType,item.sequence); + createBasketUiElement(item.basketBarcode,item.basketId,item.containerName,item.washClassifyType,item.sequence,false,item.sumCount); $("#scanContainerBarcodeTipUl").hide(); } } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp =================================================================== diff -u -r29182 -r29191 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 29182) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 29191) @@ -616,8 +616,8 @@ var amountElement = $(deleteButton).parent().prev(); var delElement = $(deleteButton).parent(); - var basketElement = $(deleteButton).parent().parent(); - var basketJSON = basketElement.prev().prev().prev().prev().prev(); + var basketElement = $(deleteButton).parent().parent().parent(); + var basketJSON = basketElement.find('input').eq(0); var basket = JSON.parse(basketJSON.val()); var item = JSON.parse(hideElement.val()); @@ -742,6 +742,19 @@ function refresh(){ location.reload(); } +// 广州市第八人民医院 篮筐重新置顶作为优先载入篮筐 +function topScannedBasket(event,that,user){ + if ( event && event.preventDefault ){ + event.preventDefault(); + }else{//IE中阻止函数器默认动作的方式 + window.event.returnValue = false; + } + if(user){ + $("#basketsUl").prepend($(that).parent().parent()); + }else { + $("#basketsUl").prepend($(that).parent()); + } +} function addBasketElement(msg){ var isBasketLoaded = false; var currentNode; @@ -1623,8 +1636,8 @@ $('.zhuangzai-table .box').css({'height':'1080px'}); $('.add-form').css({'top':'295px'}); $('#allIntoBasket').css({'top':'415px','left':'770px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else if(screenWidth>1270 && screenWidth<1300){ if(screenHeight<730){ $('.mbody').css({'width':'2750px','height':'1350px'}); @@ -1634,8 +1647,8 @@ $('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'}); $('.zhuangzai-table .box').css({'height':'840px'}); $('#allIntoBasket').css({'top':'315px','left':'800px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else if(screenHeight>730 && screenHeight<780){ $('.mbody').css({'width':'2600px','height':'1420px'}); $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'}); @@ -1644,8 +1657,8 @@ $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'}); $('.zhuangzai-table .box').css({'height':'890px'}); $('#allIntoBasket').css({'top':'340px','left':'770px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else if(screenHeight>790 && screenHeight<810){ $('.mbody').css({'width':'2600px','height':'1450px'}); $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'}); @@ -1654,8 +1667,8 @@ $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'}); $('.zhuangzai-table .box').css({'height':'890px'}); $('#allIntoBasket').css({'top':'460px','left':'770px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else { $('.mbody').css({'width':'2600px','height':'1900px'}); $('.data-table').css({'width':'1550px','height':'1240px','bottom':'120px','left':'56px'}); @@ -1665,8 +1678,8 @@ $('.zhuangzai-table .box').css({'height':'1200px'}); $('.add-form').css({'top':'335px'}); $('#allIntoBasket').css({'top':'460px','left':'770px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); } }else if(screenWidth>1350 && screenWidth<1370){ $('.mbody').css({'width':'2745px','height':'1360px'}); @@ -1676,8 +1689,8 @@ $('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'}); $('.zhuangzai-table .box').css({'height':'855px'}); $('#allIntoBasket').css({'top':'315px','left':'800px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else if(screenWidth>1390 && screenWidth<1450){ $('.mbody').css({'width':'2600px','height':'1460px'}); $('.data-table').css({'width':'1560px','height':'930px','bottom':'90px','left':'56px'}); @@ -1686,8 +1699,8 @@ $('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'}); $('.zhuangzai-table .box').css({'height':'920px'}); $('#allIntoBasket').css({'top':'350px','left':'800px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else if(screenWidth>1590 && screenWidth<1610){ $('.mbody').css({'width':'2720px','height':'1400px'}); $('.data-table').css({'width':'1620px','height':'900px','bottom':'80px','left':'56px'}); @@ -1696,8 +1709,8 @@ $('.zhuangzai-table').css({'width':'875px','height':'875px','bottom':'90px','right':'80px'}); $('.zhuangzai-table .box').css({'height':'870px'}); $('#allIntoBasket').css({'top':'335px','left':'800px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); }else if(screenWidth>1910 && screenWidth<1930){ $('.mbody').css({'width':'2700px','height':'1400px'}); $('.data-table').css({'width':'1620px','height':'890px','bottom':'80px','left':'56px'}); @@ -1708,8 +1721,8 @@ $('#basketsUl').find('.sed').css({'width':'600px'}); $('#basketsUl .sed .num').css({'width':'120px'}); $('#allIntoBasket').css({'top':'335px','left':'800px'}); - $('#divselect').css({'left':'50px'}); - $('#divTousseGroup').css({'left':'1060px'}); + $('#divTousseGroup').css({'left':'50px'}); + $('#divselect').css({'left':'1060px'}); } function userContainer(that,user,basketName,basketBarcode,classifyBasketId){ if ( event && event.preventDefault ){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r29173 -r29191 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 29173) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 29191) @@ -269,12 +269,8 @@ $('.zhuangzai-table').css({'width':'820px','height':'1100px','bottom':'90px','right':'80px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1040px','height':'740px'}); - $('.data-table').css({'width':'610px','height':(height-298)+'px','top':'210px','left':'25px'}); - $('.data-table .box').css({'height':(height-388)+'px'}); - $('#tousseItemTable').css({'width':'590px'}); - $('.zhuangzai-table').css({'width':'340px','height':(height-338)+'px','top':'230px','right':'30px'}); + var zoom = calculateZoomRatio(2600,1400,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else if(screenWidth>1270 && screenWidth<1300){ if(screenHeight<730){ @@ -284,12 +280,8 @@ $('#tousseItemTable').css({'width':'1610px'}); $('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1280px','height':'700px'}); - $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'}); - $('.data-table .box').css({'height':(height-408)+'px'}); - $('#tousseItemTable').css({'width':'780px'}); - $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1450,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else if(screenHeight>730 && screenHeight<780){ $('.mbody').css({'width':'2600px','height':'1420px'}); @@ -299,12 +291,8 @@ $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1280px','height':'700px'}); - $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'}); - $('.data-table .box').css({'height':(height-408)+'px'}); - $('#tousseItemTable').css({'width':'780px'}); - $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1400,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else if(screenHeight>790 && screenHeight<810){ $('.mbody').css({'width':'2600px','height':'1420px'}); @@ -314,12 +302,8 @@ $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1280px','height':'700px'}); - $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'}); - $('.data-table .box').css({'height':(height-408)+'px'}); - $('#tousseItemTable').css({'width':'780px'}); - $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1400,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else { $('.mbody').css({'width':'2600px','height':'1900px'}); @@ -329,12 +313,8 @@ $('.zhuangzai-table').css({'width':'840px','height':'1200px','bottom':'115px','right':'70px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1280px','height':'1000px'}); - $('.data-table').css({'width':'780px','height':(height-388)+'px','top':'280px','left':'20px'}); - $('.data-table .box').css({'height':(height-478)+'px'}); - $('#tousseItemTable').css({'width':'780px'}); - $('.zhuangzai-table').css({'width':'410px','height':(height-408)+'px','top':'310px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1430,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } } }else if(screenWidth>1350 && screenWidth<1370){ @@ -345,12 +325,8 @@ $('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1370px','height':'700px'}); - $('.data-table').css({'width':'810px','height':(height-318)+'px','top':'210px','left':'40px'}); - $('.data-table .box').css({'height':(height-408)+'px'}); - $('#tousseItemTable').css({'width':'790px'}); - $('.zhuangzai-table').css({'width':'440px','height':(height-318)+'px','top':'220px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1430,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else if(screenWidth>1390 && screenWidth<1450){ $('.mbody').css({'width':'2600px','height':'1460px'}); @@ -360,12 +336,8 @@ $('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1440px','height':'900px'}); - $('.data-table').css({'width':'850px','height':(height-348)+'px','top':'250px','left':'40px'}); - $('.data-table .box').css({'height':(height-438)+'px'}); - $('#tousseItemTable').css({'width':'790px'}); - $('.zhuangzai-table').css({'width':'460px','height':(height-378)+'px','top':'280px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1430,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else if(screenWidth>1590 && screenWidth<1610){ $('.mbody').css({'width':'2720px','height':'1353px'}); @@ -375,12 +347,8 @@ $('.zhuangzai-table').css({'width':'875px','height':'835px','bottom':'90px','right':'80px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1600px','height':'900px'}); - $('.data-table').css({'width':'960px','height':(height-348)+'px','top':'250px','left':'40px'}); - $('.data-table .box').css({'height':(height-438)+'px'}); - $('#tousseItemTable').css({'width':'940px'}); - $('.zhuangzai-table').css({'width':'510px','height':(height-378)+'px','top':'280px','right':'40px'}); + var zoom = calculateZoomRatio(2600,1430,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }else if(screenWidth>1910 && screenWidth<1930){ $('.mbody').css({'width':'2700px','height':'1400px'}); @@ -389,12 +357,8 @@ $('#tousseItemTable').css({'width':'1600px'}); $('.zhuangzai-table').css({'width':'875px','height':'850px','bottom':'90px','right':'75px'}); if(isIE()){ - var height = htmlHeight + 100; - $('.mbody').css({'width':'1920px','height':'1062px'}); - $('.data-table').css({'width':'1150px','height':(height-408)+'px','top':'310px','left':'40px'}); - $('.data-table .box').css({'height':(height-498)+'px'}); - $('#tousseItemTable').css({'width':'1130px'}); - $('.zhuangzai-table').css({'width':'620px','height':(height-428)+'px','top':'330px','right':'60px'}); + var zoom = calculateZoomRatio(2600,1462,window.screen.availWidth,window.screen.availHeight); + $('.mbody').css('zoom',zoom); } }