Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15980 -r16000
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 15980)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 16000)
@@ -33,6 +33,12 @@
 	'printMask' : null,
 	'loadMask' : null
 }
+
+// 打开表单的对象
+var openFormObj = {
+    tousseType : '',
+    form : ''
+}
 /**
  * 打开对应的表单
  * @param form 对应的表单
@@ -43,10 +49,23 @@
 	handleDepartStore.proxy.extraParams.tousseType = tousseType;
 	handleDepartStore.proxy.extraParams.applyDepartCode = "";
 	comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
+	//设置打开表单的对象
+    setOpenFormObj(tousseType, form);
 	if (!isUndefinedOrNullOrEmpty(form)){
 		comboApplication(0, "true",false,false,true,form, false);
 	}
 }
+
+/**
+ * 设置打开表单的对象,用于保存和新建
+ * @param tousseType 类型
+ * @param form 表单类型
+ */
+function setOpenFormObj(tousseType, form) {
+    openFormObj.tousseType = tousseType;
+    openFormObj.form = form;
+}
+
 function reloadGoodsComboStore(){
 	var deptName = top.Ext4.getCmp("handleDepart").getValue();
 	var deptCoding = getHandleDepartCoding(handleDepartStore,deptName);
@@ -1354,7 +1373,8 @@
                     		if (msg.length <= 6){
                     			showResult(action.result.message);
 								if (flag == true){
-									openApplication("",comboApplicationForm);
+									openApplication(openFormObj.tousseType, openFormObj.form);
+									// openApplication("",comboApplicationForm);
 								}
                     		}
                     		else{
@@ -3528,41 +3548,23 @@
 			tooltip : sstsConfig.packageName || '申请器械包',
 			hidden : SSTS_PACKAGE_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
-				invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//器械包
-				//新打开申请对话框时,相关参数调整及清除
-				handleDepartStore.proxy.extraParams.applyDepartCode = "";
-				handleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType;
-
-				comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
-				comboApplication(0, "true",false,false,true,tousseApplicationForm, false);//待发货
+                openApplication(invoicePlanForTousseType_Tousse, tousseApplicationForm);
 			}
 		},{
 			text : '申请一次性物品',
 			iconCls : 'btn_ext_add_tousse',
 			tooltip : '申请一次性物品',
 			hidden : SSTS_DisposableGoods_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
-				invoicePlanForTousseType = invoicePlanForTousseType_Diposable;//一次性物品
-				//新打开申请对话框时,相关参数调整及清除
-				handleDepartStore.proxy.extraParams.applyDepartCode = "";
-				handleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType;
-				
-				comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
-				comboApplication(0, "true",false,false,true,diposableGoodsApplicationForm, false);//待发货
+                openApplication(invoicePlanForTousseType_Diposable, diposableGoodsApplicationForm);
 			}
 		},{
 			text : '申请消毒物品',
 			tooltip : '申请内容物不固定的消毒物品',
 			iconCls : 'btn_ext_add_foreignTousse',
 			hidden : SSTS_Disinfection_Create || sstsConfig.applicationFormType != 2 || (sstsConfig.recyclingApplicationVersion == 2 && !isSupplyRoomUser),
 			handler : function() {
-				invoicePlanForTousseType = invoicePlanForTousseType_Tousse;//消毒物品也属器械包的类型
-				//新打开申请对话框时,相关参数调整及清除
-				handleDepartStore.proxy.extraParams.applyDepartCode = "";
-				handleDepartStore.proxy.extraParams.tousseType = invoicePlanForTousseType;
-				
-				comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = "";
-				comboApplication(0, "true",false,false,true,disinfectGoodsApplicationForm, false);//待发货
+                openApplication(invoicePlanForTousseType_Tousse, disinfectGoodsApplicationForm);
 				// addAndEditUntracableTousse('',0,"01",function(){});
 			}
 		},{