Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r12702 -r12749
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12702)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12749)
@@ -223,7 +223,7 @@
 	fields : [
 	    /*{name : 'cssdOrgUnitId',mapping : 'cssdOrgUnitId'},*/
 	    {name : 'cssdOrgUnitCode',mapping : 'cssdOrgUnitCode'},
-	    {name : 'cssdOrgUnitName',mapping : 'cssdOrgUnitName'}
+	    {name : 'name',mapping : 'cssdOrgUnitName'}
 	]
 });
 handleDepartStore.reload();
@@ -1726,8 +1726,8 @@
 								}, 
 								{
 									xtype : 'hidden',
-									name : 'handleDepartName',
-									id : 'handleDepartName'
+									name : 'handleDepartCoding',
+									id : 'handleDepartCoding'
 								}, {
 									xtype : 'hidden',
 									name : 'isDiposableGoods',
@@ -1840,9 +1840,8 @@
 												var record = records;
 												if (records.length == 1){
 													record = records[0];
-													top.Ext4.getCmp("handleDepart").setValue(record.data.cssdOrgUnitCode);
-													//top.Ext4.getCmp("handleDepart").setValue(record.data.cssdOrgUnitName);
-													top.Ext4.getCmp('handleDepart').setRawValue(record.data.cssdOrgUnitName);
+													top.Ext4.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
+													top.Ext4.getCmp('handleDepart').setValue(record.data.name);
 													
 													comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = record.data.cssdOrgUnitCode;
 													comboGoodsStore.reload();
@@ -1898,8 +1897,8 @@
 								id : 'handleDepart',
 								name : 'handleDepart',
 								minChars : 0,
-								valueField : 'cssdOrgUnitCode',
-								displayField : 'cssdOrgUnitName',
+								valueField : 'name',
+								displayField : 'name',
 								store : handleDepartStore,
 								forceSelection : true,
 								lazyInit : true,
@@ -1910,9 +1909,9 @@
 								flex : 1,
 								listeners:{
 									select:function(combo, record, index){
-										console.log(combo);console.log(record);
-										//alert(combo.getValue() + '=' + combo.value);alert(combo.getRawValue() + '=' + combo.rawValue);
-										top.Ext4.getCmp("handleDepartName").setValue(combo.rawValue);
+										var deptName = top.Ext4.getCmp("handleDepart").getValue();
+										var deptCoding = getDepartCoding(handleDepartStore,deptName);
+										top.Ext4.getCmp("handleDepartCoding").setValue(deptCoding);
 										
 										comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = combo.value;
 										comboGoodsStore.reload();
@@ -2490,6 +2489,12 @@
 		top.Ext4.getCmp("settleAccountsDepart").forceSelection = true;
 		
 		top.Ext4.getCmp("settleAccountsDepartCoding").setValue(recyclingApplication.settleAccountsDepartCoding);
+		
+		top.Ext4.getCmp("handleDepart").forceSelection = false;
+		top.Ext4.getCmp("handleDepart").setValue(recyclingApplication.handleDepart);		
+		top.Ext4.getCmp("handleDepart").forceSelection = true;
+		top.Ext4.getCmp("handleDepartCoding").setValue(recyclingApplication.handleDepartCoding);
+		
 		if(recyclingApplication.applicationTime){
 			top.Ext4.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(recyclingApplication.applicationTime.time),'Y-m-d H:i'));
 		}