Index: ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js =================================================================== diff -u -r37716 -r38532 --- ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js (.../config.js) (revision 37716) +++ ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js (.../config.js) (revision 38532) @@ -224,7 +224,7 @@ showPrintBOMButton:true, //待发货物品的按时间过滤的字段类型:1申请时间;2回收时间;3或未配置,回收与申请时间 fieldTypeForDateTimeFilteringOfToSendGoodsList:2, - //装配外来器械时确认是否放置指示卡。 -packingView_confirmIndicatorCard: ["器械包","外来器械包"] +//装配物品时提示放置指示卡的包类型 +packingView_confirmIndicatorCard:[{tousseType:"外来器械包",promptType:0},{tousseType:"器械包",promptType:1}] } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r38490 -r38532 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 38490) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 38532) @@ -1961,6 +1961,7 @@ { name: 'serialNumber' }, { name: 'cleaned' }, { name: 'note' }, + { name: 'includeImplant' }, { name: 'maxAmount' }, { name: 'urgentLevelObj' }, { name: 'colorCode' }, @@ -5049,14 +5050,25 @@ //遍历器械包节点 Ext4.each(selNodes, function (pNode) { - var tousseType = pNode.get('tousseType'); - var tousseName = pNode.get('tousseName'); - - if (sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.indexOf(tousseType) >= 0) { - if (arr.indexOf(tousseName) == -1) { - arr.push(tousseName); + Ext4.each(pNode.childNodes, function (cNode) { + var tousseType = cNode.get('tousseType'); + var tousseName = cNode.get('tousseName'); + var includeImplant = cNode.get('includeImplant'); + if (sstsConfig.packingView_confirmIndicatorCard && sstsConfig.packingView_confirmIndicatorCard.length > 0) { + var packingView_confirmIndicatorCard = sstsConfig.packingView_confirmIndicatorCard; + for(var i=0;i