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;
+ }
+