Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r14251 -r14271
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14251)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 14271)
@@ -1,4 +1,5 @@
 var entityName = "申请";
+var isOpenLoadTemplateByUnit = sstsConfig.isOpenLoadTemplateByUnit;
 var grid;
 var cm;
 var tousseSum;
@@ -880,30 +881,44 @@
 		var isApplyEntireTousse = node.get('isApplyEntireTousse');
 		var tousseType = node.get('tousseType');
 		if(!Ext4.isEmpty(count) || (isApplyEntireTousse == '否' && tousseType == '消毒物品')){
+			var obj = {};
+			obj.name = node.get("name");
+			obj.count = count;
+			obj.unit = node.get("unit");
+			obj.tousseDefinitionID = node.get("tousseDefinitionID");
+			obj.diposable = node.get("diposable");
+			obj.id = node.get("id");
+			obj.isApplyEntireTousse = node.get("isApplyEntireTousse");
+			obj.leaf = node.get("leaf");
+			obj.price = node.get("price");
+			obj.totalPrice = node.get("totalPrice");
+			obj.tousseType = node.get("tousseType");
+			obj.externalCode = node.get("externalCode");
 			// 普通物品
 			if (node.get("leaf") == true){
-				var obj = {};
-				obj.name = node.get("name");
-				obj.count = count;
-				obj.unit = node.get("unit");
 				obj.spec = "";
 				applyGoods.push(obj);
 			}
 			// 消毒物品
 			else{
+				var flag = false;
 				var children = node.childNodes;
-				var materials = "";
-				for (var j=0;j<children.length;j++){
-					materials += children[j].get("name") + "x" + children[j].get("count") + ",";
+				for (var j = 0;j < children.length;j++){
+					if (!isUndefinedOrNullOrEmpty(children[j].get("count"))){
+						flag = true;
+						break;
+					}
 				}
-				materials = materials.substring(0,materials.length - 1);
-    			
-				var obj = {};
-				obj.name = node.get("name");
-				obj.count = count;
-				obj.unit = node.get("unit");
-				obj.spec = materials;
-				applyGoods.push(obj);
+				if (flag){
+					obj.children = children;
+					var materials = "";
+					for (var j=0;j<children.length;j++){
+						materials += children[j].get("name") + "x" + children[j].get("count") + ",";
+					}
+					materials = materials.substring(0,materials.length - 1);
+					obj.spec = materials;
+					applyGoods.push(obj);
+				}
 			}
 
 		}
@@ -1345,12 +1360,12 @@
 	},{
         header : "单位",
         dataIndex : 'unit',
-        width : 55,
+        width : 45,
         hidden : type==tousseApplicationForm || (type==comboApplicationForm && !sstsConfig.showTousseUnitColumn) ? true:false,
         menuDisabled : true
     },{
 		header : "单价",
-		width : 55,
+		width : 48,
 		dataIndex : 'price',
 		sortable: false,
 		hidden : sstsConfig.hideToussePriceColumn,
@@ -1562,23 +1577,96 @@
         }
     });
 
+	var handleCount = {
+		// 左边的,如果这次遍历没找到tousseDefinitionID相同,则旧数据当成是新数据插入
+		handleLeft: function(cache,newData,flag){
+			Ext.each(newData,function (i) {
+				if(cache.tousseDefinitionID == i.tousseDefinitionID){
+					//如果不是叶子,再往下遍历寻找名字相同的
+					if (cache.leaf != true){
+						Ext.each(cache.children,function (cacheLeaf) {
+							Ext.each(i.children,function (leaf) {
+								if (cacheLeaf.get('name') == leaf.name){
+									leaf.count = cacheLeaf.get('count');
+								}
+							});
+						});
+					}
+					i.count = cache.count;
+					flag = false;
+				}
+			});
+			return flag;
+		},
+		 // 右边的,如果这次遍历没找到externalCode相同,则旧数据当成是新数据插入
+		handleRight: function(cache,newData,flag){
+			Ext.each(newData,function (i) {
+				if(cache.externalCode == i.externalCode){
+					i.count = cache.count;
+					flag = false;
+				}
+			});
+			return flag;
+		}
+	}
+
+	/**
+	 * 迭代两个数据,如果新数据里面也有旧数据，则将旧数据的count赋值给新的
+	 * @param newData 新数据
+	 * @param cache 旧数据
+	 * @param type 左边还是右边
+	 * @returns {Array} 返回新旧数据合并后的数据
+     */
+	function iterData(newData,cache,type){
+		var result = [];
+		Ext.each(cache,function (item) {
+			var flag = true;
+			if ('left' == type){
+				flag = handleCount.handleLeft(item,newData,flag);
+			}
+			else if ('right' == type){
+				flag = handleCount.handleRight(item,newData,flag);
+			}
+			if(flag){
+				result = result.concat(item);
+			}
+		});
+		result = result.concat(newData);
+		// console.info(result);
+		return result;
+	}
+
+
     /**
      * 加载申请单物品
      * @param para 里面属性可以有applicationType,id,reloadTemplate
+	 * @param temp 里面存储了加载前设定了数量的数据
      */
-	function loadProduction(para) {
+	function loadProduction(para,temp) {
 		Ext4.Ajax.request({
 			url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
 			params : para,
 			timeout : 600000,//default 30000 milliseconds
 			success : function(response, options) {
 				try {
 					var result = Ext4.JSON.decode(response.responseText);
+					if (!isUndefinedOrNullOrEmpty(temp)){
+						var leftTemp = temp[0];
+						var rightTemp = temp[1];
+						if (!isUndefinedOrNullOrEmpty(leftTemp)){
+							var newLeft = iterData(result.leftStore.children,leftTemp,'left');
+							result.leftStore.children = newLeft;
+						}
+						if (!isUndefinedOrNullOrEmpty(rightTemp)){
+							var newRight = iterData(result.rightStore.children,rightTemp,'right');
+							result.rightStore.children = newRight;
+						}
+					}
 					leftTemplateStoreData = result.leftStore;
-					rightTemplateStoreData = result.rightStore;
 					leftTemplateStore.proxy.data = result.leftStore;
-					leftTemplateStore.load();
+					rightTemplateStoreData = result.rightStore;
 					rightTemplateStore.proxy.data = result.rightStore;
+					leftTemplateStore.load();
 					rightTemplateStore.load();
 				} catch (e) {
 					alert("Exception : "+ e);
@@ -1799,13 +1887,21 @@
 													comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = record.data.cssdOrgUnitCode;
 													comboGoodsStore.reload();
 
-													//根据所选的科室重新加载模板
-													var para2 = {
-														applicationType : type,
-														id : id,
-														reloadTemplate : unitCode
-													};
-													loadProduction(para2);
+													if (isOpenLoadTemplateByUnit == true){
+														//根据所选的科室重新加载模板
+														var para2 = {
+															applicationType : type,
+															id : id,
+															reloadTemplate : unitCode
+														};
+														//加载模板前获取已经选中的数据
+														var leftTemp = getApplyGoods(leftTemplateStore);
+														var rightTemp = getApplyGoods(rightTemplateStore);
+														var temp = [];
+														temp[0] = leftTemp;
+														temp[1] = rightTemp;
+														loadProduction(para2,temp);
+													}
 												}
 											}
 										});