Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp
===================================================================
diff -u -r15476 -r15855
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp	(.../foreignProxyDisinfectionView.jsp)	(revision 15476)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.jsp	(.../foreignProxyDisinfectionView.jsp)	(revision 15855)
@@ -68,6 +68,7 @@
 
 <!-- js文件要下移至要引用的公共js文件之后 -->
 <script type="text/javascript" src="foreignProxyDisinfectionView.js"></script>
+<script type="text/javascript" src="printForeignProxyDisinfectionApplication.js"></script>
 <script type="text/javascript">
 
 var hospitalName = '<%=request.getAttribute("hospitalName")%>';
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r15807 -r15855
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 15807)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 15855)
@@ -101,6 +101,8 @@
 <%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript">
+var curUserName = '${userName}';
+var currentOrgUnitName = '${depart}';
 var comboApplicationForm = '<%=InvoicePlan.TYPE_COMBO_FORM%>';//通用申请单
 var recyclingCreateApplicationForm = '<%=InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION%>';//回收申请单
 var tousseApplicationForm = '<%=InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM%>';//器械包申请单
@@ -373,6 +375,7 @@
 
 <!-- 申请外部代理灭菌包-->
 <script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js"></script>
 
 <!-- 打印函数 -->
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js	(revision 15855)
@@ -0,0 +1,98 @@
+
+function batchPrintForeignProxyDisinfectionApplications(ids, depart, printType){
+	  if(ids == null)
+	       return;
+	  var departBarcode = getDepartBarcodeByDepart(depart);
+	  top.Ext.MessageBox.show({
+	      title:'请等待',
+	      msg:'打印中……',
+	      width:350,
+	      progress:true,
+	      closable:false
+	  });
+	  Ext.Ajax.timeout=300*000;
+	  Ext.Ajax.request({
+		  timeout: 300*000,
+	      url : WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!mergeLoadToussePrintData.do',
+	      params : {ids : ids},
+	      success : function(response){
+	    	  var result = Ext.decode(response.responseText);
+	    	  	result.depart = depart;
+	    	  	result.departBarcode = departBarcode;
+	    		result.printUser = curUserName;
+	    		result.currentOrgUnitName = currentOrgUnitName;
+	    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
+	    		// 发料人默认改为当前用户
+	    		if (isUndefinedOrNullOrEmpty(result.sender)) {
+	    			result.sender = curUserName;
+	    		}
+	    		printForeignProxyDisinfectionApplications(result, printType);
+	    	  
+	    	  if (printType == 0){
+//	    		  updatePrintStatus(ids);
+	    	  }
+	    	  
+	          hideMessageBox(true);
+	          grid.dwrReload();
+	      },
+	      failure: function(response){
+	          showResult("打印失败！");
+	          hideMessageBox(true);
+	      }
+	  });
+}
+
+function printForeignProxyDisinfectionApplications(foreignProxyDisinfectionApplicationsInfo, printType) {
+	if(isUndefinedOrNull(foreignProxyDisinfectionApplicationsInfo.tousse)){
+		foreignProxyDisinfectionApplicationsInfo.tousse = [];
+	}
+	
+	foreignProxyDisinfectionApplicationsInfo.applicationType = "外部代理灭菌申请单";
+	foreignProxyDisinfectionApplicationsInfo.barcode = foreignProxyDisinfectionApplicationsInfo.departBarcode;
+	foreignProxyDisinfectionApplicationsInfo.formTypeOfPrinted = 'foreignProxyDisinfectionApplication';
+	var unitName = "";
+    DWREngine.setAsync(false);
+    SupplyRoomConfigTableManager.getStartTimeObject(function(config){
+        if(config != null){
+        	unitName = config.unitName;
+        }
+    });
+    DWREngine.setAsync(true);
+    foreignProxyDisinfectionApplicationsInfo.unitName = unitName;
+//    foreignProxyDisinfectionApplicationsInfo.printConfigObj_default = batchPrintForeignProxyDisinfectionApplicationsConfig_default;
+	// 器械包
+	if(foreignProxyDisinfectionApplicationsInfo.tousse.length > 0){
+		foreignProxyDisinfectionApplicationsInfo.goods = foreignProxyDisinfectionApplicationsInfo.tousse;
+		printForeignProxyDisinfectionApplicationInfo_local(foreignProxyDisinfectionApplicationsInfo, printType);
+	}
+}
+function printForeignProxyDisinfectionApplicationInfo_local(foreignProxyDisinfectionApplicationsInfo, type){
+	setGoodsInfo(foreignProxyDisinfectionApplicationsInfo);
+	printForeignProxyDisinfectionApplicationInfo(foreignProxyDisinfectionApplicationsInfo, type);
+}
+
+function setGoodsInfo(foreignProxyDisinfectionApplicationsInfo){
+	var totalPrice = 0;
+	for ( var i = 0; i < foreignProxyDisinfectionApplicationsInfo.goods.length; i++) {
+		foreignProxyDisinfectionApplicationsInfo.goods[i].serialNumber = i+1;
+	}
+	for ( var i = 0; i < foreignProxyDisinfectionApplicationsInfo.goods.length; i++) {
+		if(foreignProxyDisinfectionApplicationsInfo.goods[i].name == '合计'){
+			continue;
+		}
+		var itemTotalPrice = Number(foreignProxyDisinfectionApplicationsInfo.goods[i].price) * Number(foreignProxyDisinfectionApplicationsInfo.goods[i].amount);
+		totalPrice += itemTotalPrice;
+	} 
+	var totalAmount = 0;
+	for ( var i = 0; i < foreignProxyDisinfectionApplicationsInfo.goods.length; i++) {
+		if(foreignProxyDisinfectionApplicationsInfo.goods[i].name == '合计'){
+			continue;
+		}
+		totalAmount += foreignProxyDisinfectionApplicationsInfo.goods[i].amount;
+	}
+	foreignProxyDisinfectionApplicationsInfo.totalPrice = totalPrice;
+	foreignProxyDisinfectionApplicationsInfo.totalGoodsAmount = totalAmount;
+	 
+//	var totalInfo = {'name': '合计','数量': totalAmount,'金额': totalPrice};
+//	foreignProxyDisinfectionApplicationsInfo.goods.push(totalInfo);
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r15696 -r15855
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 15696)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 15855)
@@ -131,103 +131,7 @@
 		}
 	});
 }
-function batchPrintForeignProxyDisinfectionApplications(ids, depart, printType){
-	  if(ids == null)
-	       return;
-	  var departBarcode = getDepartBarcodeByDepart(depart);
-	  top.Ext.MessageBox.show({
-	      title:'请等待',
-	      msg:'打印中……',
-	      width:350,
-	      progress:true,
-	      closable:false
-	  });
-	  Ext.Ajax.timeout=300*000;
-	  Ext.Ajax.request({
-		  timeout: 300*000,
-	      url : WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!mergeLoadToussePrintData.do',
-	      params : {ids : ids},
-	      success : function(response){
-	    	  var result = Ext.decode(response.responseText);
-	    	  	result.depart = depart;
-	    	  	result.departBarcode = departBarcode;
-	    		result.printUser = curUserName;
-	    		result.currentOrgUnitName = currentOrgUnitName;
-	    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
-	    		// 发料人默认改为当前用户
-	    		if (isUndefinedOrNullOrEmpty(result.sender)) {
-	    			result.sender = curUserName;
-	    		}
-	    		printForeignProxyDisinfectionApplications(result, printType);
-	    	  
-	    	  if (printType == 0){
-//	    		  updatePrintStatus(ids);
-	    	  }
-	    	  
-	          hideMessageBox(true);
-	          grid.dwrReload();
-	      },
-	      failure: function(response){
-	          showResult("打印失败！");
-	          hideMessageBox(true);
-	      }
-	  });
-}
 
-function printForeignProxyDisinfectionApplications(foreignProxyDisinfectionApplicationsInfo, printType) {
-	if(isUndefinedOrNull(foreignProxyDisinfectionApplicationsInfo.tousse)){
-		foreignProxyDisinfectionApplicationsInfo.tousse = [];
-	}
-	
-	foreignProxyDisinfectionApplicationsInfo.applicationType = "外部代理灭菌申请单";
-	foreignProxyDisinfectionApplicationsInfo.barcode = foreignProxyDisinfectionApplicationsInfo.departBarcode;
-	foreignProxyDisinfectionApplicationsInfo.formTypeOfPrinted = 'foreignProxyDisinfectionApplication';
-	var unitName = "";
-    DWREngine.setAsync(false);
-    SupplyRoomConfigTableManager.getStartTimeObject(function(config){
-        if(config != null){
-        	unitName = config.unitName;
-        }
-    });
-    DWREngine.setAsync(true);
-    foreignProxyDisinfectionApplicationsInfo.unitName = unitName;
-//    foreignProxyDisinfectionApplicationsInfo.printConfigObj_default = batchPrintForeignProxyDisinfectionApplicationsConfig_default;
-	// 器械包
-	if(foreignProxyDisinfectionApplicationsInfo.tousse.length > 0){
-		foreignProxyDisinfectionApplicationsInfo.goods = foreignProxyDisinfectionApplicationsInfo.tousse;
-		printForeignProxyDisinfectionApplicationInfo_local(foreignProxyDisinfectionApplicationsInfo, printType);
-	}
-}
-function printForeignProxyDisinfectionApplicationInfo_local(foreignProxyDisinfectionApplicationsInfo, type){
-	setGoodsInfo(foreignProxyDisinfectionApplicationsInfo);
-	printForeignProxyDisinfectionApplicationInfo(foreignProxyDisinfectionApplicationsInfo, type);
-}
-
-function setGoodsInfo(foreignProxyDisinfectionApplicationsInfo){
-	var totalPrice = 0;
-	for ( var i = 0; i < foreignProxyDisinfectionApplicationsInfo.goods.length; i++) {
-		foreignProxyDisinfectionApplicationsInfo.goods[i].serialNumber = i+1;
-	}
-	for ( var i = 0; i < foreignProxyDisinfectionApplicationsInfo.goods.length; i++) {
-		if(foreignProxyDisinfectionApplicationsInfo.goods[i].name == '合计'){
-			continue;
-		}
-		var itemTotalPrice = Number(foreignProxyDisinfectionApplicationsInfo.goods[i].price) * Number(foreignProxyDisinfectionApplicationsInfo.goods[i].amount);
-		totalPrice += itemTotalPrice;
-	} 
-	var totalAmount = 0;
-	for ( var i = 0; i < foreignProxyDisinfectionApplicationsInfo.goods.length; i++) {
-		if(foreignProxyDisinfectionApplicationsInfo.goods[i].name == '合计'){
-			continue;
-		}
-		totalAmount += foreignProxyDisinfectionApplicationsInfo.goods[i].amount;
-	}
-	foreignProxyDisinfectionApplicationsInfo.totalPrice = totalPrice;
-	foreignProxyDisinfectionApplicationsInfo.totalGoodsAmount = totalAmount;
-	 
-//	var totalInfo = {'name': '合计','数量': totalAmount,'金额': totalPrice};
-//	foreignProxyDisinfectionApplicationsInfo.goods.push(totalInfo);
-}
 // 删除
 function deleteForeignProxyDisinfection(grid) {
     
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r15509 -r15855
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 15509)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js	(.../foreignProxyDisinfectionForm.js)	(revision 15855)
@@ -780,7 +780,8 @@
 		},{
 			id :'printBtn',
 			text : '打印',
-			hidden:true,
+			hidden:false,
+			disabled: true,
 			handler : function(){
 				top.Ext.MessageBox.confirm("请确认", "要打印本申请单吗？",
 	    				function(btn) {
@@ -818,6 +819,9 @@
 			waitMsg : '正在加载数据，请稍候',
 			success : function(form, action) {
 				top.Ext.getCmp('applicationTimeStr').setValue(formatDateYear(action.result.data.applicationTime));
+				if(action.result.data.hasPacked == '是'){
+					top.Ext.getCmp('printBtn').enable();
+				}
 			},
 			failure : function(form, action) {
 			},