Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js
===================================================================
diff -u -r41400 -r41448
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js	(.../expressRecycleForTouchScreen.js)	(revision 41400)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.js	(.../expressRecycleForTouchScreen.js)	(revision 41448)
@@ -13,6 +13,9 @@
     isSecondSupplyRoom = true;
 }
 
+var applyTimeHidden = true;
+var applyTimeText = '申请时间';
+
 layer.config({
     extend: 'myskin/style.css', //加载您的扩展样式
     skin: 'layer-ext-myskin'
@@ -27,36 +30,6 @@
 //高亮层不锁定
 function lockout(e) { e.stopPropagation(); }
 
-function changeRatio(type) {
-    var ratio = 0;
-    var screen = window.screen;
-    var ua = navigator.userAgent.toLowerCase();
-
-    if (window.devicePixelRatio !== undefined) {
-        ratio = window.devicePixelRatio;
-    } else if (~ua.indexOf('msie')) {
-        if (screen.deviceXDPI && screen.logicalXDPI) {
-            ratio = screen.deviceXDPI / screen.logicalXDPI;
-        }
-    } else if (window.outerWidth !== undefined && window.innerWidth !== undefined) {
-        ratio = window.outerWidth / window.innerWidth;
-    }
-
-    if (ratio) {
-        ratio = Math.round(ratio * 100);
-    }
-    var value;
-    if (type == 'width') {
-        var width = window.screen.width;
-        value = width * ratio / 100;
-    } else {
-        var height = window.screen.height;
-        value = height * ratio / 100;
-    }
-
-    return parseInt(value);
-}
-
 function alertDiv(alertWord, hideCloseButton) {
     lock = true;
     document.getElementById("showWord").innerHTML = alertWord;
@@ -218,7 +191,7 @@
 
 function unloadStaff(name, amount, applicationId) {
     if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        $('#tousseItemTable').children().first().children().each(function (row, element) {
+        $('#tousseItemTbody').children().first().children().each(function (row, element) {
             var childCount = $('#childCount' + row).val();
             var parentLoadedAmount = $('#loadedAmount' + row).val();
             for (var i = 0; i < childCount; i++) {
@@ -237,7 +210,7 @@
             }
         });
     } else {
-        $('#tousseItemTable').children().first().children().each(function (i, element) {
+        $('#tousseItemTbody').children().first().children().each(function (i, element) {
             if ($('#tousseName' + i).val() == name && applicationId == $('#applicationId' + i).val()) {
                 var newLoadedAmount = parseInt($('#loadedAmount' + i).val(), 10) - parseInt(amount, 10);
                 $('#loadedAmount' + i).val(newLoadedAmount);
@@ -396,7 +369,7 @@
 
 //清理视图列表
 function cleanTableList() {
-    $("#tousseItemTable").empty();
+    $("#tousseItemTbody").empty();
     $("#basketsUl").empty();
 }
 
@@ -506,11 +479,11 @@
             imageButton = '<img src="/images/btn_query.png" onclick = "basketLoadGoods(\'' + basketItem.containerName + '\',\'' + basketItem.containerBarcode + '\',\'' + basketItem.id + '\');" >';
         }
         var containerColorCode = basketItem.containerColorCode || '';
-		var containerFontColor = setFontColor(containerColorCode)
+        var containerFontColor = setFontColor(containerColorCode)
         var basketElement = '';
-        if(containerColorCode !== ''){
-            basketElement += '<li style="background:'+containerColorCode+';color:'+containerFontColor+'">';
-        }else {
+        if (containerColorCode !== '') {
+            basketElement += '<li style="background:' + containerColorCode + ';color:' + containerFontColor + '">';
+        } else {
             basketElement += '<li>';
         }
         basketElement += '<input type="hidden">';
@@ -553,8 +526,8 @@
                     //不装配的篮筐不能回收扫描
                     var containerStatus = msg.basketStatus;
                     //GDSKQYY-30：篮筐颜色
-					var containerColorCode = msg.containerColorCode;
-					msg.basket.containerColorCode = containerColorCode;
+                    var containerColorCode = msg.containerColorCode;
+                    msg.basket.containerColorCode = containerColorCode;
                     if (containerStatus == "清洗完成" || containerStatus == "清洗中") {
                         $("#dialogConfirm").dialog({
                             resizable: false,
@@ -618,37 +591,8 @@
     if (showName.length > 12) {
         str = showName.substring(0, 12) + "...";
     }
-    var screenWidth = changeRatio('width');
-    var screenHeight = changeRatio('height');
     var nameWidth = 'auto';
     var numWidth = 'auto';
-    if (screenWidth < 1030) {
-        nameWidth = 'width:560px';
-    } else if (screenWidth > 1270 && screenWidth < 1300) {
-        if (screenHeight < 730) {
-            nameWidth = 'width:595px';
-            numWidth = 'width:120px';
-        } else if (screenHeight > 730 && screenHeight < 780) {
-            nameWidth = 'width:570px';
-            numWidth = 'width:95px';
-        } else if (screenHeight > 790 && screenHeight < 810) {
-            nameWidth = 'width:575px';
-            numWidth = 'width:90px';
-        } else {
-            nameWidth = 'width:590px';
-        }
-    } else if (screenWidth > 1350 && screenWidth < 1370) {
-        nameWidth = 'width:600px';
-        numWidth = 'width:115px';
-    } else if (screenWidth > 1390 && screenWidth < 1450) {
-        nameWidth = 'width:580px';
-    } else if (screenWidth > 1590 && screenWidth < 1610) {
-        nameWidth = 'width:600px';
-        numWidth = 'width:115px';
-    } else if (screenWidth > 1910 && screenWidth < 1930) {
-        nameWidth = 'width:600px';
-        numWidth = 'width:120px';
-    }
     var element = '<input type="hidden" value="">';
     element += '<dd class="name" style="' + nameWidth + '">' + str + '</dd>';
     element += '<dd class="num" style="' + numWidth + '">' + amount + '</dd>';
@@ -676,7 +620,7 @@
 
     setTimeout(function () {
         var amountArray = [];
-        var length = $('#tousseItemTable').find('tbody tr').length;
+        var length = $('#tousseItemTbody').find('tr').length;
         if ($('#basketsUl').children().length == 0) {
             alertDiv('请先扫描篮筐条码。');
             layer.close(index);
@@ -875,6 +819,7 @@
     var tousseItemId = paramsItem.tousseItemId || '';
     var tousseName = paramsItem.tousseName || '';
     var applicationAmount = paramsItem.applicationAmount || '';
+    var applicationTime = paramsItem.applicationTime || '';
     var recycleAmount = paramsItem.recycleAmount || '';
     var loadedAmount = paramsItem.loadedAmount || '';
     var isApplyEntireTousse = paramsItem.isApplyEntireTousse || '';
@@ -888,7 +833,7 @@
     var itemLevel = paramsItem.itemLevel;
     var childRow = paramsItem.childRow || 0;
     var childCount = paramsItem.childCount || 0;
-
+    var applicationDate = new Date(applicationTime.time).Format("yyyy-M-d h:m");
     var showTousseName = tousseName;
     var _index = tousseName.indexOf('_');
     if (_index >= 0) {
@@ -907,84 +852,14 @@
         reduceButton = '<a href="javascript:void(0);" class="minus" onclick="">-</a>';
         onclickFun = '';
     }
-    var screenWidth = changeRatio('width');
-    var screenHeight = changeRatio('height');
-    var td0 = '210px';
-    var td1 = '300px';
-    var td2 = '44px';
-    var td3 = 'auto';
-    var td4 = 'auto';
-    var td5 = 'auto';
-    var td6 = 'auto';
-    var td7 = 'auto';
+    var td0 = '15%';
+    var td1 = '35%';
+    var td2 = '10%';
+    var td3 = '5%';
+    var td4 = '10%';
+    var td5 = '5%';
+    var td6 = '15%';
 
-    if (screenWidth < 1030) {
-        td0 = '300px';
-        td1 = '490px';
-        td2 = '150px';
-        td3 = '55px';
-        td4 = '80px';
-        td6 = '110px';
-    } else if (screenWidth > 1270 && screenWidth < 1300) {
-        if (screenHeight < 730) {
-            td0 = '320px';
-            td1 = '600px';
-            td2 = '150px';
-            td3 = '55px';
-            td4 = '80px';
-            td6 = '110px';
-        } else if (screenHeight > 730 && screenHeight < 780) {
-            td0 = '320px';
-            td1 = '550px';
-            td2 = '150px';
-            td3 = '55px';
-            td4 = '80px';
-            td6 = '110px';
-        } else if (screenHeight > 790 && screenHeight < 810) {
-            td0 = '320px';
-            td1 = '550px';
-            td2 = '150px';
-            td3 = '55px';
-            td4 = '80px';
-            td6 = '110px';
-        } else {
-            td0 = '320px';
-            td1 = '550px';
-            td2 = '150px';
-            td3 = '55px';
-            td4 = '80px';
-            td6 = '110px';
-        }
-    } else if (screenWidth > 1350 && screenWidth < 1370) {
-        td0 = '320px';
-        td1 = '550px';
-        td2 = '150px';
-        td3 = '55px';
-        td4 = '80px';
-        td6 = '110px';
-    } else if (screenWidth > 1390 && screenWidth < 1450) {
-        td0 = '320px';
-        td1 = '550px';
-        td2 = '150px';
-        td3 = '55px';
-        td4 = '80px';
-        td6 = '110px';
-    } else if (screenWidth > 1590 && screenWidth < 1610) {
-        td0 = '320px';
-        td1 = '550px';
-        td2 = '150px';
-        td3 = '55px';
-        td4 = '80px';
-        td6 = '110px';
-    } else if (screenWidth > 1910 && screenWidth < 1930) {
-        td0 = '320px';
-        td1 = '550px';
-        td2 = '150px';
-        td3 = '55px';
-        td4 = '80px';
-        td6 = '110px';
-    }
-
     var html = '';
     if (itemLevel == 1) {
         html += '<tr>';
@@ -995,7 +870,7 @@
     }
     html += '<td width="' + td0 + '" style="font-size: 25px;">';
     if (itemLevel == 1) {
-        html += '<div style="font-size: 30px;font-weight: bold;">' + depart + '</div>';
+        html += '<div style="font-size: 25px;font-weight: bold;">' + depart + '</div>';
     } else if (itemLevel == 2) {
         html += '<input type="hidden" id="childCount' + row + '" name="childCount' + row + '" value="' + childCount + '"/>';
         html += '<div style="color:blue;font-weight: bold;cursor: pointer;" onclick="expandAllTousse(this,' + row + ')">' + depart + '</div>';
@@ -1021,21 +896,30 @@
     }
     html += '</td>';
     if (itemLevel !== 1) {
-        html += '<td width="' + td1 + '"><input id="showTousseName' + row + '" name="showTousseName' + row + '" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" value="' + showTousseName + '"/></td>' +
-            '<td width="' + td2 + '"><input id="applicationAmount' + row + '" name="applicationAmount' + row + '" type="text" readonly="readonly" class="input-b" value="' + applicationAmount + '"/></td>' +
-            '<td width="' + td3 + '">' + addButton + '</td>' +
-            '<td width="' + td4 + '"><input id="recycleAmount' + row + '" name="recycleAmount' + row + '" type="text" readonly="readonly" onblur="" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="' + recycleAmount + '"/></td>' +
-            '<td width="' + td5 + '" style="padding: 0;"><input id="loadedAmount' + row + '" type="hidden" name="loadedAmount' + row + '" type="text" readonly="readonly" class="input-b" value="' + loadedAmount + '"/></td>' +
-            '<td width="' + td6 + '">' + reduceButton + '</td>';
+        if (!applyTimeHidden && departExpressRecycling == '') {
+            html += '<td width="' + td0 + '">' + applicationDate + '</td>';
+        }
+        html += '<td width="' + td1 + '"><input id="showTousseName' + row + '" name="showTousseName' + row + '" type="text" readonly="readonly"  onfocus="this.blur();" class="input-a" value="' + showTousseName + '"/></td>';
+        html += '<td width="' + td2 + '"><input id="applicationAmount' + row + '" name="applicationAmount' + row + '" type="text" readonly="readonly" class="input-b" value="' + applicationAmount + '"/></td>';
+        html += '<td width="' + td3 + '">' + addButton + '</td>';
+        html += '<td width="' + td4 + '"><input id="recycleAmount' + row + '" name="recycleAmount' + row + '" type="text" readonly="readonly" onblur="" ' + onclickFun + ' onkeyup="validateNumber(this);" class="input-b" value="' + recycleAmount + '"/></td>';
+        html += '<td width="' + td5 + '">' + reduceButton + '</td>';
         if (itemLevel == 2) {
-            html += '<td width="' + td7 + '"><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasketForChild(\'' + row + '\');refreshAllBasketTotalNum();">入筐</a></td>';
+            html += '<td width="' + td6 + '"><a href="javascript:void(0);" class="btn-a" style="display:inline-block;" onclick="putTousseInTheBasketForChild(\'' + row + '\');refreshAllBasketTotalNum();">入筐</a></td>';
         } else {
-            html += '<td width="' + td7 + '"><a href="javascript:void(0);" class="btn-a" style="display:block;" onclick="putTousseInTheBasket(\'' + row + '\');refreshAllBasketTotalNum();">入筐</a></td>';
+            html += '<td width="' + td6 + '"><a href="javascript:void(0);" class="btn-a" style="display:inline-block;" onclick="putTousseInTheBasket(\'' + row + '\');refreshAllBasketTotalNum();">入筐</a></td>';
         }
+    } else {
+        html += '<td width="' + td1 + '"></td>';
+        html += '<td width="' + td2 + '"></td>';
+        html += '<td width="' + td3 + '"></td>';
+        html += '<td width="' + td4 + '"></td>';
+        html += '<td width="' + td5 + '"></td>';
+        html += '<td width="' + td6 + '"></td>';
     }
     html += '</tr>';
     var trElement = $(html);
-    $("#tousseItemTable").append(trElement);
+    $("#tousseItemTbody").append(trElement);
 
     return true;
 }
@@ -1080,7 +964,7 @@
         return false;
     }
     if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        $('#tousseItemTable').children().first().children().each(function (row, element) {
+        $('#tousseItemTbody').children().first().children().each(function (row, element) {
             var childCount = $('#childCount' + row).val();
             for (var i = 0; i < childCount; i++) {
                 var deleted = $('#deleted' + row + '_' + i).val();
@@ -1105,7 +989,7 @@
             }
         });
     } else {
-        $('#tousseItemTable').children().first().children().each(function (index, element) {
+        $('#tousseItemTbody').children().first().children().each(function (index, element) {
             var deleted = $('#deleted' + index).val()
             var recycleAmount = parseInt($('#recycleAmount' + index).val(), 10);
             var loadedAmount = parseInt($('#loadedAmount' + index).val(), 10);
@@ -1641,7 +1525,7 @@
 }
 
 function loadItem() {
-    $("#tousseItemTable").empty();
+    $("#tousseItemTbody").empty();
     $("#basketsUl").empty();
     $("#loadingPutBasket").empty();
     document.onkeydown = showKeyDown;
@@ -1855,17 +1739,17 @@
                     var text = '';
                     var sumText = '';
                     var containerColorCode = result[i].containerColorCode || '';
-					var containerFontColor = setFontColor(containerColorCode)
+                    var containerFontColor = setFontColor(containerColorCode)
                     for (var j = 0; j < result[i].classifiedItems.length; j++) {
                         var name = result[i].classifiedItems[j].name;
                         var amount = result[i].classifiedItems[j].amount;
                         sumAmount += parseInt(amount);
                         text += name + '*' + amount + '，';
                     }
                     var basketElement = '';
-                    if(containerColorCode !== ''){
-                        basketElement += '<li style="background:'+containerColorCode+';color:'+containerFontColor+'">';
-                    }else {
+                    if (containerColorCode !== '') {
+                        basketElement += '<li style="background:' + containerColorCode + ';color:' + containerFontColor + '">';
+                    } else {
                         basketElement += '<li>';
                     }
                     basketElement += '<input type="hidden">';
@@ -1920,118 +1804,39 @@
     $.divselect("#divTousseGroup", "#tousseGroupSelect");
     if (sstsConfig.recycleAllTousseIntoBasketInExpressRecycle) {
         $('#allIntoBasket').show();
+        var originalSrc = '1980/images/allIntoBasket.png'
+        var newSrc = '1980/images/allIntoBaskehovert.png'
+        var allIntoBasketImg = document.getElementById('allIntoBasketImg');
+        // 监听鼠标移入事件
+        allIntoBasketImg.addEventListener('mouseenter', function () {
+            this.src = newSrc;
+        });
+
+        // 监听鼠标移出事件
+        allIntoBasketImg.addEventListener('mouseleave', function () {
+            this.src = originalSrc;
+        });
     } else {
         $('#allIntoBasket').hide();
     }
-    var screenWidth = changeRatio('width');
-    var screenHeight = changeRatio('height');
-    $('.mbody').css('width', '100%');
-    var width = 2600;
-    if (screenWidth < 1030) {
-        $('.mbody').css({ 'width': width + 'px', 'height': '1717px' });
-        $('.data-table').css({ 'width': '1450px', 'height': '1110px', 'bottom': '100px', 'left': '160px' });
-        $('.data-table .box').css({ 'height': '1030px' });
-        $('#tousseItemTable').css({ 'width': '1520px' });
-        $('.zhuangzai-table').css({ 'width': '820px', 'height': '1100px', 'bottom': '90px', 'right': '80px' });
-        $('.zhuangzai-table .box').css({ 'height': '1080px' });
-        $('.add-form').css({ 'top': '295px' });
-        $('#allIntoBasket').css({ 'top': '195px', 'left': '1234px' });
-        $('#divTousseGroup').css({ 'left': '50px' });
-        $('#divselect').css({ 'left': '1060px' });
-    } else if (screenWidth > 1270 && screenWidth < 1300) {
-        if (screenHeight < 730) {
-            width = 2750;
-            $('.mbody').css({ 'width': width + 'px', 'height': '1350px' });
-            $('.data-table').css({ 'width': '1630px', 'height': '860px', 'bottom': '80px', 'left': '56px' });
-            $('.data-table .box').css({ 'height': '780px' });
-            $('#tousseItemTable').css({ 'width': '1350px' });
-            $('.zhuangzai-table').css({ 'width': '880px', 'height': '840px', 'bottom': '90px', 'right': '80px' });
-            $('.zhuangzai-table .box').css({ 'height': '840px' });
-            $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-            $('#divTousseGroup').css({ 'left': '50px' });
-            $('#divselect').css({ 'left': '1060px' });
-        } else if (screenHeight > 730 && screenHeight < 780) {
-            $('.mbody').css({ 'width': width + 'px', 'height': '1420px' });
-            $('.data-table').css({ 'width': '1540px', 'height': '920px', 'bottom': '80px', 'left': '56px' });
-            $('.data-table .box').css({ 'height': '840px' });
-            $('#tousseItemTable').css({ 'width': '1350px' });
-            $('.zhuangzai-table').css({ 'width': '825px', 'height': '890px', 'bottom': '90px', 'right': '80px' });
-            $('.zhuangzai-table .box').css({ 'height': '890px' });
-            $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-            $('#divTousseGroup').css({ 'left': '50px' });
-            $('#divselect').css({ 'left': '1060px' });
-        } else if (screenHeight > 790 && screenHeight < 810) {
-            $('.mbody').css({ 'width': width + 'px', 'height': '1450px' });
-            $('.data-table').css({ 'width': '1540px', 'height': '920px', 'bottom': '80px', 'left': '56px' });
-            $('.data-table .box').css({ 'height': '840px' });
-            $('#tousseItemTable').css({ 'width': '1350px' });
-            $('.zhuangzai-table').css({ 'width': '825px', 'height': '890px', 'bottom': '90px', 'right': '80px' });
-            $('.zhuangzai-table .box').css({ 'height': '890px' });
-            $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-            $('#divTousseGroup').css({ 'left': '50px' });
-            $('#divselect').css({ 'left': '1060px' });
-        } else {
-            $('.mbody').css({ 'width': width + 'px', 'height': '1900px' });
-            $('.data-table').css({ 'width': '1550px', 'height': '1240px', 'bottom': '120px', 'left': '56px' });
-            $('.data-table .box').css({ 'height': '1160px' });
-            $('#tousseItemTable').css({ 'width': '1350px' });
-            $('.zhuangzai-table').css({ 'width': '840px', 'height': '1200px', 'bottom': '115px', 'right': '70px' });
-            $('.zhuangzai-table .box').css({ 'height': '1200px' });
-            $('.add-form').css({ 'top': '335px' });
-            $('#allIntoBasket').css({ 'top': '215px', 'left': '1234px' });
-            $('#divTousseGroup').css({ 'left': '50px' });
-            $('#divselect').css({ 'left': '1060px' });
+    applyTimeHidden = true;
+    applyTimeText = '申请时间';
+    //BJDXZLYY-62：扩展字段
+    var expandFieldsConfigOfeExpressRecycle = sstsConfig.expandFieldsConfigOfeExpressRecycle || [];
+    if (expandFieldsConfigOfeExpressRecycle.length > 0) {
+        for (var i = 0; i < expandFieldsConfigOfeExpressRecycle.length; i++) {
+            if (expandFieldsConfigOfeExpressRecycle[i].fieldName == 'applyTime') {
+                applyTimeHidden = false;
+                applyTimeText = expandFieldsConfigOfeExpressRecycle[i].displayText;
+            }
         }
-    } else if (screenWidth > 1350 && screenWidth < 1370) {
-        width = 2745;
-        $('.mbody').css({ 'width': width + 'px', 'height': '1360px' });
-        $('.data-table').css({ 'width': '1660px', 'height': '860px', 'bottom': '90px', 'left': '56px' });
-        $('.data-table .box').css({ 'height': '780px' });
-        $('#tousseItemTable').css({ 'width': '1350px' });
-        $('.zhuangzai-table').css({ 'width': '880px', 'height': '850px', 'bottom': '90px', 'right': '90px' });
-        $('.zhuangzai-table .box').css({ 'height': '855px' });
-        $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-        $('#divTousseGroup').css({ 'left': '50px' });
-        $('#divselect').css({ 'left': '1060px' });
-    } else if (screenWidth > 1390 && screenWidth < 1450) {
-        $('.mbody').css({ 'width': width + 'px', 'height': '1460px' });
-        $('.data-table').css({ 'width': '1560px', 'height': '930px', 'bottom': '90px', 'left': '56px' });
-        $('.data-table .box').css({ 'height': '850px' });
-        $('#tousseItemTable').css({ 'width': '1350px' });
-        $('.zhuangzai-table').css({ 'width': '830px', 'height': '920px', 'bottom': '90px', 'right': '80px' });
-        $('.zhuangzai-table .box').css({ 'height': '920px' });
-        $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-        $('#divTousseGroup').css({ 'left': '50px' });
-        $('#divselect').css({ 'left': '1060px' });
-    } else if (screenWidth > 1590 && screenWidth < 1690) {
-        width = 2720;
-        $('.mbody').css({ 'width': width + 'px', 'height': '1400px' });
-        $('.data-table').css({ 'width': '1620px', 'height': '900px', 'bottom': '80px', 'left': '56px' });
-        $('.data-table .box').css({ 'height': '820px' });
-        $('#tousseItemTable').css({ 'width': '1350px' });
-        $('.zhuangzai-table').css({ 'width': '875px', 'height': '875px', 'bottom': '90px', 'right': '80px' });
-        $('.zhuangzai-table .box').css({ 'height': '870px' });
-        $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-        $('#divTousseGroup').css({ 'left': '50px' });
-        $('#divselect').css({ 'left': '1060px' });
-    } else if (screenWidth > 1910 && screenWidth < 1930) {
-        width = 2700;
-        $('.mbody').css({ 'width': width + 'px', 'height': '1400px' });
-        $('.data-table').css({ 'width': '1620px', 'height': '890px', 'bottom': '80px', 'left': '56px' });
-        $('.data-table .box').css({ 'height': '810px' });
-        $('#tousseItemTable').css({ 'width': '1350px' });
-        $('.zhuangzai-table').css({ 'width': '875px', 'height': '880px', 'bottom': '85px', 'right': '75px' });
-        $('.zhuangzai-table .box').css({ 'height': '890px' });
-        $('#basketsUl').find('.sed').css({ 'width': '600px' });
-        $('#basketsUl .sed .num').css({ 'width': '120px' });
-        $('#allIntoBasket').css({ 'top': '160px', 'left': '1234px' });
-        $('#divTousseGroup').css({ 'left': '50px' });
-        $('#divselect').css({ 'left': '1060px' });
     }
-    var actualWidth = window.screen.availWidth;
-    var actualHeight = window.screen.availHeight;
-    var bodyZoom = calculateZoomRatio(2600, 1462, actualWidth, actualHeight);
-    $('.mbody').css('zoom', bodyZoom);
+    if (departExpressRecycling == '') {
+        if (!applyTimeHidden) {
+            $('#theadNameByApplyTimeName').show();
+            $('#theadNameByApplyTimeName').text(applyTimeText);
+        }
+    }
 }
 
 $(function () {
@@ -2054,12 +1859,14 @@
     if (!sstsConfig.showBlankPageWhenOpenExpressRecyclePage) {
         loadItem();
     }
-
     if (sstsConfig.enableAddQuickTecoveryOptionForDepartments && departExpressRecycling == 'departExpressRecycling') {
-        $('#divTousseGroup').hide();
         $('#currentDepart').show();
-        $('#divselect').hide();
         $('#changeDepart').show();
         openSelectDepart(3);
+        $('#theadNameByDepartName').text('日期/流水号')
+    } else {
+        $('#divTousseGroup').show();
+        $('#divselect').show();
+        $('#theadNameByDepartName').text('科室名称')
     }
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js
===================================================================
diff -u -r41130 -r41448
--- ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js	(.../config.js)	(revision 41130)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bjdxzlyy/config.js	(.../config.js)	(revision 41448)
@@ -242,6 +242,8 @@
 OCRServerAddress: 'http://192.168.2.229:5000',
 //启用自定义报表显示选项内容功能
 enableCustomReportDisplayOptions:true,
+//快速回收功能扩展字段配置
+expandFieldsConfigOfeExpressRecycle:[{"fieldName":"applyTime","displayText":"申请时间"}],
 //启用第三方标识牌条码功能
 enbaleThirdPartyIdCard:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r40935 -r41448
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 40935)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp	(.../expressRecycleForTouchScreen.jsp)	(revision 41448)
@@ -37,6 +37,8 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <link rel="stylesheet" href="${ctx}/js/magnificPopup/magnific-popup.css"> 
 <link rel="stylesheet" href="${ctx}/jquery/jquery-ui-1.10.2/css/south-street/jquery-ui-1.10.2.custom.css" type="text/css" />
+<!-- alertDIV -->
+<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/expressStyle.css?version=${svnRevision}" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="${ctx}/disinfectsystem/touchScreen/recycle/js/divselect.js?version=${svnRevision}"></script>
 <script>
 	layer.config({
@@ -83,33 +85,49 @@
 	}
 	.add-form {
 		position: relative !important;
+		top: 12%;
+		left: 2%;
+		width: 60.7%;
+		height: 9%;
 	}
+	.data-table .image-box .box {
+		display: block;
+		height: 90%;
+		background: none;
+	}
 	#divselect{
 		margin: 0 !important;
 		position: absolute !important;
+		right: 2%;
+    	bottom: 10px;
+		display: none;
 	}
 	#divTousseGroup{
 		margin: 0 !important;
 		position: absolute !important;
+		bottom: 10px;
+    	left: 2%;
 		display: none;
 	}
 	.zhuangzai-table .sumCount {
 		margin-left: 0 !important;
 	}
 	#currentDepart {
 		position: absolute !important;
-		left: 0;
-		font-size: 30px;
+		left: 10px;
+		font-size: 28px;
 		color: #fff;
+		bottom: 10px;
 		display: none;
 	}
 	#changeDepart {
 		position: absolute !important;
-		left: 1060px;
+		right: 8%;
+    	bottom: 10px;
 		display: none;
 	}
 	#changeDepart img {
-		height: 55px;
+		height: 40px;
 	}
 	
 	.tousseTable {
@@ -136,21 +154,109 @@
 	.tabClass {
 		color: blue;
 	}
+
+	.data-table {
+		position: relative;
+		width: 60.7%;
+		height: 74%;
+		left: 1.9%;
+		top: 12%;
+	}
+	.data-table .image-box {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 90%;
+		background: none;
+		overflow: hidden;
+	}
+	.data-table .image-box table {
+		margin: 0;
+		width: 100%;
+		height: 100%;
+	}
+	.data-table .btn-box {
+		position: absolute;
+		left: 0;
+		bottom: 0%;
+		width: 100%;
+		height: 12%;
+		text-align: center;
+	}
+	.data-table .btn-box img {
+		width: 100px;
+	}
+	.data-table .input-a {
+		width: 319px;
+	}
+
+	.data-table .image-box table thead, tbody tr {
+		display: table;
+		table-layout: fixed;
+		width: 100%;
+		height: 7%;
+		text-align: center;
+	}
+	.data-table .image-box table tbody tr {
+		height: 40px;
+	}
+
+	.image-box table .title th,.image-box table td{
+		font-size: 16px;
+	}
+
+	.zhuangzai-table {
+		position: absolute;
+		right: 2.7%;
+		top: 26%;
+		width: 32.8%;
+		height: 68%;
+	}
+	.zhuangzai-table .box {
+		height: 655px;
+	}
+	.zhuangzai-table .box {
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.zhuangzai-table table {
+		width: 100%;
+		border: 0;
+		height: 7%;
+		background: #Fff;
+	}
+	.data-table .box {
+		overflow: hidden;
+	}
+	#tousseItemTbody {
+		overflow-y: scroll;
+	}
+	#allIntoBasket {
+		display: none;
+		right: 22%;
+		bottom: 10px;
+	}
+	#allIntoBasket img {
+		height: 40px;
+		cursor: pointer;
+	}
 </style>
 
 <style>
-	#divselect{width:300px; margin:-53px 700px; position:relative; z-index:10000;}
-	#divselect cite{width:250px; height:50px;line-height:50px;font-size:30px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
-	#divselect ul{width:284px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
-	#divselect ul li{height:60px; line-height:60px;}
-	#divselect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
+	#divselect{width:220px; margin:-53px 700px; position:relative; z-index:10000;}
+	#divselect cite{width:180px; height:40px;line-height:40px;font-size:22px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
+	#divselect ul{width:284px;max-height:500px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
+	#divselect ul li{height:40px; line-height:40px;}
+	#divselect ul li a{display:block;font-size:22px; height:40px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
 	#divselect ul li a:hover{background-color:#CCC;}
 	
 	#divTousseGroup{width:300px; margin:-20px -80px; position:relative; z-index:10000;}
-	#divTousseGroup cite{width:250px; height:50px;line-height:50px;font-size:30px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
-	#divTousseGroup ul{width:284px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
-	#divTousseGroup ul li{height:60px; line-height:60px;}
-	#divTousseGroup ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
+	#divTousseGroup cite{width:220px; height:40px;line-height:40px;font-size:22px; display:block; color:#FFFFFF; cursor:pointer;font-style:normal;padding-left:4px; padding-right:30px; border:1px solid #333333;background:url(xjt.png) no-repeat right center;}
+	#divTousseGroup ul{width:284px;max-height:500px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;}
+	#divTousseGroup ul li{height:40px; line-height:40px;}
+	#divTousseGroup ul li a{display:block;font-size:22px; height:40px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;}
 	#divTousseGroup ul li a:hover{background-color:#CCC;}
 	#basketsUl li .totalAmount{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
 	.lightbox{width:400px;background:#FFFFFF;border:5px solid #ccc;line-height:35px;display:none; margin:0;}
@@ -181,10 +287,6 @@
     request.setAttribute("tousseGroups", tousseGroups);
 %>
 <body onload="init();">
-
-<!-- alertDIV -->
-<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/expressStyle.css?version=${svnRevision}" rel="stylesheet" type="text/css" />
-
 <dl id="idBox" class="lightbox" style="top:10%;left:5%;">
     <dt><b style="font-size:20px">提示信息</b> </dt>
     <dd>
@@ -203,10 +305,12 @@
 <!-- alertDIV -->
 
 <div class="mbody">
-	<img class="bgImg" src="1980/images/express_recycle.jpg"/>
+	<img class="bgImg" src="1980/images/foreignTousse_recycle.jpg"/>
     <!--操作 start-->
-    <input id="allIntoBasket" type="button" value="一键入筐" class="btn-h" onclick="allInputBasket();"/>
     <div class="add-form">
+		<div id="allIntoBasket">
+			<img id="allIntoBasketImg" src="1980/images/allIntoBasket.png" onclick="allInputBasket();"/>
+		</div>
         <form id="recyclingRecordForm" method="post" action="${ctx}/disinfectSystem/recyclingRecordAction!saveExpressRecycling.do">
             <input type="hidden" id="resolution" name="resolution" value="${param.resolution}"/>
             <input type="hidden" id="isThisTouchScreen" name="isThisTouchScreen" value="true"/>
@@ -254,8 +358,26 @@
     <!--表单 start-->
     <div class="data-table">
         <div class="box">
-            <table id="tousseItemTable" border="0" align="center" cellpadding="0" cellspacing="0">
-            </table>
+			<div class="box image-box">
+				<table id="tousseItemTable" border="0" align="center" cellpadding="0" cellspacing="0">
+					<thead>
+						<tr class="title">
+							<th width="15%" id="theadNameByDepartName">科室名称</th>
+							<th width="15%" id="theadNameByApplyTimeName" style="display: none;">申请时间</th>
+							<th width="35%">器械包名称</th>
+							<th width="10%">申请数量</th>
+							<th width="5%">增</th>
+							<th width="10%">回收数量</th>
+							<th width="5%">减</th>
+							<th width="15%">操作</th>
+							<th width="2%"></th>
+						</tr>
+					</thead>
+					<tbody class="box" id="tousseItemTbody">
+						
+					</tbody>
+				</table>
+			</div>
         </div>
         <div class="btn-box">
             <table width="50%" border="0" cellspacing="0" cellpadding="0">
@@ -269,12 +391,23 @@
     <!--表单 end-->
     <!--待装载篮筐 start-->
     <div class="zhuangzai-table">
-        <div class="box">
-            <ul id="basketsUl" class="list-item clearfix">
-			</ul>
-			<ul id="loadingPutBasket" class="list-item clearfix">
-                
-			</ul>
+        <div class="box image-box">
+			<table border="0" align="center" cellpadding="0" cellspacing="0">
+				<thead>
+					<tr class="title">
+						<th>名称</th>
+						<th width="80px">数量</th>
+						<th width="130px">操作</th>
+					</tr>
+				</thead>
+			</table>
+			<div style="height: 93%;overflow-y: scroll;">
+				<ul id="basketsUl" class="list-item clearfix">
+				</ul>
+				<ul id="loadingPutBasket" class="list-item clearfix">
+					
+				</ul>
+			</div>
         </div>
     </div>
     <!--待装载篮筐 end-->