Index: ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js
===================================================================
diff -u -r17280 -r17630
--- ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js	(.../config.js)	(revision 17280)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js	(.../config.js)	(revision 17630)
@@ -50,7 +50,7 @@
   printValidDateUtil:true,
   //入库单是否显示发票
   godownEntryShowInvoice:true,
-  //入库单是否显示生物检测信息
+  //入库单是否显示生物检测信息s
   godownEntryShowBiologicalTestReport:true,
   //金额的小数位数
   moneyDigitCount:4,
@@ -67,5 +67,13 @@
   //一次性物品库存不足时，是否允许申领 true:允许  false:不允许
   allowApplyDisposableGoodsWhenUnderstock:false,
   //外来器械拆分小包名称带总拆包数量
-  nameIncludeSplitTotalAmountForSplitForeignTousse : true
+  nameIncludeSplitTotalAmountForSplitForeignTousse : true,
+  // 外部代理灭菌隐藏装配并打印按钮
+  foreignProxyDisinfectionView_hideSaveAndPrintBtn:true,
+  //外部代理灭菌显示装配按钮
+  foreignProxyDisinfectionView_showPackingBtn:true,
+  //外部代理灭菌显示打印标签按钮
+  foreignProxyDisinfectionView_showPrintTousseBtn:true,
+  // 打印器械包标签时，是否打印一次性物品材料
+  tousseLabelPrintDisposableGoods:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r17508 -r17630
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 17508)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 17630)
@@ -1337,7 +1337,7 @@
 			}
 		},{
 			id :'saveAndPrintBtn',
-//			hidden: (id != ""),
+			hidden: sstsConfig.foreignProxyDisinfectionView_hideSaveAndPrintBtn,
 			text : '装配并打印标签',
 			disabled : SSTS_ForeignProxyDisinfection_Update,
 			handler : function(){
@@ -1383,6 +1383,96 @@
 				});
 			}
 		},{
+			id :'packingBtn',
+			hidden: !sstsConfig.foreignProxyDisinfectionView_showPackingBtn,
+			text : '装配',
+			disabled : SSTS_ForeignProxyDisinfection_Update,
+			handler : function(){
+				top.Ext.MessageBox.confirm("请确认","是否提交"+entityName+"单信息？",function(btn) {
+					if(btn=='yes') {
+						if(!validateForSubmit()){
+							return false;
+						}
+						
+						//获取grid数据
+						getEditerGridData();
+						var submitActionUrl = WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!packForeignProxyDisinfection.do';
+						form.form.submit({
+							url : submitActionUrl,
+							method : 'POST',
+							timeout : 10000000,
+							waitMsg : '正在后台进行处理，请稍候',
+							waitTitle : '提交表单',
+							params : {printTousse :false},
+							success : function(form, action) {
+								if(action.result.success){
+									showResult('装配成功!');
+								}else{
+									showResult(action.result.msg);
+								}
+								foreignProxyDisinfectionFormWindow.close();
+								grid.dwrReload();
+							},
+							failure : function(form, action) {
+								if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.msg)){
+									showResult(action.result.msg);
+									foreignProxyDisinfectionFormWindow.close();
+									grid.dwrReload();
+								}else{
+									showResult("操作失败!");
+								}
+							}
+						});
+					}
+				});
+			}
+		},{
+			id :'printTousseBtn',
+			hidden: !sstsConfig.foreignProxyDisinfectionView_showPrintTousseBtn,
+			text : '打印标签',
+			disabled : id == '' || SSTS_ForeignProxyDisinfection_Update,
+			handler : function(){
+				top.Ext.MessageBox.confirm("请确认","是否打印标签？",function(btn) {
+					if(btn=='yes') {
+						if(!validateForSubmit()){
+							return false;
+						}
+						
+						//获取grid数据
+						getEditerGridData();
+						var submitActionUrl = WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!getForeignProxyDisinfectionTousseInstancesByIds.do';
+						form.form.submit({
+							url : submitActionUrl,
+							method : 'POST',
+							timeout : 10000000,
+							waitMsg : '正在后台进行处理，请稍候',
+							waitTitle : '提交表单',
+							params : {ids :id},
+							success : function(form, action) {
+								if(action.result.success){
+									//打印条码
+									printBarcode(action.result);
+//									disableButtonsAfterPacking();
+								}else{
+									showResult(action.result.msg);
+								}
+								foreignProxyDisinfectionFormWindow.close();
+								grid.dwrReload();
+							},
+							failure : function(form, action) {
+								if(!isUndefinedOrNullOrEmpty(action.result) && !isUndefinedOrNullOrEmpty(action.result.msg)){
+									showResult(action.result.msg);
+									foreignProxyDisinfectionFormWindow.close();
+									grid.dwrReload();
+								}else{
+									showResult("操作失败!");
+								}
+							}
+						});
+					}
+				});
+			}
+		},{
 			id :'packAndPrintApplicationBtn',
 			text : '装配并打印申请单',
 			hidden: true,
@@ -1429,7 +1519,7 @@
 			}
 		},{
 			id :'printBtn',
-			text : '打印',
+			text : '打印申请单',
 			hidden:(id == ""),
 			handler : function(){
 				top.Ext.MessageBox.confirm("请确认", "要打印本申请单吗？",