Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r35541 -r35557
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 35541)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 35557)
@@ -805,29 +805,6 @@
 
 						}, {
 							layout: 'form',
-							labelWidth: fontSize == 12 ? 180 : 210,
-							labelAlign: "right",
-							columnWidth: .25,
-							items: [{
-								xtype: 'combo',
-								fieldLabel: '是否清洗时间结束后装配',
-								id: 'isPackingAfterWashTimeEnd',
-								name: 'isPackingAfterWashTimeEnd',
-								valueField: 'value',
-								displayField: 'value',
-								mode: 'local',
-								anchor: '100%',
-								editable: false,
-								store: new Ext.data.SimpleStore({
-									fields: ['value'],
-									data: [['是'], ['否']]
-								}),
-								forceSelection: true,
-								allowBlank: false,
-								triggerAction: 'all'
-							}]
-						}, {
-							layout: 'form',
 							labelWidth: 180,
 							columnWidth: .25,
 							items: [{
@@ -3366,11 +3343,6 @@
 						showResult('器械包发货时间不能为空！');
 						return false;
 					}
-					var isPackingAfterWashTimeEnd = Ext.getCmp("isPackingAfterWashTimeEnd").getValue();
-					if (isPackingAfterWashTimeEnd == "") {
-						showResult('是否清洗时间结束后装配不能为空！');
-						return false;
-					}
 					var printUserName = Ext.getCmp("printUserName").getValue();
 					if (printUserName == "") {
 						showResult('配包打印用户姓名不能为空！');
@@ -3689,7 +3661,6 @@
 							isCustomTousseCleanEntirely: isCustomTousseCleanEntirely,//
 							isSecondSupplyRoomNeedRecycle: isSecondSupplyRoomNeedRecycle,//
 							isSecondSupplyRoomAutoInvoice: isSecondSupplyRoomAutoInvoice,//
-							isPackingAfterWashTimeEnd: isPackingAfterWashTimeEnd,//
 							toussePriceFluctuation: toussePriceFluctuation,//
 							printUserName: printUserName,//
 							mergeTousseRuleForInvoiceBatchPrint: mergeTousseRuleForInvoiceBatchPrint,//
@@ -3901,11 +3872,6 @@
 			} else {
 				Ext.getCmp('isSecondSupplyRoomNeedRecycle').setValue('否');
 			}
-			if (supplyRoomConfig.isPackingAfterWashTimeEnd == false) {
-				Ext.getCmp('isPackingAfterWashTimeEnd').setValue('否');
-			} else {
-				Ext.getCmp('isPackingAfterWashTimeEnd').setValue('是');
-			}
 
 			if (supplyRoomConfig.afterRecyclingTousseDeliver) {
 				Ext.getCmp('afterRecyclingTousseDeliver').setValue('是');
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r32837 -r35557
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 32837)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 35557)
@@ -251,7 +251,7 @@
 			items : [ {
 				columnWidth : 0.5,
 				layout : 'form',
-				labelWidth : 80,
+				labelWidth : 100,
 				items : [{
 					xtype : 'textfield',
 					fieldLabel : "条码",
@@ -428,9 +428,23 @@
 						}
 					} 
 				 },{
+					xtype : 'combo',
+					fieldLabel : '是否清洗时间结束后装配',
+					name : 'isPackingAfterWashTimeEnd',
+					id : 'isPackingAfterWashTimeEnd',
+					valueField : 'value',
+					displayField : 'value',
+					forceSelection : true,
+					editable : false,
+					store : yesNoStore,
+					mode : 'local',
+				   triggerAction : 'all',
+				   value:'否',
+					anchor : '95%'
+			   },{
 					columnWidth : 0.5,
 					layout : 'form',
-					labelWidth : 80,
+					labelWidth : 100,
 					hidden:false,
 					id:'timingCompleteWashItems',
 					items:[{