Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r32228 -r32849 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 32228) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 32849) @@ -459,9 +459,10 @@ } }); }else{ + var depart = top.Ext4.getCmp("depart").getValue(); top.Ext4.Msg.show({ title : '请确认', - msg : '您有'+tousseLeaseAmount+'张申请日期为'+borrowTimes+'的借物单含有该申请单中的同类物品未归还,是否申请归还?', + msg : depart + '有'+tousseLeaseAmount+'张申请日期为'+borrowTimes+'的借物单含有该申请单中的同类物品未归还,是否将申请的对应物品作为归还处理?', buttons: top.Ext4.Msg.YESNOCANCEL, fn : function(btn){ if(!isFirstSupplyRoomUser){ Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js =================================================================== diff -u -r32702 -r32849 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32702) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 32849) @@ -4667,8 +4667,8 @@ var borrowApplicationInfoJson = JSON.parse(borrowApplicationInfo); var borrowTimes = borrowApplicationInfoJson.borrowTimes; var tousseLeaseAmount = borrowTimes.split(';').length; - - var confirmMessage = '您有' + tousseLeaseAmount + '张申请日期为' + borrowTimes + '的借物单的以下物品未归还,是否申请归还?'; + var depart = document.getElementById('depart').innerText || '您'; + var confirmMessage = depart + '有' + tousseLeaseAmount + '张申请日期为' + borrowTimes + '的借物单的以下物品未归还,是否将这些物品作为归还处理?'; var tdStyle = 'font-size:28px;text-align:center;'; var nameWidth = '440px;', taskGroupWidth = '200px;', amoutWidth = '140px;'; var table = '';
' + confirmMessage + '
器械包数量