Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r41400 -r41633 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 41400) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 41633) @@ -2713,6 +2713,10 @@ name = '加大标签'; } else if (type == 'diposableGoodsBatchStock') { name = '一次性物品批次'; + } else if (type === 'tousseDefinitionMaterials') { + name = '器械包明细单'; + } else if (type === 'idCardAndTousseImage') { + name = '标识牌和图片' } else { name = type; } Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js =================================================================== diff -u -r41610 -r41633 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js (.../config.js) (revision 41610) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsfybjy/config.js (.../config.js) (revision 41633) @@ -86,6 +86,7 @@ confirmRecyclingAmount:false, //只有装配完成才能使用清洗篮筐回收 recycleClassifyBasketAfterPacked:false, + canUseBarcodeTypes: ['标识牌和图片','器械包明细单','加大标签','大标签','大标签2','中标签','中标签2','小标签','小标签2'], //禁用基数限制 disableCardinalNumLimit:true, //回收时拆单的方式 @@ -103,6 +104,7 @@ //是否显示发货计划下送责任人。 invoicePersonInChargeRequired:false, enableMonthlyPeopleCountManagementFunction:true, + enablePrintLabelsOutputPrinterSettingsFunction: true, //发货计划下送责任人是否必填。 secondRecyclingForeignIntoSameBasket:true, expandColoumnsConfigOfTousseInfoList:[{"fieldName":"thirdPartyIdCard","coloumnName":"第三方标识牌"}],