Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js =================================================================== diff -u -r27107 -r27709 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27107) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 27709) @@ -706,7 +706,67 @@ if(tousseType==PACKAGE_TYPE_SPLIT|| tousseType==PACKAGE_TYPE_FOREIGN){ hasForeignTousse = true; } - var trElement = $(''+ + + var td_width_0 = '',td_width_1 = '',td_width_2 = '',td_width_3 = '',td_width_5 = '',td_width_7 = '',td_width_8 = ''; + + if(screenWidth == 1024){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + }else if(screenWidth == 1280 && screenHeight == 720){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + }else if(screenWidth == 1280 && screenHeight == 800){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + }else if(screenWidth == 1366 || screenWidth == 1360){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + }else if(screenWidth == 1600 && screenHeight == 900){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + }else if(screenWidth == 1280 && screenHeight == 1024){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + }else if(screenWidth == 1920){ + td_width_0 = '200px'; + td_width_1 = '260px'; + td_width_2 = '480px'; + td_width_3 = '100px'; + td_width_5 = '100px'; + td_width_7 = '100px'; + td_width_8 = '160px'; + } + var trElement = $(''+ ''+ ''+ '' + @@ -718,14 +778,14 @@ ''+ ''+ '' + idCardBarcode + '' + - '' + tousseName + '' + - ''+ - ''+ + '' + tousseName + '' + + ''+ + ''+ '+'+ - ''+ + ''+ '-'+ - ''+ - '入筐'+ + ''+ + '入筐'+ ''); $("#tousseItemTable").append(trElement); return true; Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r27594 -r27709 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27594) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 27709) @@ -101,7 +101,7 @@ .add-form .remark{ width:100%; height:61px; - top: 104px !important; + top: 104px; } .add-form .remark font{ height: 61px; @@ -140,6 +140,14 @@ .lightbox dd{ padding:20px; margin:0;} + <% String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); String orgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName(); @@ -330,10 +338,29 @@ *{ font-size: 23px; } + .bgImg { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; + } + #scanContainerBarcodeTipUl { + height: 99%; + } + .data-table { + left: 55px; + } + .zhuangzai-table { + height: 795px; + bottom: 76px; + right: 66px; + }
+
@@ -422,7 +449,7 @@
-
+
  • 请扫描篮筐条码
@@ -439,6 +466,104 @@ + Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r27589 -r27709 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27589) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 27709) @@ -3890,7 +3890,7 @@ var url = encodeURI(WWWROOT+'/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data='+data+'&resolution=1980' + '&tousseIntoBasketInfo=' + tousseIntoBasketInfo + '&recyclingApplicationId=' + $('#recyclingApplicationId').val()); var style='menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=yes,top=100,left=100,width=1400,height=800,scrollbars=null'; - var popwin=window.open(url,"customIntoBasket",style); + var popwin=openFullSizeWindowWithName(url,true,'自定义入框'); }else{ alertDiv("没有符合条件待装载的物品!"); } Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp =================================================================== diff -u -r26864 -r27709 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 26864) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp (.../customIntoBasket.jsp) (revision 27709) @@ -87,6 +87,33 @@ overflow:hidden; margin: 0px; } +.bgImg { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; +} +.mbody { + width: 100%; + height: 100%; + background: none; + position: absolute; + left: 0; + top: 0; +} +.data-table .input-a { + background: #Fff !important; + width: 95% !important; + padding-right: 5px; +} +.data-table .input-b { + background: #Fff !important; + width: 100% !important; +} +.data-table td { + padding-left: 5px; +}