Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js =================================================================== diff -u -r13367 -r13686 --- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 13367) +++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 13686) @@ -36,7 +36,7 @@ } } // 打印外来器械申请单 -function doPrintForeignTousseAppliation(printType, printSummaryObj) { +function doPrintForeignTousseApplication(printType, printSummaryObj) { LODOP = getLodop(document.getElementById('LODOP'), document .getElementById('LODOP_EM')); print(printSummaryObj); Index: ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js =================================================================== diff -u -r13627 -r13686 --- ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js (.../printConfig.js) (revision 13627) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzspyqzyy/print/printConfig.js (.../printConfig.js) (revision 13686) @@ -713,7 +713,7 @@ } var foreignTousseAppliationPrintConfig = { - customPrint:printForeignTousseAppliation, + customPrint:printForeignTousseApplication, isPrintTousse : true, isPrintDisinfectGoods : false, isPrintDisposableGoods : false, // 打印申请单是否打印一次性物品 @@ -987,7 +987,7 @@ return tableHtml; } -function printForeignTousseAppliation(obj){ +function printForeignTousseApplication(obj){ var tousses = obj.tousses; if(tousses.length > 0){// TODO 以后可能会有多个包要打印 printForeignTousse(obj,tousses[0]) Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js =================================================================== diff -u -r13313 -r13686 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 13313) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/print/printConfig.js (.../printConfig.js) (revision 13686) @@ -968,7 +968,7 @@ } var foreignTousseAppliationPrintConfig = { - customPrint:printForeignTousseAppliation, + customPrint:printForeignTousseApplication, isPrintTousse : true, isPrintDisinfectGoods : false, isPrintDisposableGoods : false, // 打印申请单是否打印一次性物品 @@ -1100,7 +1100,7 @@ return tableHtml; } -function printForeignTousseAppliation(obj){ +function printForeignTousseApplication(obj){ var tousses = obj.tousses; if(tousses.length > 0){// TODO 以后可能会有多个包要打印 printForeignTousse(obj,tousses[0]) Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js =================================================================== diff -u -r13413 -r13686 --- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 13413) +++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js (.../printConfig.js) (revision 13686) @@ -1058,7 +1058,7 @@ } var foreignTousseAppliationPrintConfig = { - customPrint:printForeignTousseAppliation_zd5y, + customPrint:printForeignTousseApplication, isPrintTousse : true, isPrintDisinfectGoods : false, isPrintDisposableGoods : false, // 打印申请单是否打印一次性物品 @@ -1190,7 +1190,7 @@ return tableHtml; } -function printForeignTousseAppliation_zd5y(obj){ +function printForeignTousseApplication(obj){ var tousses = obj.tousses; if(tousses.length > 0){// TODO 以后可能会有多个包要打印 printForeignTousse(obj,tousses[0]) Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js =================================================================== diff -u -r13415 -r13686 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js (.../foreignTousseApplicationForm.js) (revision 13415) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationForm.js (.../foreignTousseApplicationForm.js) (revision 13686) @@ -761,11 +761,11 @@ buttons : [{ text : '打印预览', hidden:false, - handler : function(){printForeignTousseAppliation(1)} + handler : function(){printForeignTousseApplication_local(1)} },{ text : '打印', hidden:false, - handler : function(){printForeignTousseAppliation(0)} + handler : function(){printForeignTousseApplication_local(0)} },{ text : '提交', id :'saveBtn', @@ -1035,7 +1035,7 @@ }); return tousses; } -function printForeignTousseAppliation(printType){ +function printForeignTousseApplication_local(printType){ var title = ""; DWREngine.setAsync(false); SupplyRoomConfigTableManager.getStartTimeObject(function(config){ @@ -1104,7 +1104,7 @@ summary.goodsDetail = goodsDetail; summary.tousses = tousses; // printApplicationGoods(printType, summary); - doPrintForeignTousseAppliation(printType, summary); + doPrintForeignTousseApplication(printType, summary); var isSupplyRoomUser = validateIsSupplyRoomUser();