Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js =================================================================== diff -u -r28429 -r28432 --- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28429) +++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js (.../supplyRoomOperate.js) (revision 28432) @@ -24,6 +24,8 @@ reviewViewText = "审核"; } var IDS = Ext.id(); +var defaultWidth = window.screen.width >= 1366 ? 280:240; +var formHeight = window.screen.width >= 1280 ? 150:170; /* *IE8以下兼容document.getElementsByClassName @@ -475,7 +477,7 @@ border: 0, frame: true, bodyStyle: 'padding:0px auto;margin:0px', - height: fontSize == 12 ? 133 : 150, + height: formHeight, items: [{ id: 'tousseType', name: 'tousseType', @@ -485,7 +487,7 @@ height: 103, labelWidth: 130, items: [{ - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -516,7 +518,7 @@ } }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -532,7 +534,7 @@ anchor: '95%' }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -544,7 +546,6 @@ valueField: 'departCode', displayField: 'name', minChars: 0, - listWidth: 260, allowBlank: true, editable: false, store: supplyRoomStore, @@ -589,7 +590,7 @@ } }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -618,7 +619,7 @@ } }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -637,7 +638,7 @@ anchor: '95%' }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -661,7 +662,7 @@ } }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 90, height: 30, @@ -689,7 +690,7 @@ } }] }, { - columnWidth: .2, + width: defaultWidth, layout: 'form', labelWidth: 60, height: 30, Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js =================================================================== diff -u -r28429 -r28432 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28429) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseOperate.js (.../tousseOperate.js) (revision 28432) @@ -4,6 +4,9 @@ var reportFormGrid; var reportIndex = 0; var windowObj = null; +var defaultWidth = window.screen.width >= 1366 ? 280:240; +var formHeight = window.screen.width >= 1280 ? 110:130; + function tousseInfo(tousseName,countType,count) { var readerJson; var columnModel; @@ -346,7 +349,7 @@ border : 0, frame : true, bodyStyle : 'padding:0px auto;margin:0px', - height :100, + height :formHeight, items : [{ id:'tousseType', name:'tousseType', @@ -355,7 +358,7 @@ layout : 'column', labelWidth : 70, items : [{ - columnWidth : .2, + width:defaultWidth, layout : 'form', labelWidth : 90, height:30, @@ -386,7 +389,7 @@ } }] },{ - columnWidth : .2, + width:defaultWidth, layout : 'form', labelWidth : 90, height:30, @@ -402,7 +405,7 @@ anchor : '95%' }] },{ - columnWidth : .2, + width:defaultWidth, layout : 'form', labelWidth : 90, height:30, @@ -431,7 +434,7 @@ } }] },{ - columnWidth : .2, + width:defaultWidth, layout : 'form', labelWidth : 90, height:30, @@ -449,7 +452,7 @@ anchor : '95%' }] },{ - columnWidth : .2, + width:defaultWidth, layout : 'form', labelWidth : 90, height:30, @@ -473,7 +476,7 @@ } }] },{ - columnWidth : .2, + width:defaultWidth, layout : 'form', labelWidth : 90, height:30,