Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r33943 -r33974 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33943) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33974) @@ -173,14 +173,15 @@ var recycleAmountNeedConfirm = result.data[i].recycleAmountNeedConfirm; var departName = result.data[i].depart; var confirmRecyclingAmount = getSystemSetConfig('confirmRecyclingAmount', false); + var specialInfection = result.data[i].specialInfection || ''; var recyclingTimes = result.data[i].recyclingTimes; var haveUnRecycling = result.data[i].haveUnRecycling; //根据状态修改背景颜色 var trColor = ''; if (status == '未确认') { trColor = 'bgcolor="#FF8C69"'; } - + if (confirmRecyclingAmount && recycleAmountNeedConfirm == '是' || result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)) { trColor = 'bgcolor="yellow"'; } @@ -200,7 +201,6 @@ if (sstsConfig.enablePackingSerialNum) { tbodyHtml += '
' + result.data[i].packingTaskSerialNumber + '
'; } - var specialInfection = result.data[i].specialInfection || ''; for (var k = 0; k < arr.length; k++) { if (arr[k] == '科室') { tbodyHtml += ''; @@ -244,9 +244,13 @@ if (sstsConfig.enablePackingSerialNum) { recyclingRecordStr += '
' + result.data[i].packingTaskSerialNumber + '
'; } + var html=''; + if (specialInfection !== '') { + html = ''; + } recyclingRecordStr += '' - + '
' + departName + + '
'+html+'' + departName + '
' + dateObjFormat(result.data[i].recyclingTime) + '
' + result.data[i].operator + '
' + result.data[i].recyclingApplicationType @@ -676,11 +680,10 @@ if (msg[i].type == '外来器械包申请单' && msg[i].recyclingStatus == '待回收') { color = '#ffa500'; } - + var specialInfection = msg[i].specialInfection || ''; if (sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList) { var arr = sstsConfig.enableTableColumnCustomizationForTheWaitRecycleList; var tbodyHtml = ''; - var specialInfection = msg[i].specialInfection || ''; for (var k = 0; k < arr.length; k++) { if (arr[k] == '科室') { tbodyHtml += ''; @@ -715,8 +718,12 @@ tbodyHtml += ''; $("#awaitForRecycleTableBody").append(tbodyHtml); } else { + var html = ''; + if (specialInfection !== '') { + html = ''; + } var tbodyHtml = ''; - tbodyHtml += '' + defaultString(departName) + ''; + tbodyHtml += ''+html+'' + defaultString(departName) + ''; tbodyHtml += '' + defaultString(dateObjFormat(msg[i].submitTime)) + ''; tbodyHtml += '' + defaultString(msg[i].applicant) + ''; tbodyHtml += '' + defaultString(msg[i].type) + '';