Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r36772 -r36925
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 36772)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 36925)
@@ -2747,18 +2747,19 @@
}
var url = WWWROOT+'/disinfectsystem/touchScreen/recycle/tousseImage.jsp?resolution=1980&clientHeight='+iframeHeight+'&parentPageName=application&tousseDefinitionID='+tousseId+'&materialId='+materialId+'&tousseName='+encodeURIComponent(tousseName)+'&imgName='+encodeURIComponent(imgName)+'&number='+currentPage;
var supplierName = record.get('supplierName');
+ var packageStatus = record.get('packageStatus');
//ZJYY-140:显示手写签名的图标
var btnHtml = '';
- if(sstsConfig.enableReturnHandoverOfForeignTousseFunction && (recyclingStatus == '已提前归还' || recyclingStatus == '已确认归还')){
+ if(sstsConfig.enableReturnHandoverOfForeignTousseFunction && (packageStatus == '提前归还' || packageStatus == '确认归还')){
btnHtml += "
";
}
- btnHtml += "
";
+ btnHtml += "
";
if(sstsConfig.showCameraPhoto){
if(id == ""){
tousseDefinitionId = null;
}
- btnHtml += "
";
+ btnHtml += "
";
}
return btnHtml;
}