Index: ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js
===================================================================
diff -u -r12331 -r14428
--- ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js	(.../recyclingAppcationShow.js)	(revision 12331)
+++ ssts-web/src/main/webapp/homepage/recyclingAppcationShow.js	(.../recyclingAppcationShow.js)	(revision 14428)
@@ -60,15 +60,15 @@
 //初始化加载器械包
 var tousseInstanceStore = new top.Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
+		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
 		method : 'POST'
 	}),
 	reader : rd
 });
 
 var tousseInstanceStore2 = new top.Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
-		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
+		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
 		method : 'POST'
 	}),
 	reader : rd2
@@ -129,19 +129,19 @@
     }
     return -1;
 }
-function showRecyclingApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart){
+function showRecyclingApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart,remark){
 	
 	//初始化加载器械包
 	var leftTemplateStore = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadTousseInstaceByid.do',
 			method : 'POST'
-		}),///disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do
+		}),///disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do
 		reader : rd
 	});
 	var rightTemplateStore = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
+			url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
 			method : 'POST'
 		}),
 		reader : rd
@@ -541,12 +541,13 @@
 				layout : 'form',
 				labelWidth : 60,
 				items : [{
-					xtype : 'textfield',
+					xtype : 'textarea',
 					fieldLabel : '备注',
 					id : 'remark',
 					name : 'remark',
 					width:280,
-					anchor : '100%'
+					anchor : '100%',
+					value : remark ? remark : ''
 				}]
 			}]
 		}]
@@ -925,7 +926,7 @@
 }
 
 //一次性物品
-function showDiposableGoodsApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart) {
+function showDiposableGoodsApplication(id,type,time,depart,departCoding,serialNumber,applicant,settleAccountsDepart,remark) {
 	diposableGoodsApplicationForm = "type";
 	var onFocusStorage = null;
 	var btSaveDisabledStatus = false;//申请单 是否有回收记录  如果有，则btSaveDisabledStatus=true//借物单 是否发货或部分发货  如果是，则btSaveDisabledStatus=true
@@ -1165,7 +1166,8 @@
 						id : 'remark',
 						name : 'remark',
 						allowBlank : true,
-						anchor : '100%'
+						anchor : '100%',
+						value : remark ? remark : ''
 					}]
 				}]
 			}]
@@ -1337,10 +1339,11 @@
 	});
 	
 	Ext.Ajax.request({
-		url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentTousseDefinitionTemplateByid.do',
-		params : {id : id,applicationType : '一次性物品'},
+		url :  WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadDepartmentAppTemplate.do',
+		params : {id : id,applicationType : type},
 		success : function(response, options) {
 			var result =  Ext.util.JSON.decode(response.responseText);
+			result.rows = result.rightStore.children;
 			var row = result.rows.length;
 			var rowMiddle = row/2;
 			if(row%2 != 0){