Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js =================================================================== diff -u -r22653 -r22663 --- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 22653) +++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js (.../cssdUtils.js) (revision 22663) @@ -75,17 +75,20 @@ // 获取标签打印的名字,姓名或者工号 // operator: 打包人, reviewer:审核人,operatorCode:打包人工号,reviewerCode:审核人工号 -function getPrintNames(isPrintUserName,operator,reviewer,sterileUser,operatorCode,reviewerCode,sterileCode){ +function getPrintNames(isPrintUserName,namesObj){ var names = {}; - var operatorToPrint = operator;//打包人 - var reviewerToPrint = reviewer;//审核人 - var sterilizationUserToPrint = sterileUser; + var operatorToPrint = namesObj.operator;//打包人 + var wrapperForPrint = namesObj.wrapper; + var reviewerToPrint = namesObj.reviewer;//审核人 + var sterilizationUserToPrint = namesObj.sterileUser; if(isPrintUserName == false || isPrintUserName == 'false'){ - operatorToPrint = operatorCode; - reviewerToPrint = reviewerCode; - sterilizationUserToPrint = sterileCode; + operatorToPrint = namesObj.operatorCode; + wrapperForPrint = namesObj.wrapperCode; + reviewerToPrint = namesObj.reviewerCode; + sterilizationUserToPrint = namesObj.sterileCode; } names.operatorToPrint = operatorToPrint; + names.wrapperForPrint = wrapperForPrint; names.reviewerToPrint = reviewerToPrint; names.sterilizationUserToPrint = sterilizationUserToPrint; return names;