Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r17262 -r17280 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 17262) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 17280) @@ -124,7 +124,7 @@ resetTotolAmount(); } -function toSplitTousseGrid(tousseName,splitTousseNum){ +function toSplitTousseGrid(tousseName){ var success = false; var materialsStr = ""; var toolAmount = 0; // 工具数量 @@ -156,7 +156,7 @@ materialObj.materialAmount = record.get('materialAmount'); materialsArray.push(materialObj); } - var packageName = (tousseName + "(部分" + splitTousseNum + ")"); + var packageName = tousseName; var type = top.Ext4.getCmp("foreignToussePackageType").getValue(); var splitedTousseStore = top.Ext4.getCmp("splitedTousseGrid").getStore(); @@ -187,11 +187,20 @@ function getSplitForeignTousse(){ var packages = []; var splitedTousseStore = top.Ext4.getCmp("splitedTousseGrid").getStore(); - for ( var i = 0; i < splitedTousseStore.getCount(); i++) { + + //外来器械拆分小包名称带总拆包数量 + var nameIncludeSplitTotalAmountForSplitForeignTousse = getBoolValueFromJs("sstsConfig.nameIncludeSplitTotalAmountForSplitForeignTousse",false); + var count = splitedTousseStore.getCount(); + for ( var i = 0; i < count; i++) { var record = splitedTousseStore.getAt(i); - + var tousseName = record.get('tousseName'); + if(nameIncludeSplitTotalAmountForSplitForeignTousse){ + tousseName += "(" + (i + 1) + "/" + count + ")"; + }else{ + tousseName += "(部分" + (i + 1) + ")"; + } var tousse = {}; - tousse.tousseName = record.get('tousseName'); + tousse.tousseName = tousseName; tousse.materialNames = record.get('materialNames'); tousse.materialsJsonArray = record.get('materialsJsonArray'); tousse.bigPackage = record.get('bigPackage'); @@ -241,8 +250,6 @@ function splitForeignTousse(packTaskId,foreignTousseName,showName,applicationid,thizAmount,supplierName,basketBarcode,packageType,sterilingType){ - var splitTousseNum = 1; - top.Ext4.define('cellEditingGrid',{ extend: 'top.Ext4.grid.Panel', xtype: 'cell-editing', @@ -909,10 +916,7 @@ border:false, minWidth:48, handler : function(){ - var success = toSplitTousseGrid(showName,splitTousseNum); - if(success){ - splitTousseNum++; - } + toSplitTousseGrid(showName); } } ] }, { Index: ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js =================================================================== diff -u -r17183 -r17280 --- ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js (.../config.js) (revision 17183) +++ ssts-web/src/main/webapp/disinfectsystem/config/dysyy/config.js (.../config.js) (revision 17280) @@ -79,5 +79,7 @@ //使用记录转换的申请单是否合并到旧的申请单(合并到该科室待回收、待发货的单),默认不合并 true:合并 false:不合并 useRecordToRecyclingApplicationMerge : true, //核算月报只有一列的时候,是否使用另外的一个模板。新模板的名称monthReportOneColumn.jasper - applyMonthReportOneColumnTemplate:true + applyMonthReportOneColumnTemplate:true, + //外来器械拆分小包名称带总拆包数量 + nameIncludeSplitTotalAmountForSplitForeignTousse : true } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js =================================================================== diff -u -r17089 -r17280 --- ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js (.../config.js) (revision 17089) +++ ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js (.../config.js) (revision 17280) @@ -65,5 +65,7 @@ //发货管理时间选择combo,是否要显示上午和下午 showMorAndAf: true, //一次性物品库存不足时,是否允许申领 true:允许 false:不允许 - allowApplyDisposableGoodsWhenUnderstock:false + allowApplyDisposableGoodsWhenUnderstock:false, + //外来器械拆分小包名称带总拆包数量 + nameIncludeSplitTotalAmountForSplitForeignTousse : true } \ No newline at end of file