From fa3c0e1fe6839d0c958d8bdd5032e245bdab01b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sun, 12 Nov 2017 21:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86=E7=9A=84=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/pages/materials/in_out.js | 36 ++++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js
index 8a994005..64914010 100644
--- a/src/main/webapp/js/pages/materials/in_out.js
+++ b/src/main/webapp/js/pages/materials/in_out.js
@@ -1062,15 +1062,15 @@
 						}
 					}
 				},
-				{ title: '单位',field: 'Unit',editor:'validatebox',width:70},
-	            { title: '数量',field: 'OperNumber',editor:'validatebox',width:70},
-	            { title: '单价',field: 'UnitPrice',editor:'validatebox',width:70},
-				{ title: '含税单价',field: 'TaxUnitPrice',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-	            { title: '金额',field: 'AllPrice',editor:'validatebox',width:80},
-				{ title: '税率(%)',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-				{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-				{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-	            { title: '备注',field: 'Remark',editor:'validatebox',width:150},
+				{ title: '单位',field: 'Unit',editor:'validatebox',width:60},
+	            { title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
+	            { title: '单价',field: 'UnitPrice',editor:'validatebox',width:60},
+				{ title: '含税单价',field: 'TaxUnitPrice',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+	            { title: '金额',field: 'AllPrice',editor:'validatebox',width:75},
+				{ title: '税率(%)',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+				{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+				{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+	            { title: '备注',field: 'Remark',editor:'validatebox',width:120},
 				{ title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
 				{ title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
 				{ title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},
@@ -1189,15 +1189,15 @@
 				{ title: depotHeadName,field: 'DepotName',editor:'validatebox',width:90},
 				{ title: '品名(型号)(扩展信息)(包装)',field: 'MaterialName',width:230},
 				{ title: anotherDepotHeadName,field: 'AnotherDepotName',hidden:isShowAnotherDepot,width:90},
-				{ title: '单位',field: 'Unit',editor:'validatebox',width:70},
-				{ title: '数量',field: 'OperNumber',editor:'validatebox',width:70},
-				{ title: '单价',field: 'UnitPrice',editor:'validatebox',width:70},
-				{ title: '含税单价',field: 'TaxUnitPrice',editor:'validattebox',hidden:isShowTaxColumn,width:80},
-				{ title: '金额',field: 'AllPrice',editor:'validatebox',width:80},
-				{ title: '税率',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-				{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-				{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:80},
-				{ title: '备注',field: 'Remark',editor:'validatebox',width:150},
+				{ title: '单位',field: 'Unit',editor:'validatebox',width:60},
+				{ title: '数量',field: 'OperNumber',editor:'validatebox',width:60},
+				{ title: '单价',field: 'UnitPrice',editor:'validatebox',width:60},
+				{ title: '含税单价',field: 'TaxUnitPrice',editor:'validattebox',hidden:isShowTaxColumn,width:75},
+				{ title: '金额',field: 'AllPrice',editor:'validatebox',width:75},
+				{ title: '税率',field: 'TaxRate',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+				{ title: '税额',field: 'TaxMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+				{ title: '价税合计',field: 'TaxLastMoney',editor:'validatebox',hidden:isShowTaxColumn,width:75},
+				{ title: '备注',field: 'Remark',editor:'validatebox',width:120},
 				{ title: '品名-别',field: 'OtherField1',editor:'validatebox',hidden:otherColumns,width:60},
 				{ title: '型号-别',field: 'OtherField2',editor:'validatebox',hidden:otherColumns,width:60},
 				{ title: '颜色-别',field: 'OtherField3',editor:'validatebox',hidden:otherColumns,width:60},