Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r12799 -r12825
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12799)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 12825)
@@ -790,6 +790,19 @@
 	return deptCoding;
 }
 
+//根据科室名称得到处理科室的code
+function getHandleDepartCoding(store,deptName){
+	var deptCoding = "";
+	for(var i = 0;i<store.data.length;i++){
+		var record = store.getAt(i);
+		if(record.get('name') == deptName){
+			deptCoding = record.get('cssdOrgUnitCode');
+			break;
+		}
+	}
+	return deptCoding;
+}
+
 // 如果结算科室为空，设置结算科室的默认值为申请科室
 function setSettleAccountsDepartDefaultValue(deptName, deptCoding, settleAccountStore){
 	var cmp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #settleAccountsDepart")[0];
@@ -1910,7 +1923,7 @@
 								listeners:{
 									select:function(combo, record, index){
 										var deptName = top.Ext4.getCmp("handleDepart").getValue();
-										var deptCoding = getDepartCoding(handleDepartStore,deptName);
+										var deptCoding = getHandleDepartCoding(handleDepartStore,deptName);
 										top.Ext4.getCmp("handleDepartCoding").setValue(deptCoding);
 										
 										comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = combo.value;
@@ -2189,6 +2202,24 @@
 //		departComp.disable();
 		var departCodingComp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #departCoding")[0];
 		departCodingComp.setValue($Id('departCoding').value);
+		
+		//选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
+		handleDepartStore.proxy.extraParams.applyDepartCode = $Id('departCoding').value;
+		handleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType;
+		handleDepartStore.load({
+			//params:{applyDepartCode:deptCoding,tousseType:invoicePlanForTousseType},
+			callback: function(records, operation, success) {
+				var record = records;
+				if (records.length == 1){
+					record = records[0];
+					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();
+				}
+			}
+		});
 	}
 	if(id == ""){//添加 
 		// 设置表单的默认焦点
Index: ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js
===================================================================
diff -u -r12811 -r12825
--- ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12811)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakeinfomanager/stockTakeInfoView.js	(.../stockTakeInfoView.js)	(revision 12825)
@@ -29,7 +29,12 @@
 	    {name : 'spelling',mapping : 'spelling'}, 
 	    {name : 'storage',mapping : 'storage'}, 
 	    {name : 'name',mapping : 'name'}]
-	)
+	),
+	listeners : {
+		beforeload : function(store,option) {
+			store.baseParams['wareHouseId'] = top.Ext.getCmp('wareHouseId').getValue(id);
+		}
+	}
 });
 
 var StockTakeItemRecord = Ext.data.Record.create(StockTakeItemProperties);