Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r29748 -r29800 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29748) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 29800) @@ -391,18 +391,8 @@ 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation,'storageLocationCode':storageLocationCode,'simpleName':simpleName,'operationDate':operationDate,'inspectorName':inspectorName,'remark':remark}; obj.depart = tousseObj.depart; obj.washOperator = tousseObj.washOperator; - obj.tousseType = tousseObj.tousseType; - dingxiang_applyIf(obj,tousseObj); - if(tousseObj.depart && tousseObj.depart !== ''){ - if(tousseName.indexOf(tousseObj.depart) == -1){ - obj.name = '('+tousseObj.depart+')'+tousseName; - }else { - obj.name = tousseName; - } - }else { - obj.name = tousseName; - } - obj.tousseNameWithoutDepart = obj.tousseName; + obj.tousseType = tousseObj.tousseType; + obj.nameWithoutDepart = tousseObj.tousseNameWithoutDepart; defaultPrintPackage(obj); } }