Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
===================================================================
diff -u -r33961 -r33976
--- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 33961)
+++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 33976)
@@ -535,4 +535,10 @@
 .fieldReadOnlyNoRemove input {
     background: #eee !important;
     cursor: default;
+}
+
+/* ZSYY-280：按钮背景样式*/
+#tousseFormInfo .x-panel-footer, #signBoardID .x-panel-footer {
+    background: transparent url(../resources/images/default/panel/top-bottom.gif) repeat-x 0 bottom;
+    zoom: 1;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r33889 -r33976
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 33889)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 33976)
@@ -238,7 +238,7 @@
 		top.Ext.getCmp('newSaveBtn').enable();
 		return false;
 	}
-	save2(newName, top.Ext.getCmp('saveBtn'), true);
+	save2(newName, top.Ext.getCmp('saveBtn'), true, true);
 }
 
 function newSave() {
@@ -751,7 +751,7 @@
 		name: 'configGrid',
 		store: configStore,
 		cm: materialCm,
-		height: 440,
+		height: top.screen.height > 800 ? 610 : 450,
 		frame: false,
 		bodyStyle: 'border:1px solid #afd7af',
 		autoExpandColumn: 'count',
@@ -2675,98 +2675,6 @@
 					showImagePanel(id)
 				]
 			}]
-		}],
-		buttons: [{
-			id: 'saveBtn',
-			text: '保存',
-			handler: function () {
-				save2(null, this, false);
-			}
-		}, {
-			xtype: 'button',
-			text: "另存为",
-			id: "saveAsTousse",
-			listeners: {
-				click: function (thiz) {
-					newSave();
-					/* top.Ext.MessageBox.prompt("提示","请输入器械包名称",function(bu, txt){
-						 if(bu == 'ok'){
-							 save2(txt,thiz); 
-						 }else{
-							 return false;
-						 }
-					 }); */
-				}
-			}
-		}, {
-			text: '打印条码',
-			id: 'printTDBarcode',
-			handler: function () {
-				printTDBarcode(id);
-			}
-		}, {
-			text: '器械包图片',
-			id: 'uploadFile',
-			hidden: id == 0 ? true : false,
-			handler: function () {
-				var tousseName = top.Ext.getCmp('name').getValue();
-				uploadToussePackingImageFile(imageTypeTousse, id, tousseName);
-			}
-		}, {
-			text: '说明书',
-			id: 'uploadFile',
-			hidden: id == 0 ? true : false,
-			handler: function () {
-				var tousseName = top.Ext.getCmp('name').getValue();
-				uploadToussePackingImageFile(imageTypeSpecification, id, tousseName);
-			}
-		}, {
-			text: '清洗操作指引',
-			menu: new top.Ext.menu.Menu({
-				items: [{
-					text: '清洗指引图片',
-					id: 'washGuideImageFile',
-					hidden: id == 0 ? true : false,
-					handler: function () {
-						var tousseName = top.Ext.getCmp('name').getValue();
-						uploadToussePackingImageFile(imageTypeWashGuide, id, tousseName);
-					}
-				}, {
-					text: '清洗教学视频',
-					id: 'washGuideVedio',
-					handler: function () {
-						var tousseName = top.Ext.getCmp('name').getValue();
-						uploadToussePackingVideoFile(vidoeTypeTousseWashTeaching, id, tousseName);
-					}
-				}]
-			})
-		}, {
-			text: '装配教学',
-			menu: new top.Ext.menu.Menu({
-				items: [{
-					text: '装配教学图片',
-					id: 'uploadToussePackingImageFile',
-					hidden: id == 0 ? true : false,
-					handler: function () {
-						var tousseName = top.Ext.getCmp('name').getValue();
-						uploadToussePackingImageFile(imageTypeToussePacking, id, tousseName);
-					}
-				}, {
-					text: '装配教学视频',
-					id: 'uploadVedio',
-					handler: function () {
-						var tousseName = top.Ext.getCmp('name').getValue();
-						uploadToussePackingVideoFile(videoType, id, tousseName);
-					}
-				}]
-			})
-		}, {
-			text: '取消',
-			id: 'saveAndNewBtn',
-			handler: function () {
-				tousseWin.close();
-				grid.dwrReload();
-			}
 		}]
 	});
 
@@ -2780,14 +2688,105 @@
 			bufferResize: true,
 			deferredRender: false,
 			items: [{
-				id: 'abc',
+				id: 'tousseFormInfo',
 				layout: 'column',
 				title: '基本信息',
-				//		   		autoScroll : true,
 				items: [formObj, {
 					columnWidth: 0.4,
 					layout: 'fit',
 					items: [materialsPanel]
+				}],
+				buttonAlign : 'center',
+				buttons: [{
+					id: 'saveBtn',
+					text: '保存',
+					handler: function () {
+						save2(null, this, false, false);
+					}
+				}, {
+					id: 'saveBtnAndClose',
+					text: '保存并关闭',
+					handler: function () {
+						save2(null, this, false, true);
+					}
+				}, {
+					xtype: 'button',
+					text: "另存为",
+					id: "saveAsTousse",
+					listeners: {
+						click: function (thiz) {
+							newSave();
+						}
+					}
+				}, {
+					text: '打印条码',
+					id: 'printTDBarcode',
+					handler: function () {
+						printTDBarcode(id);
+					}
+				}, {
+					text: '器械包图片',
+					id: 'uploadFile',
+					hidden: id == 0 ? true : false,
+					handler: function () {
+						var tousseName = top.Ext.getCmp('name').getValue();
+						uploadToussePackingImageFile(imageTypeTousse, id, tousseName);
+					}
+				}, {
+					text: '说明书',
+					id: 'uploadFile',
+					hidden: id == 0 ? true : false,
+					handler: function () {
+						var tousseName = top.Ext.getCmp('name').getValue();
+						uploadToussePackingImageFile(imageTypeSpecification, id, tousseName);
+					}
+				}, {
+					text: '清洗操作指引',
+					menu: new top.Ext.menu.Menu({
+						items: [{
+							text: '清洗指引图片',
+							id: 'washGuideImageFile',
+							hidden: id == 0 ? true : false,
+							handler: function () {
+								var tousseName = top.Ext.getCmp('name').getValue();
+								uploadToussePackingImageFile(imageTypeWashGuide, id, tousseName);
+							}
+						}, {
+							text: '清洗教学视频',
+							id: 'washGuideVedio',
+							handler: function () {
+								var tousseName = top.Ext.getCmp('name').getValue();
+								uploadToussePackingVideoFile(vidoeTypeTousseWashTeaching, id, tousseName);
+							}
+						}]
+					})
+				}, {
+					text: '装配教学',
+					menu: new top.Ext.menu.Menu({
+						items: [{
+							text: '装配教学图片',
+							id: 'uploadToussePackingImageFile',
+							hidden: id == 0 ? true : false,
+							handler: function () {
+								var tousseName = top.Ext.getCmp('name').getValue();
+								uploadToussePackingImageFile(imageTypeToussePacking, id, tousseName);
+							}
+						}, {
+							text: '装配教学视频',
+							id: 'uploadVedio',
+							handler: function () {
+								var tousseName = top.Ext.getCmp('name').getValue();
+								uploadToussePackingVideoFile(videoType, id, tousseName);
+							}
+						}]
+					})
+				}, {
+					text: '取消',
+					id: 'saveAndNewBtn',
+					handler: function () {
+						tousseWin.close();
+						grid.dwrReload();
+					}
 				}]
 			}, {
 				id: 'signBoardID',
@@ -2810,7 +2809,7 @@
 		width: fontSize == 12 ? 1200 : 1300,
 		border: false,
 		modal: true,
-		height: top.screen.height > 800 ? 660 : 500,
+		height: top.screen.height > 800 ? 710 : 550,
 		plain: true,
 		items: [tabs ? tabs : {
 			id: 'abc',
@@ -3083,7 +3082,7 @@
 	return disinfectionPrice;
 }
 
-function validateAndSubmit2(TousseName, isExpend) {
+function validateAndSubmit2(TousseName, isExpend, isCloseWindow) {
 	var orginalName = top.Ext.getCmp('orginalName').getValue();  //原器械包名称
 	var orginalSpelling = top.Ext.getCmp('orginalSpelling').getValue();  //原拼音码
 	var name = top.Ext.getCmp('name').getValue();
@@ -3190,7 +3189,11 @@
 						if (isExpend) {//如果是另存为的话，就还要关闭另存信息弹窗
 							newSaveMsgWin.close();
 						}
-						tousseWin.close();
+						if(isCloseWindow){
+							tousseWin.close();
+						}else {
+							top.Ext.getCmp('saveBtn').enable();
+						}
 						showResult('保存成功');
 						grid.dwrReload();
 					},
@@ -3212,7 +3215,7 @@
 
 }
 
-function save2(TousseName, thiz, isExpend) {
+function save2(TousseName, thiz, isExpend, isCloseWindow) {
 	var isExpend = isExpend;
 	thiz.disable();
 	if (!formObj.form.isValid()) {
@@ -3260,12 +3263,12 @@
 		}
 	}
 	if (isExpend) {
-		validateAndSubmit2(TousseName, isExpend);
+		validateAndSubmit2(TousseName, isExpend, isCloseWindow);
 	} else {
 		top.Ext.MessageBox.confirm("请确认", "是否确定要保存器械包？",
 			function (button, text) {
 				if ("yes" == button) {
-					validateAndSubmit2(TousseName, isExpend);
+					validateAndSubmit2(TousseName, isExpend, isCloseWindow);
 				} else {
 					thiz.enable();
 				}
Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
===================================================================
diff -u -r33576 -r33976
--- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css	(.../common.css)	(revision 33576)
+++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css	(.../common.css)	(revision 33976)
@@ -433,4 +433,16 @@
     left: 0;
     top: 0;
     z-index: 99;
+}
+
+/* ZSYY-303：只读样式*/
+.fieldReadOnlyNoRemove input {
+    background: #eee !important;
+    cursor: default;
+}
+
+/* ZSYY-280：按钮背景样式*/
+#tousseFormInfo .x-panel-footer, #signBoardID .x-panel-footer {
+    background: transparent url(../resources/images/default/panel/top-bottom.gif) repeat-x 0 bottom;
+    zoom: 1;
 }
\ No newline at end of file