Index: ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js
===================================================================
diff -u -r26490 -r26533
--- ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 26490)
+++ ssts-web/src/main/webapp/disinfectsystem/stocktakerecordmanager/inventoryDisposableGoodsForm.js	(.../inventoryDisposableGoodsForm.js)	(revision 26533)
@@ -187,52 +187,53 @@
 			sm : selectModel,
 //			 height : 460,
             height : top.screen.height > 800 ? 465 : 375,
+            width :1150,
 			viewConfig: {
 	            forceFit:true
 			},
 			clicksToEdit : 1,
 			loadMask:{msg:'正在加载，请稍候...'},
 			stateful:false,//从保存的状态恢复内部属性的状态。
 			store : itemsStore,
-			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:40}), selectModel,
-			    {header : "外部编码",dataIndex : 'externalCode',width : 40,menuDisabled : true,sortable : true},
-	        	{header : "名称",dataIndex : 'name',width : 135,sortable:true,menuDisabled : true},
-	        	{header : "物品类型",dataIndex : 'type',width : 60, sortable:true, menuDisabled : true},
-	        	{header : "规格",dataIndex : 'specification',width : 60,menuDisabled : true},
-	        	{header : "批次",width : 50,dataIndex : 'batchNumber',menuDisabled : true},
-	        	{header : "生产日期",hidden : !sstsConfig.showProduceDateOfDisposableGoods, width : 80,dataIndex : 'produceDate',menuDisabled : true},
-	        	{header : "失效时期",width : 80,dataIndex : 'expDate',menuDisabled : true},
-	        	{header : "账面数量",dataIndex : 'amount',width : 40,menuDisabled : true,renderer : isChange},
-	        	{header : "盘点数量",dataIndex : 'inventoryAmount',css: 'background: #F0F0F0;',width : 40,menuDisabled : true,
+			cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer({header:'序号',width:35}), selectModel,
+			    {header : "外部编码",dataIndex : 'externalCode',width : 35,menuDisabled : true,sortable : true},
+	        	{header : "名称",dataIndex : 'name',width : 75,sortable:true,menuDisabled : true},
+	        	{header : "物品类型",dataIndex : 'type',width : 35, sortable:true, menuDisabled : true},
+	        	{header : "规格",dataIndex : 'specification',width : 55,menuDisabled : true},
+	        	{header : "批次",width : 40,dataIndex : 'batchNumber',menuDisabled : true},
+	        	{header : "生产日期",hidden : !sstsConfig.showProduceDateOfDisposableGoods, width : 48,dataIndex : 'produceDate',menuDisabled : true},
+	        	{header : "失效日期",width : 42,dataIndex : 'expDate',menuDisabled : true},
+	        	{header : "账面数量",dataIndex : 'amount',width : 35,menuDisabled : true,renderer : isChange},
+	        	{header : "盘点数量",dataIndex : 'inventoryAmount',css: 'background: #F0F0F0;',width : 35,menuDisabled : true,
         			editor : new top.Ext.form.TextField({
         				regex: /^\d+$/,
         				regexText:'只能输入数字',
         				allowBlank : false
         			})
         		},
-        		{header : "盘点差异",dataIndex : 'amountDifferent',hidden: status=="已更新"?false:true,sortable : true,width : 50,menuDisabled : false,renderer : amountDifferenceChange},
-        		{header : "高值耗材操作",dataIndex : 'goodsType',width : 55,menuDisabled : true,
-        			 renderer: function(v,p,record,rowIndex, columnIndex, store){
-        				 if(v == '高值耗材'){
-        					 var id = record.get('id');
-        					 var amount = record.get('amount');
-        					 var inventoryAmount = record.get('inventoryAmount');
-        					 var isCanEdit = false;
-        					 var storageDifference = 0;
-        					 if(inventoryAmount != null && inventoryAmount != ""){
-        						 if(inventoryAmount < amount){
-        							 isCanEdit = true;
-        							 storageDifference = (amount - inventoryAmount);
-        						 }
-        					 }
-        					 return "<input type='button' style='height:18px; width:60px;' value='库存明细' onclick=\"var currentTab = getCurrentTab();currentTab.showInventoryExpensiveGoods("+id+","+rowIndex+","+isCanEdit+","+storageDifference+");\" >";
-        				 }
-        			 }
-        		},
+        		{header : "盘点差异",dataIndex : 'amountDifferent',hidden: status=="已更新"?false:true,sortable : true,width : 35,menuDisabled : false,renderer : amountDifferenceChange},
         		{header : "单价",dataIndex : 'cost',width : 30,menuDisabled : true},
-        		{header : "单位",dataIndex : 'unit',width : 30,menuDisabled : true},
-	        	{header : "供应商",width : 70,dataIndex : 'supplierName',menuDisabled : true},
-	        	{id : 'expandColumn',header : "顺序号",width : 30,dataIndex : 'sequence',menuDisabled : true,sortable:true}
+        		{header : "单位",dataIndex : 'unit',width : 22,menuDisabled : true},
+	        	{header : "供应商",width : 55,dataIndex : 'supplierName',menuDisabled : true},
+	        	{header : "高值耗材操作",dataIndex : 'goodsType',width : 48,menuDisabled : true,
+	        		renderer: function(v,p,record,rowIndex, columnIndex, store){
+	        			if(v == '高值耗材'){
+	        				var id = record.get('id');
+	        				var amount = record.get('amount');
+	        				var inventoryAmount = record.get('inventoryAmount');
+	        				var isCanEdit = false;
+	        				var storageDifference = 0;
+	        				if(inventoryAmount != null && inventoryAmount != ""){
+	        					if(inventoryAmount < amount){
+	        						isCanEdit = true;
+	        						storageDifference = (amount - inventoryAmount);
+	        					}
+	        				}
+	        				return "<input type='button' style='height:18px; width:60px;' value='库存明细' onclick=\"var currentTab = getCurrentTab();currentTab.showInventoryExpensiveGoods("+id+","+rowIndex+","+isCanEdit+","+storageDifference+");\" >";
+	        			}
+	        		}
+	        	},
+	        	{id : 'expandColumn',header : "顺序号",width : 28,dataIndex : 'sequence',menuDisabled : true,sortable:true}
 	        ]),
 			autoExpandColumn : 'expandColumn',
 			tbar : [{
@@ -470,7 +471,7 @@
 		id : 'inventoryItemWin',
 		layout : 'fit',
 		title : '盘点信息',
-		width : 1000,
+		width : 1020,
         height : top.screen.height > 800 ? 600 : 520,
 		// height :680,
 		modal : true,