Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r40360 -r40362 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 40360) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 40362) @@ -856,21 +856,22 @@ return } if(deliverStatus == '已发货'){ + var tousseName = records[0].data.tousseName; if(sstsConfig.enableSecondRecyclingAfterInvoiceFunction){ if((packageStatus == '已签收' && recyclingStatus == '已接收') || (packageStatus == '已发货' && recyclingStatus == '已接收') || (packageStatus == '待二次回收' && recyclingStatus == '待回收')){ foreignTousseUsedAgainFun(records[0].data.id,"","","", deliverStatus, packageStatus, records[0].json.serialNumber); }else { - showResult("外来器械包的状态为【"+ packageStatus +"】,不能进行再次翻包申请"); + showResult(tousseName + "不符合再次翻包申请操作,请选择符合条件的物品再进行操作。"); } }else { if((packageStatus == '待二次回收' && recyclingStatus == '待回收')){ foreignTousseUsedAgainFun(records[0].data.id,"","","", deliverStatus, packageStatus, records[0].json.serialNumber); }else { - showResult("外来器械包的状态为【"+ packageStatus +"】,不能进行再次翻包申请"); + showResult(tousseName + "不符合再次翻包申请操作,请选择符合条件的物品再进行操作。"); } } }else { - showResult("外来器械包的状态为【"+ deliverStatus +"】,不能进行再次翻包申请"); + showResult(tousseName + "不符合再次翻包申请操作,请选择符合条件的物品再进行操作。"); } } }) Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r40359 -r40362 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40359) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40362) @@ -2451,7 +2451,7 @@ idsArr.push(selNodes[i].data.id); var packageStatus = selNodes[i].data.packageStatus; if(packageStatus !== '已签收' && packageStatus !== '已发货' && packageStatus !== '待二次回收' ){ - msg = "外来器械包的状态为【"+ packageStatus +"】,不能进行再次翻包申请"; + msg = selNodes[i].data.tousseName + "不符合再次翻包申请操作,请选择符合条件的物品再进行操作。"; break; } }