Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js =================================================================== diff -u -r20934 -r20957 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 20934) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 20957) @@ -165,7 +165,7 @@ labelWidth : 110, items : [{ xtype : 'textfield', - fieldLabel : '语音提示名称', + fieldLabel : '物品简称', maxLength : '41', id : 'ttsName', name : 'ttsName', Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java =================================================================== diff -u -r20734 -r20957 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 20734) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DisposableGoods.java (.../DisposableGoods.java) (revision 20957) @@ -486,6 +486,13 @@ return DisposableGoodHelper.getDisposableGoodShowNameByConfig(this); } @Transient + public String getTtsNameOrName() { + if(StringUtils.isNotBlank(ttsName)){ + return ttsName; + } + return name; + } + @Transient public String getShowNameForSmallestUnit() { if (StringUtils.isNotBlank(this.specification)) { return this.name + "[" + this.specification + "]";