Index: ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js
===================================================================
diff -u -r37078 -r37091
--- ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37078)
+++ ssts-web/src/main/webapp/buttjoint/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37091)
@@ -534,11 +534,64 @@
 		data: patientAreaList
 	});
 
+	var departJsonStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do?related=false',
+			reader: {
+				type: 'json',
+				totalProperty: 'totalCount',
+				root: 'data'
+			}
+		},
+		fields: [
+			{ name: 'id', mapping: 'id' }, { name: 'name', mapping: 'name' }
+		],
+		listeners: {
+			load: function (thiz, records, options) {
+				if (records.length > 0) {
+					departJsonStore.insert(0, { 'id': '', 'name': '全部' });
+				}
+			}
+		}
+	});
+	departJsonStore.load();
+
 	var tousseCm = [
 		{ header: "name", dataIndex: 'tousseDefinitionName', hidden: true, menuDisabled: true },
 		{ header: "条码", dataIndex: 'barcode', width: 120/*,menuDisabled : true,renderer : renderTousseInstanceInfoShowFun*/ },
 		{ id: 'showTousseName', header: "名称", dataIndex: 'showTousseName', width: 150, menuDisabled: true/*,renderer : renderTousseInstanceNameForUrgent*/ },
 		{
+			header: '结算科室', dataIndex: 'settleAccountDeptNameUseRecord', width: 100, hidden: (!sstsConfig.enableTheSettlementDepartmentIsDepartOfPatientFunction),
+			editor: {
+				xtype: 'combo',
+				valueField: 'name',
+				displayField: 'name',
+				queryParam: 'spell',
+				minChars: 0,
+				store: departJsonStore,
+				forceSelection: false,
+				lazyInit: true,
+				//disabled: SSTS_UseRecord_Update,
+				triggerAction: 'all',
+				typeAhead: false,
+				pageSize: 25,
+				matchFieldWidth: false,
+				listConfig: { width: 300 },
+				anchor: '96%',
+				listeners: {
+					select: function (combo, record, index) {
+						var records = Ext4.getCmp('tousseInstanceGrid').getSelectionModel().getSelection();
+						if (records[0]) {
+							records[0].set('settleAccountDeptNameUseRecord', record[0].data.name)
+							records[0].set('settleAccountDeptCodeUseRecord', record[0].data.id)
+						}
+					}
+				}
+			},
+			menuDisabled: true
+		},
+		{
 			header: '加急', width: 35, hidden: true,
 			renderer: function (v, p, record, rowIndex, colIndex) {
 				var imgName = (record.data.isUrgentForUseRecord == '是') ? 'arrow_down' : 'arrow_top';
@@ -564,12 +617,12 @@
 				allowBlank: false,
 				listeners: {
 					focus: function (thiz) {
-						var record = Ext4.getCmp('tousseInstanceGrid').getSelectionModel().getSelected();
-						if (record.data.tousseType == '一次性物品' && record.data.goodsType != '高值耗材') {
+						var records = Ext4.getCmp('tousseInstanceGrid').getSelectionModel().getSelection();
+						if (records[0].data.tousseType == '一次性物品' && records[0].data.goodsType != '高值耗材') {
 							thiz.selectText();
-						} else if (record.data.tousseType != '一次性物品') {
+						} else if (records[0].data.tousseType != '一次性物品') {
 							Ext4.MessageBox.alert("提示", "不能修改器械包数量！");
-						} else if (record.data.goodsType == '高值耗材') {
+						} else if (records[0].data.goodsType == '高值耗材') {
 							Ext4.MessageBox.alert("提示", "不能修改高值耗材数量！");
 						}
 					}
@@ -628,8 +681,27 @@
 			},
 			menuDisabled: true,
 			dataIndex: 'button'
-		}];
+		}
+	];
 
+	Ext4.define('cellEditingGrid', {
+		extend: 'Ext4.grid.Panel',
+		xtype: 'cell-editing',
+		useArrows: true,
+		columnLines: true,
+		rowLines: true,
+		cls: 'no-leaf-icons',
+		initComponent: function () {
+			this.cellEditing = new Ext4.grid.plugin.CellEditing({
+				clicksToEdit: 1
+			});
+			Ext4.apply(this, {
+				plugins: [this.cellEditing]
+			});
+			this.superclass.initComponent.call(this);
+		}
+	});
+
 	var formObj = new Ext4.form.Panel({
 		frame: true,
 		labelSeparator: '：',
@@ -1341,7 +1413,7 @@
 			title: "器械包信息",
 			layout: 'column',
 			autoHeight: true,
-			items: [new Ext4.grid.Panel({
+			items: [new Ext4.create('cellEditingGrid', {
 				id: 'tousseInstanceGrid',
 				store: useItemsStore,
 				//				selModel:Ext4.create('Ext4.selection.CheckboxModel'),
@@ -1354,6 +1426,9 @@
 				viewConfig: {
 					forceFit: true
 				},
+				selModel: Ext4.create('Ext4.selection.CheckboxModel', {
+					mode: 'SINGLE'
+				}),
 				bodyStyle: 'border:1px solid #afd7af',
 				//				selModel :sm,
 				tbar: [{
Index: ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml
===================================================================
diff -u -r37079 -r37091
--- ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 37079)
+++ ssts-web/src/main/webapp/WEB-INF/spring/security-standard/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 37091)
@@ -92,6 +92,7 @@
 			<intercept-url pattern="/disinfectsystem/operationReservationAction!findTodayOperationReservatonAmount.do" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectSystem/baseData/specialInfectionAction!loadEnableSpecialInfectionList.do" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectsystem/basedatamanager/operationOrgAction!findOrgUnitOperationName.do" access="permitAll"></intercept-url>
+			<intercept-url pattern="/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do" access="permitAll"></intercept-url>
 			<!--  user is not an anonymous or a remember-me user -->
 			<intercept-url pattern="/**" access="isFullyAuthenticated()"></intercept-url>
 			<form-login login-page="/logon.jsp" always-use-default-target="true" default-target-url="/openSystemMainPage.jsp" authentication-failure-url="/logon.jsp?login_error=1"></form-login>