Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js =================================================================== diff -u -r17273 -r17340 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js (.../comboTousseForm.js) (revision 17273) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js (.../comboTousseForm.js) (revision 17340) @@ -688,6 +688,8 @@ autoHeight: true, items: [{ columnWidth: .25, + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", layout: 'form', items: [{ xtype: 'textfield', @@ -707,6 +709,8 @@ }, { columnWidth: .25, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '器械包类型', @@ -767,9 +771,11 @@ // }] // }, - { - columnWidth: .25, + { + columnWidth: .3, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '默认包装类型', @@ -785,8 +791,10 @@ allowBlank: false }] }, { - columnWidth: .25, + columnWidth: .2, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'textfield', fieldLabel: "拼音码", @@ -800,6 +808,8 @@ }, { columnWidth: .25, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'textfield', fieldLabel: "五笔码", @@ -813,6 +823,8 @@ }, { columnWidth: .25, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '默认灭菌程序', @@ -828,8 +840,10 @@ anchor: '100%' }] }, { - columnWidth: .25, + columnWidth: .3, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '标签纸类型', @@ -846,8 +860,10 @@ anchor: '100%' }] }, { - columnWidth: .25, + columnWidth: .2, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '是否审核', @@ -875,6 +891,8 @@ }, { columnWidth: .25, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'textfield', fieldLabel: "外部编码", @@ -887,6 +905,8 @@ }, { columnWidth: .25, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '处理科室', @@ -921,8 +941,10 @@ } }] }, { - columnWidth: .25, + columnWidth: .3, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [{ xtype: 'combo', fieldLabel: '任务组', @@ -950,6 +972,8 @@ { columnWidth: .75, layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", items: [crearteHandlerDepartNameCombo(departStore)] }, { Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp =================================================================== diff -u -r17250 -r17340 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp (.../comboTousse.jsp) (revision 17250) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp (.../comboTousse.jsp) (revision 17340) @@ -55,6 +55,7 @@ var PACKAGE_TYPE_FOREIGN = '<%=TousseDefinition.PACKAGE_TYPE_FOREIGN%>'; var PACKAGE_TYPE_HOMEMADE = '<%=TousseDefinition.PACKAGE_TYPE_HOMEMADE%>'; var SUPPLIER_TYPE_RENTTOUSSE = '<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>'; + var fontSize = '${fontSize}';