Index: ssts-web/src/main/webapp/disinfectsystem/CombinationKits/CombinationKitsForm.js =================================================================== diff -u -r28370 -r28371 --- ssts-web/src/main/webapp/disinfectsystem/CombinationKits/CombinationKitsForm.js (.../CombinationKitsForm.js) (revision 28370) +++ ssts-web/src/main/webapp/disinfectsystem/CombinationKits/CombinationKitsForm.js (.../CombinationKitsForm.js) (revision 28371) @@ -21,59 +21,7 @@ } } } -/**** 查询器械包名称 start****/ -var tousseNameComboBoxFun = function() { - var tousseNameStore = new Ext4.data.Store({ - proxy : { - type : 'ajax', - url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do', - reader : { - type : 'json', - totalProperty:'totalCount', - root : 'data' - } - }, - fields: [ - { name: 'id', mapping: 'id' }, - { name: 'spelling', mapping: 'spelling' }, - { name: 'wbCode', mapping: 'wbCode' }, - { name: 'name', mapping: 'name' }, - { name: 'displayName', mapping: 'displayName' } - ] - }); - var tousseNameBox = top.Ext4.create('Ext.form.ComboBox', { - columnWidth: 0.33, - labelWidth: 100, - labelAlign: 'right', - xtype: 'combo', - id: 'tousseName', - name: 'tousseName', - valueField: 'name', - displayField: 'displayName', - fieldLabel: '器械包名称', - queryParam: 'spell', - value:'1', - minChars: 0, - listWidth: 180, - forceSelection: false, - hideTrigger: true, - typeAhead: true, - store: tousseNameStore, - listeners:{ - select:function(combo, record, index){ - var spelling = record[0].data.spelling; - var wbCode = record[0].data.wbCode; - top.Ext4.getCmp('spelling').setValue(spelling); - top.Ext4.getCmp('wbCode').setValue(wbCode); - } - } - }); - - return tousseNameBox; -} -/**** 查询器械包名称 end****/ - /**** 供应商 start ****/ var foldersCompanyStore = new Ext4.data.Store({ pageSize : 12, @@ -344,7 +292,7 @@ }], fieldDefaults : { labelAlign : 'right', - labelWidth : 80 + labelWidth : 100 }, items : [{ xtype:'hidden', @@ -356,13 +304,25 @@ width : '100%', layout : 'column', title : '基础数据', - items : [tousseNameComboBoxFun(),{ + items : [{ layout : 'form', columnWidth : .33, bodyStyle : {background : '#EBF5EC', border : 0}, items : [{ xtype : 'textfield', border : 0, + fieldLabel : '器械包名称', + name : "tousseName", + id : "tousseName", + enableKeyEvents : true + }] + },{ + layout : 'form', + columnWidth : .33, + bodyStyle : {background : '#EBF5EC', border : 0}, + items : [{ + xtype : 'textfield', + border : 0, fieldLabel : '拼音码', name : "spelling", id : "spelling", @@ -385,8 +345,7 @@ }] },{ xtype: 'textareafield', - columnWidth : 1, - width: 509, + columnWidth : 0.99, fieldLabel: '备注', labelAlign: 'right', id:'remark'