Index: ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js =================================================================== diff -u -r12331 -r12332 --- ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js (.../recycle.js) (revision 12331) +++ ssts-web/src/main/webapp/disinfectsystem/recycle/recycle.js (.../recycle.js) (revision 12332) @@ -1632,10 +1632,6 @@ function createRecycleNode(isParentNode,id,name,type,amount,containerBarcode,orgUnitName,recyclingRecordId,tousseName){ var node; var showname = name; - var _index = showname.indexOf('_'); - if (_index != -1) { - showname = showname.substring(0, _index); - } if(isParentNode){ //创建父节点 node = new Ext.tree.TreeNode({ @@ -1989,9 +1985,6 @@ function showRecyclingErrorDiv(v,p,record,rowIndex, columnIndex, store) { v = record.data.name; var recyclingApplicationId = Ext.getCmp('recyclingApplicationId').getValue(); - if (v.indexOf('_' + recyclingApplicationId) >= 0) { - v = v.substring(0, v.indexOf('_' + recyclingApplicationId)); - } var onclickFunction = "onclick=\"return false;\""; if (record.data.tousseType == '消毒物品' || record.data.tousseType == '灭菌物品') { onclickFunction = "onclick=\"addAndEditUntracableTousse(" + recyclingApplicationId + "," + record.data.tousseDefinitionId + ",'11',function(){updateApplicationItem();});return false;\""; @@ -2568,9 +2561,6 @@ }); var recyclingApplicationId = Ext.getCmp('recyclingApplicationId').getValue(); var showTousseName = record.get('name'); - if (showTousseName.indexOf('_' + recyclingApplicationId) >= 0) { - showTousseName = showTousseName.substring(0,showTousseName.indexOf('_' + recyclingApplicationId)); - } if (record.get('tousseType') != "消毒物品" && record.get('recycleAmount') != amountOfTousseInTheBasket) { showResult(showTousseName + '回收数量与放入篮筐数量不匹配!'); tousseRecyclingHandle = false;