Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp
===================================================================
diff -u -r33536 -r34040
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 33536)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.jsp	(.../washAndDisinfectView.jsp)	(revision 34040)
@@ -78,6 +78,7 @@
 var enableEditBtn = false;
 var enableSaveBtn = false;
 var enableSaveAndNewBtn = false;
+var fontSize = '${fontSize}';
 //清洗方式 start
 var washMachine = '<%=WashAndDisinfectRecord.WASHINGMODE_MACHINE%>';
 var washManual = '<%=WashAndDisinfectRecord.WASHINGMODE_MANUAL%>';
Index: ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/form.js
===================================================================
diff -u -r34037 -r34040
--- ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/form.js	(.../form.js)	(revision 34037)
+++ ssts-web/src/main/webapp/disinfectsystem/consumptiveMaterial/consumptiveMaterialContainer/form.js	(.../form.js)	(revision 34040)
@@ -82,7 +82,7 @@
 			id: parentId,
 			name: name,
 			rinserIds: rinserIds,
-			consumptiveMaterialVolumes: (consumptiveMaterialVolumes.length == 0) ? '' : JSON.stringify(consumptiveMaterialVolumes),
+			consumptiveMaterialVolumeStr: (consumptiveMaterialVolumes.length == 0) ? '' : JSON.stringify(consumptiveMaterialVolumes),
 			receiveRecordItems: (receiveRecordItems.length == 0) ? '' : JSON.stringify(receiveRecordItems)
 		},
 		success: function (response, options) {
@@ -159,7 +159,7 @@
 	var disposableGoodsStore = new top.Ext4.data.Store({
 		proxy: {
 			type: 'ajax',
-			url: WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do?consumptiveMaterialUse=' + encodeURIComponent('清洗耗材'),
+			url: WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsData.do',
 			reader: {
 				type: 'json',
 				root: 'data'
@@ -173,6 +173,8 @@
 		listeners: {
 			beforeload: function (store, option) {
 				disposableGoodsStore.proxy.extraParams.wareHouseId = top.Ext4.getCmp('cssdWareHouse').getValue();
+				disposableGoodsStore.proxy.extraParams.consumptiveMaterialTypeId = consumptiveMaterialTypeId;
+				disposableGoodsStore.proxy.extraParams.consumptiveMaterialUse = '清洗耗材';
 			}
 		}
 	});
@@ -374,21 +376,21 @@
 					diposableGoodsID: diposableGoodsID,
 					disposableGoodsBatchStockId: disposableGoodsBatchStockId
 				}
-				if(receiveRecordItems.length > 0){
-					for(var i=0;i<receiveRecordItems.length;i++){
-						if(receiveRecordItems[i].consumptiveMaterialTypeId == consumptiveMaterialTypeId){
+				if (receiveRecordItems.length > 0) {
+					for (var i = 0; i < receiveRecordItems.length; i++) {
+						if (receiveRecordItems[i].consumptiveMaterialTypeId == consumptiveMaterialTypeId) {
 							receiveRecordItems[i] = item;
-						}else {
+						} else {
 							receiveRecordItems.push(item);
 						}
 					}
-				}else {
+				} else {
 					receiveRecordItems.push(item)
 				}
 				var items = [];
 				for (var i = 0; i < rightGridStore.getCount(); i++) {
 					var item = rightGridStore.getAt(i).data;
-					if(item.consumptiveMaterialTypeId == consumptiveMaterialTypeId){
+					if (item.consumptiveMaterialTypeId == consumptiveMaterialTypeId) {
 						item.volume = amount * 5000;
 					}
 					items.push(item);
@@ -421,18 +423,18 @@
 	disposableGoodsStore.load();
 	diposableGoodsBatchNumStore.load();
 
-	if(receiveRecordItems.length > 0){
-		for(var i=0;i<receiveRecordItems.length;i++){
-			if(receiveRecordItems[i].consumptiveMaterialTypeId == consumptiveMaterialTypeId){
+	if (receiveRecordItems.length > 0) {
+		for (var i = 0; i < receiveRecordItems.length; i++) {
+			if (receiveRecordItems[i].consumptiveMaterialTypeId == consumptiveMaterialTypeId) {
 				top.Ext4.getCmp('cssdWareHouse').setValue(receiveRecordItems[i].warehouseId);
 				top.Ext4.getCmp('amount').setValue(receiveRecordItems[i].amount);
 				top.Ext4.getCmp('diposableGoodsID').setValue(receiveRecordItems[i].diposableGoodsID);
 				top.Ext4.getCmp('diposableGoodsName').setValue(receiveRecordItems[i].diposableGoodsID);
 				top.Ext4.getCmp('disposableGoodsBatchStockId').setValue(receiveRecordItems[i].disposableGoodsBatchStockId);
 				var combo = top.Ext4.getCmp("batchNumber");
 				combo.setValue(receiveRecordItems[i].disposableGoodsBatchStockId);
-				for(var k=0;k<diposableGoodsBatchNumStore.getCount();k++){
-					if(diposableGoodsBatchNumStore.getAt(i).data.diposableGoodsBatchNumStore == receiveRecordItems[i].disposableGoodsBatchStockId){
+				for (var k = 0; k < diposableGoodsBatchNumStore.getCount(); k++) {
+					if (diposableGoodsBatchNumStore.getAt(i).data.diposableGoodsBatchNumStore == receiveRecordItems[i].disposableGoodsBatchStockId) {
 						combo.fireEvent('select', combo, diposableGoodsBatchNumStore.getAt(i), 0);
 					}
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js
===================================================================
diff -u -r34037 -r34040
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js	(.../cleanMethodForm.js)	(revision 34037)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/cleanmethod/cleanMethodForm.js	(.../cleanMethodForm.js)	(revision 34040)
@@ -6,10 +6,10 @@
 	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('" + record.data.consumptiveMaterialTypeId + "');\"><img src=\"" + WWWROOT + "/images/web/stop.png\"></img></a>";
 }
 
-function deleteItem(id){
-	for(var i=0;i<listStore.getCount();i++){
+function deleteItem(id) {
+	for (var i = 0; i < listStore.getCount(); i++) {
 		var item = listStore.getAt(i);
-		if(item.data.consumptiveMaterialTypeId == id){
+		if (item.data.consumptiveMaterialTypeId == id) {
 			listStore.remove(item);
 		}
 	}
@@ -47,21 +47,21 @@
 		bodyStyle: 'border:1px solid #afd7af',
 		frame: false,
 		height: 200,
-		hidden:!sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction,
+		hidden: !sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction,
 		store: listStore,
 		tbar: [{
 			text: '耗材消耗'
 		}, '->', {
 			text: '耗材种类：'
-		},{
-			xtype:'hidden',
-			id:'consumptiveMaterialTypeId',
-			name:'consumptiveMaterialTypeId'
-		},{
-			xtype:'hidden',
-			id:'consumptiveMaterialTypeUnit',
-			name:'consumptiveMaterialTypeUnit'
 		}, {
+			xtype: 'hidden',
+			id: 'consumptiveMaterialTypeId',
+			name: 'consumptiveMaterialTypeId'
+		}, {
+			xtype: 'hidden',
+			id: 'consumptiveMaterialTypeUnit',
+			name: 'consumptiveMaterialTypeUnit'
+		}, {
 			xtype: 'combo',
 			fieldLabel: '',
 			id: 'consumptiveMaterialType',
@@ -75,8 +75,8 @@
 			triggerAction: 'all',
 			typeAhead: false,
 			allowBlank: true,
-			listeners:{
-				select:function(v,record){
+			listeners: {
+				select: function (v, record) {
 					top.Ext.getCmp('consumptiveMaterialTypeId').setValue(record.data.id);
 					top.Ext.getCmp('consumptiveMaterialTypeUnit').setValue(record.data.unit);
 				}
@@ -88,33 +88,33 @@
 				var id = top.Ext.getCmp('consumptiveMaterialTypeId').getValue();
 				var name = top.Ext.getCmp('consumptiveMaterialType').getRawValue();
 				var unit = top.Ext.getCmp('consumptiveMaterialTypeUnit').getValue();
-				if(id == '' || name == ''){
+				if (id == '' || name == '') {
 					showResult('请选择耗材种类');
 					return;
 				}
 				var isHas = false;
-				for(var i=0;i<listStore.getCount();i++){
+				for (var i = 0; i < listStore.getCount(); i++) {
 					var item = listStore.getAt(i);
-					if(item.data.name == name){
+					if (item.data.name == name) {
 						isHas = true;
 						continue;
 					}
 				}
-				if(isHas){
+				if (isHas) {
 					showResult('已存在该名称的耗材！');
 					return
 				}
 				var record = Ext.data.Record.create([
-					{name: "consumptiveMaterialTypeId", type: "string"},
-					{name: "name", type: "string"},
-					{name: "unit", type: "string"},
-					{name: "volume", type: "string"}
-		  		]);
+					{ name: "consumptiveMaterialTypeId", type: "string" },
+					{ name: "name", type: "string" },
+					{ name: "unit", type: "string" },
+					{ name: "volume", type: "string" }
+				]);
 				var item = new record({
-					consumptiveMaterialTypeId:id,
-					name:name,
-					unit:unit,
-					volume:''
+					consumptiveMaterialTypeId: id,
+					name: name,
+					unit: unit,
+					volume: ''
 				});
 				listStore.add(item)
 			}
@@ -126,9 +126,9 @@
 			{
 				header: "单次消耗容量", width: 100, dataIndex: 'volume', menuDisabled: true,
 				editor: new top.Ext.form.TextField({
-					regex: /^(([1-9]+[0-9]*.{1}[0-9]+)|([0].{1}[1-9]+[0-9]*)|([0-9][0-9]*)|([0][.][0-9]+[1-9]*))$/,
-					regexText:'只能输入正数',
-					allowBlank : true
+					regex: /^(([0-9]+[0-9]*.{1}[0-9]+)|([0].{1}[1-9]+[0-9]*)|([1-9][0-9]*)|([0][.][0-9]+[1-9]*))$/,
+					regexText: '只能输入正数',
+					allowBlank: true
 				})
 			},
 			{ header: "删除", width: 50, menuDisabled: true, dataIndex: 'deleteButton', renderer: renderDeleteButton }
@@ -253,17 +253,17 @@
 			success: function (form, action) {
 				var cleanMethodConsumptionVolumes = action.result.data.cleanMethodConsumptionVolumes || [];
 				var record = Ext.data.Record.create([
-					{name: "consumptiveMaterialTypeId", type: "string"},
-					{name: "name", type: "string"},
-					{name: "unit", type: "string"},
-					{name: "volume", type: "string"}
-		  		]);
-				for(var i=0;i<cleanMethodConsumptionVolumes.length;i++){
+					{ name: "consumptiveMaterialTypeId", type: "string" },
+					{ name: "name", type: "string" },
+					{ name: "unit", type: "string" },
+					{ name: "volume", type: "string" }
+				]);
+				for (var i = 0; i < cleanMethodConsumptionVolumes.length; i++) {
 					var item = new record({
-						consumptiveMaterialTypeId:cleanMethodConsumptionVolumes[i].consumptiveMaterialType.id,
-						name:cleanMethodConsumptionVolumes[i].consumptiveMaterialType.name,
-						unit:cleanMethodConsumptionVolumes[i].consumptiveMaterialType.unit,
-						volume:cleanMethodConsumptionVolumes[i].volume
+						consumptiveMaterialTypeId: cleanMethodConsumptionVolumes[i].consumptiveMaterialType.id,
+						name: cleanMethodConsumptionVolumes[i].consumptiveMaterialType.name,
+						unit: cleanMethodConsumptionVolumes[i].consumptiveMaterialType.unit,
+						volume: cleanMethodConsumptionVolumes[i].volume
 					});
 					listStore.add(item)
 				}
@@ -303,19 +303,38 @@
 			var result = Ext.decode(response.responseText);
 			if (result.stauts == 1) {
 				var cleanMethodConsumptionVolumes = [];
-				for(var i=0;i<listStore.getCount();i++){
-					var item = listStore.getAt(i);
-					cleanMethodConsumptionVolumes.push({
-						consumptiveMaterialTypeId:item.data.consumptiveMaterialTypeId,
-						volume:item.data.volume
-					})
+				if (sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction) {
+					var msg = '';
+					if (listStore.getCount() == 0) {
+						showResult('该清洗程序没有配置耗材！');
+						top.Ext.getCmp('saveBtn').enable();
+						top.Ext.getCmp('saveAndPrint').enable();
+						return;
+					}
+					for (var i = 0; i < listStore.getCount(); i++) {
+						var item = listStore.getAt(i);
+						if (item.data.volume == '') {
+							msg = '请填写消耗容量！';
+							continue
+						}
+						cleanMethodConsumptionVolumes.push({
+							consumptiveMaterialTypeId: item.data.consumptiveMaterialTypeId,
+							volume: item.data.volume
+						})
+					}
+					if (msg !== '') {
+						showResult(msg);
+						top.Ext.getCmp('saveBtn').enable();
+						top.Ext.getCmp('saveAndPrint').enable();
+						return;
+					}
 				}
 				formObj.form.submit({
 					url: WWWROOT + '/disinfectSystem/baseData/cleanMethodAction!saveCleanMethod.do',
 					method: 'POST',
 					waitMsg: '正在保存数据，请稍候',
 					waitTitle: '提交表单',
-					params:{cleanMethodConsumptionVolumes:JSON.stringify(cleanMethodConsumptionVolumes)},
+					params: { cleanMethodConsumptionVolumeStr: JSON.stringify(cleanMethodConsumptionVolumes) },
 					success: function (form, action) {
 						if (print) {
 							var barcodeStr = action.result.barcode;
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r34037 -r34040
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34037)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 34040)
@@ -866,7 +866,11 @@
 
 	fieldsetHeight = (!!window.ActiveXObject || "ActiveXObject" in window || window.navigator.userAgent.indexOf("MSIE") >= 1) ? 185 : 210;
 	if(sstsConfig.enableRinserConsumptiveMaterialConsumptionFunction){
-		fieldsetHeight += 40;
+		if(fontSize == 12){
+			fieldsetHeight += 40;
+		}else {
+			fieldsetHeight += 60;
+		}
 	}
 
 	formObj = new top.Ext.FormPanel({
@@ -891,7 +895,7 @@
 					width: fieldsetWidth,
 					height: fieldsetHeight,
 					columnWidth: 1,
-					labelWidth: 95,
+					labelWidth: 105,
 					items: [{
 						layout: 'column',
 						items: [{
@@ -1305,7 +1309,6 @@
 						}, {
 							columnWidth: 1,
 							layout: 'form',
-							hidden:true,
 							id:'hiddenBox1',
 							items: [{
 								xtype: 'textfield',
@@ -1315,11 +1318,17 @@
 								readOnly: true,
 								cls : 'fieldReadOnlyNoRemove',
 								anchor: '99%'
-							}]
-						}, {
+							}],
+							listeners:{
+								render:function(){
+									setTimeout(function(){
+										top.Ext.getCmp('hiddenBox1').hide();
+									}, 100);
+								}
+							}
+						},{
 							columnWidth: 1,
 							layout: 'form',
-							hidden:true,
 							id:'hiddenBox2',
 							items: [{
 								xtype: 'textfield',
@@ -1329,7 +1338,14 @@
 								readOnly: true,
 								cls : 'fieldReadOnlyNoRemove',
 								anchor: '99%'
-							}]
+							}],
+							listeners:{
+								render:function(){
+									setTimeout(function(){
+										top.Ext.getCmp('hiddenBox2').hide();
+									}, 100);
+								}
+							}
 						}, {
 							columnWidth: 1,
 							layout: 'form',