Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js =================================================================== diff -u -r31728 -r32133 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js (.../comboTousseForm.js) (revision 31728) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js (.../comboTousseForm.js) (revision 32133) @@ -1093,6 +1093,29 @@ triggerClass : 'x-form-search-trigger', anchor : '100%' }] + },{ + columnWidth: .25, + layout: 'form', + labelWidth: fontSize == 12 ? 90 : 100, + labelAlign: "right", + items: [{ + xtype : 'combo', + fieldLabel : '工作量统计方式', + id : 'workLoadStatisticalMethod', + name : 'workLoadStatisticalMethod', + valueField : 'value', + displayField : 'value', + store : new Ext.data.SimpleStore( { + fields : [ 'value'], + data : [['按包'],['按材料'],['按材料加耗材']] + }), + editable : false, + forceSelection : true, + value : '按包', + mode : 'local', + triggerAction : 'all', + anchor : '100%' + }] }] }, { columnWidth: 0.5, @@ -1175,7 +1198,7 @@ width: 900, border: false, modal: true, - height: 660, + height: 700, plain: true, items: [formObj], listeners: { @@ -1231,6 +1254,9 @@ top.Ext.getCmp('instrumentSetType').setValue(''); top.Ext.getCmp('instrumentSetTypeName').setValue(''); } + if(!tousseDefinition.workLoadStatisticalMethod){ + top.Ext.getCmp('workLoadStatisticalMethod').setValue('按包'); + } }, failure: function (form, action) { }