Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js =================================================================== diff -u -r40624 -r40679 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js (.../foreignTousseDefinitionForm.js) (revision 40624) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/foreigntoussedefinition/foreignTousseDefinitionForm.js (.../foreignTousseDefinitionForm.js) (revision 40679) @@ -77,7 +77,7 @@ queryParam : 'spell', minChars : 0, valueField : 'id', - displayField : 'name', + displayField : 'showName', store : new Ext.data.Store({ proxy : new Ext.data.HttpProxy({ url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getForeignMaterialDefinitionData.do', @@ -105,7 +105,7 @@ anchor : '97%', listeners : { select : function(combo, record, index) { - var materialName = record.data.name; + var materialName = record.data.showName; var isExist = isExistMaterial(materialName); if(!isExist){ combo.setValue(materialName); Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r40586 -r40679 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 40586) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 40679) @@ -1630,8 +1630,8 @@ dataIndex: 'tousseName', editor: { xtype : 'combo', - valueField : 'name', - displayField : 'name', + valueField : 'showName', + displayField : 'showName', store : getForeignMaterialDefinitionStore, pageSize : 12, listConfig: {width : 270}, Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r40575 -r40679 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40575) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 40679) @@ -3072,8 +3072,8 @@ dataIndex: 'tousseName', editor: { xtype : 'combo', - valueField : 'name', - displayField : 'name', + valueField : 'showName', + displayField : 'showName', store : getForeignMaterialDefinitionStore, pageSize : 12, listConfig: {width : 270},