Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js =================================================================== diff -u -r30880 -r30897 --- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 30880) +++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 30897) @@ -236,21 +236,26 @@ for ( var i = 0; i < count; i++) { var record = splitedTousseStore.getAt(i); var tousseName = record.get('tousseName'); + var tousseNameAlias = record.get('tousseNameAlias'); if(nameIncludeSplitTotalAmountForSplitForeignTousse){ - tousseName += "(" + (i + 1) + "/" + count + ")"; + tousseName += "(" + (i + 1) + "/" + count + ")"; + tousseNameAlias += "(" + (i + 1) + "/" + count + ")"; }else{ if(splitForeignTousseNameStyle == 1){ - tousseName += "(" + count + "-" + (i + 1) + ")"; + tousseName += "(" + count + "-" + (i + 1) + ")"; + tousseNameAlias += "(" + count + "-" + (i + 1) + ")"; }else{ - tousseName += "(部分" + (i + 1) + ")"; + tousseName += "(部分" + (i + 1) + ")"; + tousseNameAlias += "(部分" + (i + 1) + ")"; } } + var tousse = {}; tousse.tousseName = tousseName; - if(record.get('tousseNameAlias') == record.get('tousseName')){ - tousse.tousseNameAlias = ''; + if(record.get('tousseNameAlias') == record.get('tousseName') || record.get('tousseNameAlias') == ''){ + tousse.tousseNameAlias = tousseName; }else { - tousse.tousseNameAlias = record.get('tousseNameAlias'); + tousse.tousseNameAlias = tousseNameAlias; } tousse.materialNames = record.get('materialNames'); tousse.materialsJsonArray = record.get('materialsJsonArray');