Index: ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java =================================================================== diff -u -r38964 -r41655 --- ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java (.../LabelTemplateManagerImpl.java) (revision 38964) +++ ssts-print/src/main/java/com/forgon/disinfectsystem/labeltemplate/service/LabelTemplateManagerImpl.java (.../LabelTemplateManagerImpl.java) (revision 41655) @@ -397,6 +397,16 @@ disposableGoodsBatch.put("id", ""); disposableGoodsBatch.put("name", "一次性物品批次"); array.add(disposableGoodsBatch); + + JSONObject item = new JSONObject(); + item.put("id", ""); + item.put("name", "标识牌和图片"); + array.add(item); + + item = new JSONObject(); + item.put("id", ""); + item.put("name", "器械包明细单"); + array.add(item); //器械包定义标签类型(及器械包定义的标识牌标签类型、外来器械包定义标签类型、科室供应室配置的外来器械标签类型)限制可以使用的标签类型(只针对系统定义的几种原标签类型,不含自定义标签) List tousseBarcodeTypes = this.getTousseBarcodeTypes(); Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js =================================================================== diff -u -r41649 -r41655 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js (.../config.js) (revision 41649) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js (.../config.js) (revision 41655) @@ -86,7 +86,6 @@ confirmRecyclingAmount:false, //只有装配完成才能使用清洗篮筐回收 recycleClassifyBasketAfterPacked:false, - canUseBarcodeTypes: ['标识牌和图片','器械包明细单','加大标签','大标签','大标签2','中标签','中标签2','小标签','小标签2'], //禁用基数限制 disableCardinalNumLimit:true, //回收时拆单的方式