Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15547 -r15579
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15547)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15579)
@@ -3269,10 +3269,11 @@
     	    	 return inoviceButton+returnButton;
          	 }
 	     },
-	     {header : "预回收人",width : 65 * fontSizeScale,dataIndex : 'prepareRecycleOperator'},
-         {header : "预回收确认人",width : 85 * fontSizeScale,dataIndex : 'prepareRecycleComfirmor'},
-         {header : "预回收时间",width : 130 * fontSizeScale,dataIndex : 'prepareRecycleDateTime'}
-	     
+	     {header : "预回收人",width : 65 * fontSizeScale,dataIndex : 'prepareRecycleOperator',hidden : sstsConfig.hiddenRecyclingPeople},
+         {header : "预回收确认人",width : 85 * fontSizeScale,dataIndex : 'prepareRecycleComfirmor',hidden : sstsConfig.hiddenPreRecyclingConfirmPeople},
+         {header : "预回收时间",width : 130 * fontSizeScale,dataIndex : 'prepareRecycleDateTime',hidden : sstsConfig.hiddenPreRecyclingTime},
+         {header : "回收时间",width : 130 * fontSizeScale,dataIndex : 'recyclingTime',hidden : !sstsConfig.showRecyclingTime}
+
 	];
 
 	var readerDetail = [
@@ -3301,7 +3302,8 @@
 	     {name : 'invoiceStatus'},
 	     {name : 'prepareRecycleOperator'},
 	     {name : 'prepareRecycleComfirmor'},
-	     {name : 'prepareRecycleDateTime'}
+	     {name : 'prepareRecycleDateTime'},
+	     {name : 'recyclingTime'},
 	];
 	
 	var filters = new Ext.grid.GridFilters({
@@ -3451,10 +3453,10 @@
 				openApplication("",comboApplicationForm);
 			}
 		},{
-			text : '申请器械包',
+			text : sstsConfig.packageName || '申请器械包',
 			iconCls : 'btn_ext_add_tousse',
-			tooltip : '申请器械包',
-			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+			tooltip : sstsConfig.packageName || '申请器械包',
+			hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//器械包
 				//新打开申请对话框时,相关参数调整及清除
@@ -3468,7 +3470,7 @@
 			text : '申请一次性物品',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : '申请一次性物品',
-			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+			hidden : SSTS_DisposableGoods_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				invoicePlanForTousseType = invoicePlanForTousseType_Diposable;//一次性物品
 				//新打开申请对话框时,相关参数调整及清除
@@ -3482,7 +3484,7 @@
 			text : '申请消毒物品',
 			tooltip : '申请内容物不固定的消毒物品',
 			iconCls : 'btn_ext_add_foreignTousse',
-			hidden : SSTS_RecycApplication_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
+			hidden : SSTS_Disinfection_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
 				invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//消毒物品也属器械包的类型
 				//新打开申请对话框时,相关参数调整及清除