Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r33917 -r33943
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33917)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 33943)
@@ -6417,6 +6417,11 @@
if (application.useRecordId != null) {
$("#useRecordId").val(application.useRecordId);
}
+ var specialInfection = application.specialInfection || '';
+ if(specialInfection !== ''){
+ $('#specialInfectionText').text(specialInfection);
+ $('#specialInfection').show();
+ }
if (application.recyclingRecordId != null && application.type !== TYPE_FOREIGNTOUSSEAPPLIACTION) {
loadRecyclingRecordById(application.recyclingRecordId);
findMaterialErrorDamageByTousseBarcode(application.tousseBarcodes);
@@ -6811,6 +6816,11 @@
$("#applyTime").val(dateObjFormat(application.submitTime));
$("#remarkText").text($("#remarkText").text() + (application.remark == null ? "" : application.remark));
addApplicantToRemark(application);
+ var specialInfection = application.specialInfection || '';
+ if(specialInfection !== ''){
+ $('#specialInfectionText').text(specialInfection);
+ $('#specialInfection').show();
+ }
}
userName = record.operator;
$("#tousseItemTable").empty();
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js
===================================================================
diff -u -r33936 -r33943
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33936)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 33943)
@@ -200,10 +200,14 @@
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 += '';
tbodyHtml += '';
+ if (specialInfection !== '') {
+ tbodyHtml += '  ';
+ }
tbodyHtml += '  ';
tbodyHtml += departName;
tbodyHtml += ' | ';
@@ -676,9 +680,13 @@
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 += '';
+ if (specialInfection !== '') {
+ tbodyHtml += ' ';
+ }
tbodyHtml += ' ';
tbodyHtml += ' ';
tbodyHtml += '';
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r33814 -r33943
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 33814)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 33943)
@@ -431,13 +431,13 @@
width:1100px;
height:60px;
top: 140px;
- left: 70px;
+ left: 25px;
}
.add-form .remark font{
height: 60px;
display: block;
float: left;
- width: 80px;
+ width: 100px;
}
.add-form .remark span{
width: 100%;
@@ -447,6 +447,13 @@
top:0px;
left: 80px;
}
+ .add-form .specialInfection {
+ width:500px;
+ height:30px;
+ top: 180px;
+ left: 25px;
+ display: none;
+ }
.add-form .add,.add-form .addQM,.add-form .add2 {
margin: 0;
bottom: 0;
@@ -578,7 +585,8 @@
-
+
+ 特殊感染类型:
沟通人
@@ -777,10 +785,11 @@
$('.add-form .depart').css({'top':'130px','left':'30px'});
$('.add-form .appType').css({'top':'130px','left':'390px'});
$('.add-form .applyTime').css({'top':'130px','left':'740px'});
- $('.add-form .remark').css({'top':'220px','left':'30px'});
+ $('.add-form .remark').css({'top':'220px','left':'25px'});
+ $('.add-form .specialInfection').css({'top':'270px','left':'25px'});
$('.add-form .communicationUserName').css({'top':'220px','left':'808px'});
$('#divElement').css({'right':'220px','top':'420px'});
-
+
$('.data-table').css({'width':'1160px','height':(813-height)+'px','top':'600px'});
$('#tousseItemBox').css({'height':(733-height)+'px'});
$('.zhuangzai-table').css({'width':'620px','height':(1123-height)+'px','top':'270px'});
|