Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r34120 -r34405
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 34120)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 34405)
@@ -1938,6 +1938,54 @@
 			handler : function() {
 				foreignTousseApplyWindow.close();
 			}
+		},{
+			text : '终止选中的物品',
+			handler : function() {
+				var tree = top.Ext4.getCmp('foreignTousseTreeGridForm');
+				var selNodes = tree.getView().getChecked();
+				if(selNodes.length == 0){
+					showResult('请选择要终止的外来器械包！');
+				}else {
+					var ids = [];
+					for(var i=0;i<selNodes.length;i++){
+						ids[i] = selNodes[i].data.id;
+					}
+					var endCase = openModalWindowForExt(WWWROOT+"/disinfectsystem/recyclingApplication/selectEndCause.jsp", '','请选择终止原因', "760", "400");
+            
+					if(endCase == undefined){
+						return;
+					}else {
+						var loop = setInterval(function() {
+							if(endCase.hidden) {
+								clearInterval(loop);
+								
+								var returnValue = endCase.returnValue || '';
+
+								if(returnValue == ''){
+									return;
+								}
+
+								var tousseItemIdsStr = JSON.stringify(ids);
+								Ext.Ajax.request({
+									url :  WWWROOT + '/disinfectSystem/invoicePlanAction!terminateTousseItems.do',
+									params : {tousseItemIds : tousseItemIdsStr,endCase : returnValue},
+									success : function(response, options) {
+										var result = JSON.parse(response.responseText);
+										showResult(result.message);
+										if(result.success){
+											foreignTousseApplyWindow.close();
+											grid.getStore().reload();
+										}
+									},
+									failure : function(response, options) {
+										showResult('终止失败!');
+									}
+								});
+							}
+						},500);
+					}
+				}
+			}
 		}]
 	}else if(formType == 'recycle'){
 		
@@ -3463,7 +3511,7 @@
 	
 	foreignTousseApplyWindow = new top.Ext4.window.Window({
 		id : 'foreignTousseApplicationWin',
-		title : '外来器械单信息',
+		title : '外来器械包申请单信息',
 //		width : 950,
 		height : top.screen.height > 863 ? 710 : 600, //710
 //		height : top.screen.height > 1000 ? 600 : 500,
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp
===================================================================
diff -u -r34111 -r34405
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 34111)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp	(.../foreignTousseApplicationView.jsp)	(revision 34405)
@@ -60,6 +60,7 @@
 <%@ include file="/common/includeExtJs4_2.jsp"%>
 <script type="text/javascript">
 	var changLong = '<%= DeviceInterface.CHANGLONG %>';
+	var fontSize = '${fontSize}';
 	var changlong_DC_4 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_4 %>';
 	var changlong_DC_5 = '<%= DeviceInterface.XINHUA_CHANGLONG_DC_5 %>';
 	var marge = '<%= DeviceInterface.MARGE %>';
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r34240 -r34405
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 34240)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 34405)
@@ -1,4 +1,4 @@
-var entityName = "外来器械申请单";
+var entityName = "外来器械包申请单";
 var grid;
 var chargeSetWin;
 //判断是否ie和ie7
@@ -270,21 +270,22 @@
 
 	var columns = [
 	    {header : "紧急度",width : 45,dataIndex : 'urgencyNum', renderer : urgencyIconRender1,hidden:true},
-		{header : applicantName,width : 100,dataIndex : 'applicant', renderer : renderModifyFun}, 
-	    {header : applicationTimeName,width : 115,dataIndex : 'applicationTime', renderer : myDateFormatByMinute},
+		{header : applicantName,width : 70,dataIndex : 'applicant', renderer : renderModifyFun}, 
+	    {header : applicationTimeName,width : (fontSize == 12)?120:140,dataIndex : 'applicationTime', renderer : myDateFormatByMinute},
 		{header : departName,width : 100,dataIndex : 'depart'},
-		{header : isInterfacePushName,width : 100,dataIndex : 'isInterfacePush',hidden:!isShowInterfacePush},
+		{header : isInterfacePushName,width : 70,dataIndex : 'isInterfacePush',hidden:!isShowInterfacePush},
 	    {header : hospitalNumberName,width : 70,dataIndex : 'hospitalNumber'},
-	    {header : patientName,width : 60,dataIndex : 'patient'},
-	    {header : doctorName,width : 60,dataIndex : 'doctor'},
+	    {header : patientName,width : 70,dataIndex : 'patient'},
+	    {header : doctorName,width : 70,dataIndex : 'doctor'},
 	    {header : "外来器械包名称",width : 150,dataIndex : 'tousseName'},
 		{header : "收费状态",width : 150,dataIndex : 'chargeStatus',renderer:renderChargeStatusColor,hidden:!SSTS_ShowForeignTousseApplication_ChargeSet},
 	    {header : "外来器械包条码",width : 150,dataIndex : 'barcodes', hidden:!sstsConfig.showForeignTousseApplicationBarcode,sortable:false},
 	    {header : "供应商",width : 150,dataIndex : 'supplierName'}, 
 	    {header : surgeryName,width : 150,dataIndex : 'surgery'}, 
 	    {header : "包状态",width : 60,dataIndex : 'packageStatus',renderer:renderPackageStatusColor}, 
 	    {header : "回收状态",width : 70,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor},
-	    {header : "发货状态",width : 60,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor},
+	    {header : "发货状态",width : 70,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor},
+		{header : "终止状态",width : 70,dataIndex : 'endStatus'},
 	    {header : "查看发货单",hidden : true,width : 70,align :'center',renderer: function(v,p,record){
 	    	var invoiceStatus = record.data.deliverStatus;
 	    	if(invoiceStatus == "已发货" || invoiceStatus == "部分发货"){
@@ -294,11 +295,10 @@
 	    	}
 	    }},
 	    {header : "接收人",width : 60,dataIndex : 'receiveMan'}, 
-	    {header : "接收时间",width : 120,dataIndex : 'receiveTime', renderer : myDateFormatByMinute},
-		{header : returnManName,width : 60,dataIndex : 'returnMan'},
+	    {header : "接收时间",width : (fontSize == 12)?120:140,dataIndex : 'receiveTime', renderer : myDateFormatByMinute},
+		{header : returnManName,width : 100,dataIndex : 'returnMan'},
 		{header : returneeOfSupplierName,width : 70,dataIndex : 'returneeOfSupplier',hidden:!sstsConfig.enableReturneeOfForeignTousseSupplier},
-	    {header : "归还时间",width : 120,dataIndex : 'returnTime', renderer : myDateFormatByMinute},
-	    {header : "终止状态",width : 120,dataIndex : 'endStatus',hidden: true},
+	    {header : "归还时间",width : (fontSize == 12)?120:140,dataIndex : 'returnTime', renderer : myDateFormatByMinute},
 	    {header: remarkName, width : 400, dataIndex: 'remark'}
 	];