Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js =================================================================== diff -u -r24797 -r24913 --- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js (.../printConfig.js) (revision 24797) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/print/printConfig.js (.../printConfig.js) (revision 24913) @@ -1186,6 +1186,7 @@ } } + var printConfig = { //发货计划单 invoicePlan : invoicePlanPrintConfig, Index: ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js =================================================================== diff -u -r24797 -r24913 --- ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js (.../config.js) (revision 24797) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzykdxfskqyy/config.js (.../config.js) (revision 24913) @@ -133,5 +133,9 @@ //是否支持部分终止申请单中的物品 enableTerminatePartOfApplication : true, //发货科室依据,departCoding为申请科室,settleAccountsDepartCoding为结算科室,默认为申请科室 - invoice_groupBy:'settleAccountsDepartCoding' + invoice_groupBy:'settleAccountsDepartCoding', + //发货单是否合并打印,如果为true,则把一次性物品、消毒物品、器械包打印到一张单,false或者不配置,都是分三张单打印 + mergePrintInvoiceGoods : false, + //审核器械包是否必须入篮筐(一级供应室用户进行审核时) + mustScanBasketForTousseReview : true } \ No newline at end of file