Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r32117 -r32140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 32117) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 32140) @@ -83,6 +83,18 @@ vertical-align:middle; line-height:42px; } +.cameraPhoto { + float: left; + width: 36px; + height: 48px; + margin-right: 5px; +} +.cameraPhoto img{ + width: 32px; + cursor: pointer; + margin-top: 8px; + cursor: pointer; +} .recycleRemark{ text-align:left; background:#FFFFFF; @@ -332,8 +344,10 @@

- +
+
+ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r32121 -r32140 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32121) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32140) @@ -25,6 +25,8 @@ // 可以终止的TousseItem的id.已经回收但是还没有发货的话，也是可以终止的。目前部分发货不能终止 var canTerminateTousseItemIds = []; var lastTousseNames = ''; +//缓存标识牌条码 +var sessionIDCardBarcodes = new newMap(); // 是否开启根据科室加载模板 function openLoadTemplateByUnit() { if (sstsConfig.isOpenLoadTemplateByUnit) { @@ -945,7 +947,7 @@ return true; } -// 不明白什么意思 +// 删除篮筐内的物品去减少左边器械包对应的数量 function unloadStaff(tousseDefinitionID, amount, idCardBarcode) { $('#tousseItemTable').children().first().children().each(function (i, element) { if ($('#tousseDefinitionID' + i).val() == tousseDefinitionID && $('#tousseItemsTr' + i).css("display") !== 'none') { @@ -964,6 +966,18 @@ } } } + }else if(idCard == '是' && idCardBarcode !== ''){ + var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val(); + if(tousseOrIDCardInstanceBarcodes !== ''){ + var arr = tousseOrIDCardInstanceBarcodes.split(';'); + var index = arr.indexOf(idCardBarcode); + arr.splice(index,1); + if(arr.length > 0){ + $('#tousseOrIDCardInstanceBarcodes' + i).val(arr.join(';')) + }else { + $('#tousseOrIDCardInstanceBarcodes' + i).val('') + } + } } return false; } @@ -1419,11 +1433,7 @@ } var element = ''; - if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){ - element += '
' + showName + '
'; - }else { - element += '
' + showName + '
'; - } + element += '
' + showName + '
'; element += '
 ' + showBarcode + '
'; element += '
' + amount + '
'; element += '
删除
'; @@ -1957,6 +1967,7 @@ $('#tousseItemTable').children().first().children().each(function (i, element) { if ($('#tousseName' + i).val() == td.name && $('#deleted' + i).val() == '0') { var barcodesStr = $('#barcodes' + i).val(); + var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val(); setTousseItemLoadedAmountCss(i) if (barcodesStr == "") { var idCardBarcodeArray = new Array(); @@ -1984,6 +1995,16 @@ $('#barcodes' + i).val(JSON.stringify(idCardBarcodeArray)); } } + + if(tousseOrIDCardInstanceBarcodes == ''){ + $('#tousseOrIDCardInstanceBarcodes' + i).val(barcode); + }else { + var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val(); + if(tousseOrIDCardInstanceBarcodes.indexOf(barcode) == -1){ + var str = tousseOrIDCardInstanceBarcodes + ';' + barcode; + $('#tousseOrIDCardInstanceBarcodes' + i).val(str); + } + } } }); } @@ -2430,12 +2451,67 @@ }); } +//显示标识牌条码列表 +function showIDCardBarcodes(row,tousseName,tousseOrIDCardInstanceBarcodes){ + $("#dialogShowIDCardBarcodes").dialog({ + resizable: false, + height: 500, + width: 600, + modal: true, + open: function () { + var arr = tousseOrIDCardInstanceBarcodes.split(';'); + var html = ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + html += ''; + for(var i=0;i'; + html += ''; + html += ''; + } + html += ''; + $("#dialogShowIDCardBarcodes").html(html); + }, + close: function () { + $("#dialogShowIDCardBarcodes").html(""); + }, + buttons: { + "取消": function () { + $(this).dialog("close"); + } + } + }); +} + //FSSDERMYY-13:打开拍照的功能 -function openPhotos(tousseDefinitionID,barcode,tousseName) { +function openPhotos(row,barcodes) { var imageIds = ''; var videoIds = ''; - var tousseId = tousseDefinitionID; - if((barcode || '') !== ''){ + var tousseDefinitionId = $('#tousseDefinitionID'+row).val(); + var tousseId = $('#tousseDefinitionID'+row).val(); + var isThereIdentificationCard = $('#isThereIdentificationCard'+row).val(); + var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes'+row).val(); + var barcode = barcodes || ''; + var tousseName = $('#tousseName'+row).val(); + if(isThereIdentificationCard == '是'){ + if(tousseOrIDCardInstanceBarcodes == ''){ + showResult('请先扫描标识牌条码，然后进行拍摄！'); + return; + }else if(tousseOrIDCardInstanceBarcodes.split(';').length == 1){ + barcode = tousseOrIDCardInstanceBarcodes; + }else { + if(barcode == ''){ + showIDCardBarcodes(row,tousseName,tousseOrIDCardInstanceBarcodes); + return + } + } + } + + if(barcode !== ''){ tousseId += ';' + barcode; } if(cameraPhotoInfoMap.has(tousseId)){ @@ -2470,7 +2546,7 @@ } cameraPhotoInfoMap.set(tousseId,{ - tousseId:tousseDefinitionID, + tousseId:tousseDefinitionId, barcode:barcode, imageFileIds:imageIds, videoFileIds:videoIds @@ -3767,7 +3843,7 @@ var addButton = ''; var reduceButton = ''; var onclickFun = 'onclick="openUpdateAmount(this,' + row + ');"'; - + var barcode = ''; var urgentAmountElement = ""; if (!isUndefinedOrNull(urgentAmount) && urgentAmount > 0) { var msg = urgentAmount; @@ -3776,7 +3852,10 @@ msg = urgentLevel; fontSize = "16px"; } - urgentAmountElement = '
' + msg + '
'; + if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){ + urgentAmountElement += '
'; + } + urgentAmountElement += '
' + msg + '
'; } else { var bgMsg = "background-image:url(unUrgentBg.png);"; var msg = "+"; @@ -3788,7 +3867,10 @@ if (sstsConfig.enableUrgentFunction) { fontSize = "16px"; } - urgentAmountElement = '
' + msg + '
'; + if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){ + urgentAmountElement += '
'; + } + urgentAmountElement += '
' + msg + '
'; } var textWidth = textSize("26px", "宋体", showTousseName).width || 0; @@ -6769,7 +6851,6 @@ if (ci.tousseInstanceBarcode != undefined) { showBarcode = ci.tousseInstanceBarcode; } - var aa = aa + materialName; var element = ''; element += '
' + materialName + '
'; @@ -6797,12 +6878,18 @@ barcode = ci.tousseInstanceBarcode; } var element = ''; - - if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){ - element += '
' + ci.tousseDefinition.name + '
'; - }else { - element += '
' + ci.tousseDefinition.name + '
'; + if(barcode !== ''){ + if(sessionIDCardBarcodes.has(ci.tousseDefinitionID)){ + var barcodeArr = sessionIDCardBarcodes.get(ci.tousseDefinitionID); + if(barcodeArr.indexOf(barcode) == -1){ + barcodeArr.push(barcode); + sessionIDCardBarcodes.set(ci.tousseDefinitionID,barcodeArr); + } + }else { + sessionIDCardBarcodes.set(ci.tousseDefinitionID,[barcode]); + } } + element += '
' + ci.tousseDefinition.name + '
'; element += '
 ' + barcode + '
'; element += '
' + ci.amount + '
'; element += '
删除
'; @@ -6836,6 +6923,13 @@ } $('.btn-box').css('display', 'block'); } + $('#tousseItemTable').children().first().children().each(function (i, element) { + var tousseDefinitionID = $('#tousseDefinitionID' + i).val(); + if(sessionIDCardBarcodes.has(tousseDefinitionID)){ + var arr = sessionIDCardBarcodes.get(tousseDefinitionID); + $('#tousseOrIDCardInstanceBarcodes' + i).val(arr.join(';')) + } + }); }); findCameraPhotoInfo(id); DWREngine.setAsync(true);
名称标识牌条码
'+ img + ""+ tousseName +"" +''+arr[i]+'
+-