Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r36071 -r36072 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 36071) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 36072) @@ -966,7 +966,7 @@ // 删除篮筐内的物品去减少左边器械包对应的数量 function unloadStaff(tousseDefinitionID, amount, idCardBarcode) { $('#tousseItemTable').children().first().children().each(function (i, element) { - if ($('#tousseDefinitionID' + i).val() == tousseDefinitionID && $('#tousseItemsTr' + i).css("display") !== 'none') { + if ($('#tousseDefinitionID' + i).val() == tousseDefinitionID) { $('#loadedAmount' + i).val(parseInt($('#loadedAmount' + i).val(), 10) - parseInt(amount, 10)); var idCard = $('#isThereIdentificationCard' + i).val(); if (idCard == '是' && idCardBarcode == '') { @@ -2495,7 +2495,6 @@ // 打开器械包加急的窗口 function openSetUrgentAmountPage(row, packed) { - var tousseItemId = $('#tousseItemId' + row).val(); if (packed) { return false; } @@ -2505,7 +2504,6 @@ if ($('#id').val() == "") { isEditIDCardError = true; } - var itemJson = []; for (var i = rowArr.length - 1; i >= 0; i--) { @@ -2549,7 +2547,7 @@ type: 2, title: ['器械包加急', true], content: 'setTousseUrgentAmount.jsp?resolution=' + resolution + '&width=' + width - + '&height=' + height + '&itemJson=' + encodeURI(JSON.stringify(itemJson)), + + '&height=' + height, area: [width + 'px', height + heightExtra + 'px'], border: [5, 0.3, '#fff', true], closeBtn: [2, true], @@ -6631,7 +6629,7 @@ var operationRoom = item.operationRoom || ''; var toussItem = { row: row, - tousseItemId: '', + tousseItemId: item.id || '', tousseName: item.tousseName, tousseDefinitionID: item.tousseDefinitionId, applicationAmount: item.amount,