Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp
===================================================================
diff -u -r29300 -r29479
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp	(.../invoiceSignVersion2.jsp)	(revision 29300)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignVersion2.jsp	(.../invoiceSignVersion2.jsp)	(revision 29479)
@@ -37,7 +37,7 @@
 	<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 	<script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js"></script>
 	<script type="text/javascript" src="${ctx}/js/speaker.js"></script>
-	<script type="text/javascript" src="invoiceSignFormVersion2.js"></script>
+	<script type="text/javascript" src="invoiceSignFormVersion2.js?version=20201104"></script>
 	<script type="text/javascript" src="invoiceSignViewVersion2.js"></script>
 	<table height="100%;" width="100%" border="0" align="center" cellpadding="0" cellspacing="0">
 		<tr height="100%;">
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
===================================================================
diff -u -r29300 -r29479
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 29300)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 29479)
@@ -314,19 +314,19 @@
 	}
 	
 	var	waitInvoiceSignCm = new Ext.grid.ColumnModel([
-		{header : "物品名称",dataIndex : 'tousseName',width : 150,menuDisabled: true},
-		{header : "待签收",dataIndex : 'amount',width : 70,menuDisabled: true},
-		{header : "已签收",dataIndex : 'signAmount',width : 70, value:0,menuDisabled: true,renderer:getDefaultAmount}
+		{header : "物品名称",dataIndex : 'tousseName',width : 130,menuDisabled: true},
+		{header : "待签收",dataIndex : 'amount',width : 60,menuDisabled: true},
+		{header : "已签收",dataIndex : 'signAmount',width : 60, value:0,menuDisabled: true,renderer:getDefaultAmount}
 	]);
 	
 
 	//异常物品列表字段
 	var abnormalCm = new Ext.grid.ColumnModel([	 
 	    {header : "物品名称",dataIndex : 'tousseName',width : 100,menuDisabled: true},		
-		{header : "条码",dataIndex : 'tousseBarcode',width : 80,menuDisabled: true},
-		{header : "包状态",dataIndex : 'status',width : 80,  menuDisabled: true},
-	    {header : "收货科室",dataIndex : 'depart',width : 100,  menuDisabled: true},
-		{id : 'deleteItem',header:'删除',width : 35, align:'center', menuDisabled: true,
+		{header : "条码",dataIndex : 'tousseBarcode',width : 60,menuDisabled: true},
+		{header : "包状态",dataIndex : 'status',width : 60,  menuDisabled: true},
+	    {header : "收货科室",dataIndex : 'depart',width : 80,  menuDisabled: true},
+		{id : 'deleteItem',header:'删除',width : 40, align:'center', menuDisabled: true,
 			renderer: function(v,p,record){
 				var str = "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"getCurrentTab().removeSendOutAbnormalGoods() \">";
 				return str;
@@ -335,19 +335,44 @@
 		}
 	]);
 	var cm = new Ext.grid.ColumnModel([
-		{header : "物品名称",dataIndex : 'tousseName',width:200,menuDisabled: true},
+		{header : "物品名称",dataIndex : 'tousseName',width:130,menuDisabled: true},
 		{header : "条码",dataIndex : 'tousseBarcode',width : 90,menuDisabled: true},
-		{header : "灭菌日期",dataIndex : 'sterialTime',width : 130,menuDisabled: true,renderer : myDateFormat},
-		{header : "数量",dataIndex : 'count',width : 50,menuDisabled: true,id:"count"}
+		{header : "灭菌日期",dataIndex : 'sterialTime',width : 115,menuDisabled: true,renderer : myDateFormat},
+		{header : "数量",dataIndex : 'count',width : 40,menuDisabled: true,id:"count"}
 	]);
+
+	//异常物品列表Panel面板
+	var invoiceSignAbnormalDetail = new top.Ext.grid.EditorGridPanel({
+		tbar : [{
+			text : '全部删除',
+			iconCls : 'btn_ext_application_del',
+			handler : function() {
+				deleteAllInvoiceSignAbnormal();
+			}
+		}],
+		id : 'invoiceSignAbnormalDetailGoods',	
+		title: '异常物品列表',					
+		bodyStyle : 'border:1px solid #afd7af',
+		frame :false,
+		height : top.screen.height > 800 ?  570 : 440,
+		viewConfig: {
+			forceFit:true
+		},
+		cm : abnormalCm,
+		store : invoiceSignAbnormalDetailGoodsStore,
+		selModel : new top.Ext.grid.RowSelectionModel({
+			singleSelect : false
+		}),
+		clicksToEdit: 1//设置点击几次才可编辑 
+	})
 	
 	form = new top.Ext.FormPanel({
 		id : 'invoiceSignForm',
 		frame : true,
 		region: 'center',
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
-		width : 960,
+		width : top.screen.width > 1200 ? 1250 : 1000,
 		height : top.screen.height > 800 ? 640 : 450,
 	    autoHeight : true,
 		//autoScroll : true,
@@ -361,7 +386,7 @@
 					layout:'column',
 					items:[{
 					layout : 'fit',
-					columnWidth : 0.57,
+					columnWidth : 0.4,
 					items:[
 						new top.Ext.grid.EditorGridPanel({
 							id : 'scanGoods',
@@ -410,7 +435,7 @@
 					)]		
 				},{
 					layout : 'fit',
-					columnWidth : 0.43,
+					columnWidth : 0.25,
 					items:[new top.Ext.grid.EditorGridPanel({
 					id : 'waitInvoiceSignGoods',
 					title : '待签收物品明细',
@@ -483,6 +508,10 @@
 						singleSelect : false
 					})
 				})]
+			},{
+				layout : 'fit',
+				columnWidth : 0.35,
+				items : [ invoiceSignAbnormalDetail ]
 			}]
 		}],
 		buttons : [{
@@ -494,63 +523,18 @@
 		}]
 	});
 
-	
-	
-	//异常物品列表Panel面板
-	var invoiceSignAbnormalDetail = new top.Ext.grid.EditorGridPanel({
-		tbar : [{
-			text : '全部删除',
-			iconCls : 'btn_ext_application_del',
-			handler : function() {
-				deleteAllInvoiceSignAbnormal();
-			}
-		}],
-		id : 'invoiceSignAbnormalDetailGoods',						
-		bodyStyle : 'border:1px solid #afd7af',
-		frame :false,
-		width : 570,
-		height : top.screen.height > 800 ?  570 : 440,
-		viewConfig: {
-			forceFit:true
-		},
-		cm : abnormalCm,
-		store : invoiceSignAbnormalDetailGoodsStore,
-		selModel : new top.Ext.grid.RowSelectionModel({
-			singleSelect : false
-		}),
-		clicksToEdit: 1//设置点击几次才可编辑 
-	})
-	
-	var invoiceSignAbnormal_form = new top.Ext.FormPanel({
-		id : 'invoiceSignAbnormal_form',
-		frame : true,
-		region:'east',
-		columnWidth :.20,
-		labelSeparator : '：',
-		bodyStyle : 'padding:5px 5px 0px 5px',
-		width : 590,
-		height : top.screen.height > 800 ? 580 : 480,
-		autoScroll : true,
-		labelAlign:'right',
-		collapsible: true,
-		stateful: false,
-		collapsed: true,
-		title: '异常物品列表',
-		layout : 'form',
-		items : [ invoiceSignAbnormalDetail ]
-	});
 	invoiceSignGoodsWin = new top.Ext.Window({
 		id : 'invoiceSignGoodsWin',
 		layout : 'border',
 		title : '签收物品',
 		resizable: false,
-		width : 1000,
+		width : top.screen.width > 1200 ? 1250 : 1000,
 		height : top.screen.height > 800 ? 660 : 520,
 		border : false,
 		modal : true,
 		plain : true,
 		stateful: false,
-		items : [form,invoiceSignAbnormal_form],
+		items : [form],
 		listeners:{
 			beforeclose:function(){
 				//异常物品处理完毕与否