Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r24994 -r27230
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 24994)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js	(.../operationReservationView.js)	(revision 27230)
@@ -202,6 +202,26 @@
         Ext.apply(store.baseParams, new_params);
 	});
 	
+	//手术间的store
+	var operationRoomJsonStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/operationRoomAction!getOperationRoomByOrgUnitCode.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		},[
+			{name : 'id',mapping : 'id'},
+			{name : 'operationRoomName',mapping : 'operationRoomName'}
+		 ]
+		),
+		listeners: {
+			beforeload: function(s,options){	
+				s.baseParams.orgUnitCode = top.Ext.getCmp('departCoding').getValue();
+			}
+		}
+	});
 	//添加明细
 	function addItems(itemId,tousseDefinitionId,name,amount){
 		if(name == null || name == ''){
@@ -338,8 +358,10 @@
 							top.Ext.getCmp('departCoding').setValue(record.data.id);
 							top.Ext.getCmp('depart').setValue(record.data.name);
 							operationNameStore.load();
-							
 							handleDepartStore.load();
+							operationRoomJsonStore.baseParams.orgUnitCode = record.data.id;
+							operationRoomJsonStore.load();
+							
 						}
 					}
 				}]
@@ -371,14 +393,35 @@
 				layout : 'form',
 				labelWidth : 65,
 				items : [{
-					xtype : 'textfield',
+					xtype : sstsConfig.onlySelectExistedOperationRoom ? 'combo' :'textfield',
 					fieldLabel : '手术间',
 					id : 'operatingRoom',
 					name : 'operatingRoom',
+					minChars : 0,
 					maxLength:10,
 					maxLengthText :'长度超过限制，不能保存！',
 					allowBlank : useRecordOperationRoomAllowBlank,
-					anchor : '100%'
+					anchor : '100%',
+					valueField : 'operationRoomName',
+					displayField : 'operationRoomName',
+					listConfig: {width : 193},
+					matchFieldWidth: false,
+					store : sstsConfig.onlySelectExistedOperationRoom ? operationRoomJsonStore : "",
+					lazyInit : true,
+					triggerAction : sstsConfig.onlySelectExistedOperationRoom ? 'all' : "",
+					hideTrigger : sstsConfig.onlySelectExistedOperationRoom ? false: true,//隐藏向下箭头
+					typeAhead : false,
+					editable: sstsConfig.onlySelectExistedOperationRoom ? false : true,
+					forceSelection : sstsConfig.onlySelectExistedOperationRoom ? true: false
+				
+					/* xtype : 'textfield',
+					fieldLabel : '手术间',
+					id : 'operatingRoom',
+					name : 'operatingRoom',
+					maxLength:10,
+					maxLengthText :'长度超过限制，不能保存！',
+					allowBlank : useRecordOperationRoomAllowBlank,
+					anchor : '100%' */
 				}]
 			},{
 				columnWidth : .33,