Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r30064 -r30065
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 30064)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 30065)
@@ -988,13 +988,24 @@
 					layout: 'form',
 					labelWidth: labelWidth,
 					items: [{
-						xtype: 'textfield',
-						fieldLabel: '结算科室',
-						id: 'settleAccountsDepart',
-						name: 'settleAccountsDepart',
-						disabled: !editableConfig.editable,
-						allowBlank: true,
-						anchor: '80%'
+						xtype : 'combo',
+						id : 'settleAccountsDepart',
+						name : 'settleAccountsDepart',
+						disabled:!editableConfig.editable,
+						queryParam : 'spell',
+						fieldLabel : '结算科室',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'name',
+						displayField : 'name',
+						anchor : '80%',
+						store : departJsonStore,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false
 					}]
 				}, {
 					columnWidth: .5,
@@ -2127,13 +2138,24 @@
 					layout: 'form',
 					labelWidth: labelWidth,
 					items: [{
-						xtype: 'textfield',
-						fieldLabel: '结算科室',
-						id: 'settleAccountsDepart',
-						name: 'settleAccountsDepart',
-						disabled: !editableConfig.editable,
-						allowBlank: true,
-						anchor: '80%'
+						xtype : 'combo',
+						id : 'settleAccountsDepart',
+						name : 'settleAccountsDepart',
+						disabled:!editableConfig.editable,
+						queryParam : 'spell',
+						fieldLabel : '结算科室',
+						queryParam : 'spell',
+						minChars : 0,
+						valueField : 'name',
+						displayField : 'name',
+						anchor : '80%',
+						store : departJsonStore,
+						forceSelection : true,
+						lazyInit : true,
+						triggerAction : 'all',
+						hideTrigger : true,
+						typeAhead : false,
+						allowBlank : false
 					}]
 				}, {
 					columnWidth: 1,