Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
===================================================================
diff -u -r22096 -r22111
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js	(.../printConfig.js)	(revision 22096)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js	(.../printConfig.js)	(revision 22111)
@@ -637,25 +637,25 @@
                {label : "验收表", dataIndex : '', fontSize : 15, position : ["30","45%","99%",5]},
                {label : "供货单位:", dataIndex : 'supplierName', fontSize : 11, position : ["60","2%","90%",5]},
 	            //页脚
-               {label : "验收结论:", dataIndex : '', fontSize : 11, position : ["950","2%","90%",5]},
-        	   {label : "验收日期:", dataIndex : '', fontSize : 11, position : ["950","65%","90%",5]},
-       	       {label : "送货人:", dataIndex : '', fontSize : 11, position : ["985","2%","90%",5]},
-       	       {label : "科室验收人:", dataIndex : '', fontSize : 11, position : ["985","40%","90%",5]},
-       	       {label : "医械仓库管理人:", dataIndex : '', fontSize : 11, position : ["985","65%","90%",5]}
+               {label : "验收结论:", dataIndex : '', fontSize : 11, position : ["450","2%","90%",5]},
+        	   {label : "验收日期:", dataIndex : '', fontSize : 11, position : ["450","65%","90%",5]},
+       	       {label : "送货人:", dataIndex : '', fontSize : 11, position : ["475","2%","90%",5]},
+       	       {label : "科室验收人:", dataIndex : '', fontSize : 11, position : ["475","40%","90%",5]},
+       	       {label : "医械仓库管理人:", dataIndex : '', fontSize : 11, position : ["475","65%","90%",5]}
         ],
-        currentPageNumber : {label : "第#页", fontSize : 11, position : ["1010","40%","90%",5]},
-        totalPageAmount : {label : "共&页", fontSize : 11, position : ["1010","45%","90%",5]},
+        currentPageNumber : {label : "第#页", fontSize : 11, position : ["60","80%","90%",5]},
+        totalPageAmount : {label : "共&页", fontSize : 11, position : ["60","90%","90%",5]},
         goodsTable :{
         	rowHeight : 25,
-        	position : ["90","1%","97%","27cm"],
+        	position : ["90","1%","97%","9cm"],
         	headRepeat : true,
         	donotPrintTotal : true,
         	columns : [
                 {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11},
                 {header : "生产厂家", dataIndex : 'manufacturer', width : 220, align : 'left', fontSize : 11},
                 {header : "规格型号", dataIndex : 'model', width : 110, align : 'center', fontSize : 11},
                 {header : "数量", dataIndex : 'amount', width : 40, align : 'center', fontSize : 11},
-                {header : "生产批次号", dataIndex : '', width : 100, align : 'center', fontSize : 11},
+                {header : "生产批次号", dataIndex : 'batchNumber', width : 100, align : 'center', fontSize : 11},
                 {header : "灭菌日期", dataIndex : '', width : 105, align : 'center', fontSize : 11},
                 {header : "有效期", dataIndex : 'expDateStr', width : 105, align : 'center', fontSize : 11},
                 {header : "批准文号/注册证号", dataIndex : 'certification', width : 60, align : 'center', fontSize : 11},
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js
===================================================================
diff -u -r22101 -r22111
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js	(.../expensiveGoodsBillForm.js)	(revision 22101)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillForm.js	(.../expensiveGoodsBillForm.js)	(revision 22111)
@@ -283,7 +283,7 @@
 					}),
 					cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer(),
 			           	{header : "id",dataIndex : 'id',hidden : true},
-			        	{header : "名称",dataIndex : 'name',width : 130,menuDisabled : true}, 
+			        	{header : "名称",dataIndex : 'name',width : 100,menuDisabled : true}, 
 			           	{header : "供应商",dataIndex : 'supplierName',width : 125,menuDisabled : true},
 			        	{header : "单价",dataIndex : 'price',width : 60,menuDisabled : true},
 			        	{header : "数量",dataIndex : 'amount',width : 50,menuDisabled : true 
@@ -299,7 +299,7 @@
 //		        				}
 //		        			})
 						},
-			        	{header : "金额",width : 50,menuDisabled : true,dataIndex : 'totalPrice', renderer:renderTotalPrice},
+			        	{header : "金额",width : 70,menuDisabled : true,dataIndex : 'totalPrice', renderer:renderTotalPrice},
 			        	{header : "删除",width : 50,menuDisabled : true,dataIndex : 'deleteButton', renderer:renderDeleteButton , hidden: (committedStatus == ""?false:true)}
 			        ]),
 					selModel : new top.Ext.grid.RowSelectionModel({
@@ -406,7 +406,7 @@
 					cm : new top.Ext.grid.ColumnModel([
                    		{header : "id",dataIndex : 'id',hidden : true},
                 		{header : "高值耗材定义id",dataIndex : 'expensiveGoodsId',hidden : true}, 
-                		{header : "物品",dataIndex : 'showName',width : 100,menuDisabled : true}, 
+                		{header : "物品",dataIndex : 'showName',width : 70,menuDisabled : true}, 
                 		{header : "型号",dataIndex : 'model',width : 50,menuDisabled : true},
                 		{header : "入库类型",dataIndex : 'entryType',width : 50,menuDisabled : true}, 
                 		{header : "单价",dataIndex : 'price',width : 50,menuDisabled : true},
@@ -463,6 +463,11 @@
 				var settledTime = top.Ext.getCmp('settledTime').getValue().format('Y-m-d H:i:s');
 				var items = buildJSONStringFromStore(top.Ext.getCmp('goodBillItemGrid').getStore());
 				var instanceItems = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsInstanceGrid').getStore());
+				var supplierId = top.Ext.getCmp('supplierId').getValue();
+				//是否同一个供应商
+				if(!isSameSupplierId(supplierId)){
+					return false;
+				}
 				// 设置formParams表单参数json
 				setFormParams(form,['id','serialNumber','supplierId','supplierName','remark','operator']);
 				var FormParams = top.Ext.getCmp("formParams").getValue();
@@ -513,6 +518,11 @@
 				var settledTime = top.Ext.getCmp('settledTime').getValue().format('Y-m-d H:i:s');
 				var items = buildJSONStringFromStore(top.Ext.getCmp('goodBillItemGrid').getStore());
 				var instanceItems = buildJSONStringFromStore(top.Ext.getCmp('expensiveGoodsInstanceGrid').getStore());
+				var supplierId = top.Ext.getCmp('supplierId').getValue();
+				//是否同一个供应商
+				if(!isSameSupplierId(supplierId)){
+					return false;
+				}
 //				console.log(instanceItems);
 				// 设置表单参数json
 				setFormParams(form,['id','serialNumber','supplierId','supplierName','remark','operator']);
@@ -580,6 +590,25 @@
 //	top.Ext.getCmp('name1').focus(false, 100);
 
 }
+
+/**
+ * 检查是否同一个供应商
+ */
+function isSameSupplierId(supplierId){
+	for(var i = 0;i < top.Ext.getCmp('goodBillItemGrid').getStore().getCount();i++){
+		var goodBillItemGridData = top.Ext.getCmp('goodBillItemGrid').getStore().getAt(i).data;
+		if(goodBillItemGridData.supplierId != supplierId){
+			showResult("一张入库单只能填同一个供应商!");
+			return false;
+		}
+	}
+	return true;
+}
+
+/**
+ * 添加可结算实例
+ * @param expensiveGoodsBillItem
+ */
 function addExpensiveGoodsInstanceItem(expensiveGoodsBillItem){
 	var expensiveGoodsId = expensiveGoodsBillItem.data.expensiveGoodsId;
 	var amount = expensiveGoodsBillItem.data.amount;
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js
===================================================================
diff -u -r22095 -r22111
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js	(.../expensiveGoodsGodownEntryForm.js)	(revision 22095)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryForm.js	(.../expensiveGoodsGodownEntryForm.js)	(revision 22111)
@@ -172,8 +172,10 @@
 					}
 				}
 			},{
-				text : '类别:'
+				text : '类别:',
+				hidden : true
 			},{
+				hidden : true,
 				xtype : 'combo',
 				id : 'grade1',
 				name : 'grade1',
@@ -245,7 +247,7 @@
 			xtype : 'textfield',
 			id : 'thirdBodyCode1',
 			name : 'thirdBodyCode1',
-			width : 150,
+			width : 147,
 			anchor : '95%',
 			allowBlank:true,
 			listeners : {
@@ -272,15 +274,17 @@
 	]
 	});
 //////////////////////////	
-	expensiveGoodsApplicationStore.load();
+	if(invoicePlanId){
+		expensiveGoodsApplicationStore.load();
+	}
 	Ext.getCmp("formSubmitResult").setValue(formSubmitResultInit);
 	wareHouseStore.load();
 	var form = new top.Ext.FormPanel({
 		id : 'expensiveGoodsGodownEntryForm',
 		frame : true,
 		labelSeparator : '：',
 		bodyStyle : 'padding:5px 5px 0px 5px',
-		width : 1100,
+		width : 1000,
 		height : 650,
 		autoScroll : true,
 		labelAlign : 'left',
@@ -502,7 +506,7 @@
 					bodyStyle : 'border:1px solid #afd7af',
 					frame :false,
 					sm : selectModel,
-					width : 1500,
+					width : 1400,
 					height : 480,
 					viewConfig: {
 			            forceFit:true
@@ -538,13 +542,13 @@
 					}),
 					cm : new top.Ext.grid.ColumnModel([new Ext.grid.RowNumberer(), selectModel,
 			           	{header : "id",dataIndex : 'id',hidden : true},
-			           	{header : "生产厂家id",dataIndex : 'manufacturerId',width : 130,hidden : true},
+			           	{header : "生产厂家id",dataIndex : 'manufacturerId',hidden : true},
 			           	{header : "expensiveGoodsId",dataIndex : 'expensiveGoodsId',hidden : true},
-			        	{header : "expensiveGoodsName",dataIndex : 'expensiveGoodsName',width : 120,hidden : true},
-			           	{header : "生产厂家",dataIndex : 'manufacturerName',width : 100,menuDisabled : true},
-			        	{header : "物品名称",dataIndex : 'expensiveGoodsdisplayName',width : 100,menuDisabled : true},
-			        	{header : "物品型号",dataIndex : 'model',width : 80,menuDisabled : true},
-		        		{header : "注册证号",width : 100,dataIndex : 'certification',menuDisabled : true,
+			        	{header : "expensiveGoodsName",dataIndex : 'expensiveGoodsName',hidden : true},
+			           	{header : "生产厂家",dataIndex : 'manufacturerName',width : 70,menuDisabled : true},
+			        	{header : "物品名称",dataIndex : 'expensiveGoodsdisplayName',width : 70,menuDisabled : true},
+			        	{header : "物品型号",dataIndex : 'model',width : 60,menuDisabled : true},
+		        		{header : "注册证号",width : 70,dataIndex : 'certification',menuDisabled : true,
 							editor : new top.Ext.form.TextField({
 								maxLength : 30,
 								allowBlank : true,
@@ -558,23 +562,7 @@
 								}
 							})
 						},
-			        	{header : "失效日期",width : 70,dataIndex : 'expDate',menuDisabled : true, renderer:top.Ext.util.Format.dateRenderer('Y-m-d'),
-							editor : new top.Ext.form.DateExtensiableField({
-								minWidth : 177,
-								format : 'Y-m-d',
-								altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-								allowBlank : false,
-								listeners:{
-		        					change :function(field,newVal,oldVal){
-		        						if(commonEntry.isOpen()){
-		        							field.setValue(oldVal);
-		        							return false;
-		        						}
-		        					}
-								}
-							})
-						},
-			        	{header : "单价",dataIndex : 'cost',width : 40,menuDisabled : true,
+			        	{header : "单价",dataIndex : 'cost',width : 35,menuDisabled : true,
 		    				editor : new top.Ext.form.TextField({
 		    					regex: /^(([1-9]+[0-9]*.{1}[0-9]+)|([0].{1}[1-9]+[0-9]*)|([1-9][0-9]*)|([0][.][0-9]+[1-9]*))$/,
 		    					regexText:'只能输入正数',
@@ -596,11 +584,27 @@
 		        				}
 		    				})
 		    			},
-						{header : "批次号",dataIndex : 'batchNumber',width : 80,menuDisabled : true},
-		    			{header : "自身条码1",dataIndex : 'firstBodyCode',width : 100,menuDisabled : true},
-						{header : "自身条码2",dataIndex : 'secondBodyCode',width : 100,menuDisabled : true},
-						{header : "自身条码3",dataIndex : 'thirdBodyCode',width : 100,menuDisabled : true},
-		    			{header : '类别',width : 50,menuDisabled : true,dataIndex : 'grade',
+			        	{header : "失效日期",width : 50,dataIndex : 'expDate',menuDisabled : true, renderer:top.Ext.util.Format.dateRenderer('Y-m-d'),
+							editor : new top.Ext.form.DateExtensiableField({
+								minWidth : 177,
+								format : 'Y-m-d',
+								altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+								allowBlank : false,
+								listeners:{
+		        					change :function(field,newVal,oldVal){
+		        						if(commonEntry.isOpen()){
+		        							field.setValue(oldVal);
+		        							return false;
+		        						}
+		        					}
+								}
+							})
+						},
+						{header : "批次号",dataIndex : 'batchNumber',width : 70,menuDisabled : true},
+		    			{header : "自身条码1",dataIndex : 'firstBodyCode',width : 70,menuDisabled : true},
+						{header : "自身条码2",dataIndex : 'secondBodyCode',width : 70,menuDisabled : true},
+						{header : "自身条码3",dataIndex : 'thirdBodyCode',width : 70,menuDisabled : true},
+		    			{header : '类别',width : 50,menuDisabled : true,dataIndex : 'grade',hidden :true,
 		    				editor : new top.Ext.form.ComboBox({
 		    					minChars : 0,
 		    					store : gradeStore,
@@ -780,7 +784,7 @@
 						xtype : 'combo',
 						id : 'model1',
 						name : 'model1',
-						maxLength : '30',
+						maxLength : '35',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'model',
@@ -794,7 +798,7 @@
 						typeAhead : false,
 						allowBlank:true,
 						selectOnFocus :true,
-						width : 150,
+						width : 176,
 						tabIndex : 3,
 						anchor : '95%',
 						listeners : {
@@ -822,7 +826,7 @@
 						store : expensiveGoodsApplicationDetailStore,
 						cm : expensiveGoodsApplicationDetailCm,
 						enableHdMenu : false,
-						width :350,
+						width :315,
 						height :490,
 						loadMask : true,
 						tbar:[{
@@ -833,8 +837,8 @@
 							id : 'invoicePlan1',
 							name : 'invoicePlan1',
 							valueField : 'id',
-							listWidth : 350,
-							width :250,
+							listWidth : 250,
+							width :235,
 							displayField : 'showDetail',
 							allowBlank : true,
 							queryParam : 'spell',
@@ -983,6 +987,9 @@
 					showResult('请选择要绑定的申请单');
 					return false;
 				}
+				if(!isSameSupplierId(supplierId)){
+					return false;
+				}
 //				var name = top.Ext.getCmp('name1').getValue();
 				var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
 				var len = store.getCount();
@@ -1117,6 +1124,9 @@
 					showResult('请选择要绑定的申请单');
 					return false;
 				}
+				if(!isSameSupplierId(supplierId)){
+					return false;
+				}
 //				var name = top.Ext.getCmp('name1').getValue();
 				var store = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore();
 				var len = store.getCount();
@@ -1139,7 +1149,7 @@
 						firstBodyCode : record.data.firstBodyCode,
 						secondBodyCode : record.data.secondBodyCode,
 						thirdBodyCode : record.data.thirdBodyCode,
-						supplierId : supplierId,
+						supplierId : record.data.supplierId,
 						supplierName : supplierName,
 						invoicePlanId :invoicePlanId,
 						localID: record.data.localID
@@ -1205,8 +1215,8 @@
 		id : 'recyclingApplicationWin',
 		layout : 'fit',
 		title : '入库单信息',
-		width : 1200,
-		height :685,
+		width : 1100,
+		height :660,
 		modal : true,
 //		autoHeight : true,
 		border :false,
@@ -1270,6 +1280,21 @@
 	return isCheckSuccess;
 }
 
+/**
+ * 检查是否同一个供应商
+ */
+function isSameSupplierId(supplierId){
+	for(var i = 0;i < top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getCount();i++){
+		var expensiveGoodsGodownEntryItemData = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getAt(i).data;
+		if(expensiveGoodsGodownEntryItemData.supplierId != supplierId){
+			showResult("一张入库单只能填同一个供应商!");
+			return false;
+		}
+	}
+	return true;
+}
+
+
 ////////////检查物品的入库数量是否大于等于申请单物品的申请数量
 /**
  * 检查物品的入库数量是否大于等于申请单物品的申请数量
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js
===================================================================
diff -u -r22075 -r22111
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js	(.../expensiveGoodsGodownEntryView.js)	(revision 22075)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.js	(.../expensiveGoodsGodownEntryView.js)	(revision 22111)
@@ -315,13 +315,16 @@
 //		}
 //	}
 	//是否同一个供应商的物品
-	for(var i = 0;i < top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getCount();i++){
-		var expensiveGoodsGodownEntryItemData = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getAt(i).data;
-		if(expensiveGoodsGodownEntryItemData.supplierId != supplierId){
-			showResult("一张入库单只能填同一个供应商!");
-			return false;
-		}
+	if(!isSameSupplierId(supplierId)){
+		return false;
 	}
+//	for(var i = 0;i < top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getCount();i++){
+//		var expensiveGoodsGodownEntryItemData = top.Ext.getCmp('expensiveGoodsGodownEntryItemGrid').getStore().getAt(i).data;
+//		if(expensiveGoodsGodownEntryItemData.supplierId != supplierId){
+//			showResult("一张入库单只能填同一个供应商!");
+//			return false;
+//		}
+//	}
 	
 	//填写的高值耗材名称是否存在于绑定的申请单里面
 	if(!matchingInvoicePlan(expensiveGoodsId)){