Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r16333 -r16470
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 16333)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 16470)
@@ -791,7 +791,7 @@
id : 'formPanel',
minHeight: 110,
region: 'center',
- margin: '0 0 ' + (document.body.clientHeight-((sstsConfig.showInspectorField || sstsConfig.showWrapperField || sstsConfig.showSterilizer) ? 470 : 440)) + ' 0',
+// margin: '0 0 ' + (document.body.clientHeight-((sstsConfig.showInspectorField || sstsConfig.showWrapperField || sstsConfig.showSterilizer) ? 470 : 440)) + ' 0',
border: true,
buttonAlign : 'center',
layout: "column",
@@ -1222,10 +1222,17 @@
triggerAction : 'all',
typeAhead : false,
allowBlank : true
- }
- ],
- buttons:[
- {
+ },{
+ columnWidth :.99,
+ xtype : 'panel',
+ border: false,
+ layout: {
+ type: 'hbox',
+ padding:'5',
+ pack:'center',
+ align:'middle'
+ },
+ items:[{
xtype:'button',
id :"save_print",
text:'' + packingBtnText + '',
@@ -1237,14 +1244,15 @@
{
xtype:'button',
id :"packingLableBtn",
-// hidden: !sstsConfig.showPackingGoodsBtn || sstsConfig.printLabelWhenReviewing,
+ margin:'0 0 0 10',
hidden: !sstsConfig.showPackingGoodsBtn,
text:'' + '装配物品' + '',
handler : function() {
packing = false;
packingTousseBtnClick();
}
- }
+ }]
+ }
]
});