Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r16338 -r16652 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 16338) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 16652) @@ -490,28 +490,6 @@ }] },{ - layout:'form', - labelWidth : 180, - columnWidth: .25, - items:[{ - xtype : 'combo', - fieldLabel : '发货数量依据', - id : 'invoiceOrigin', - name : 'invoiceOrigin', - valueField : 'formname', - displayField : 'formname', - store : new Ext.data.SimpleStore({ - fields : ['formname'], - data : [['申请单'],['回收单']] - }), - mode : 'local', - editable : false, - forceSelection : true, - allowBlank : false, - triggerAction : 'all', - anchor : '100%' - }] - },{ layout:'form', labelWidth : 180, columnWidth: .25, @@ -1090,7 +1068,29 @@ height:80, columnWidth : 1, labelWidth : 95, - items : [ + items : [{ + layout:'form', + labelWidth : 180, + columnWidth: .25, + items:[{ + xtype : 'combo', + fieldLabel : '发货数量依据', + id : 'invoiceOrigin', + name : 'invoiceOrigin', + valueField : 'formname', + displayField : 'formname', + store : new Ext.data.SimpleStore({ + fields : ['formname'], + data : [['申请单'],['回收单']] + }), + mode : 'local', + editable : false, + forceSelection : true, + allowBlank : false, + triggerAction : 'all', + anchor : '100%' + }] + }, { layout : 'form', labelWidth : 180,