From 7ec6035d1c7e87417d1c4627b57913b31dfbcf96 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, 10 Sep 2017 20:17:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=88=97=E8=A1=A8=E4=B8=AD?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F'=E9=A2=9C=E8=89=B2'=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/pages/reports/buy_in_report.jsp       | 3 +--
 src/main/webapp/pages/reports/gift_manage_report.jsp  | 2 +-
 src/main/webapp/pages/reports/in_out_stock_report.jsp | 3 +--
 src/main/webapp/pages/reports/sale_out_report.jsp     | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/pages/reports/buy_in_report.jsp b/src/main/webapp/pages/reports/buy_in_report.jsp
index fec19dc9..cfb0083e 100644
--- a/src/main/webapp/pages/reports/buy_in_report.jsp
+++ b/src/main/webapp/pages/reports/buy_in_report.jsp
@@ -73,7 +73,6 @@
 					animate:false,
 					//选中单行
 					singleSelect : true,
-					//url:'<%=path %>/depotItem/buyIn.action?pageSize=' + initPageSize,
 					pagination: true,
 					//交替出现背景
 					striped : true,
@@ -84,7 +83,7 @@
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
 					  { title: '规格',field: 'MaterialStandard',width:80},
-			          { title: '颜色',field: 'MaterialColor',width:80},
+			          { title: '颜色',field: 'MaterialColor',width:80,hidden:true},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '进货数量',field: 'InSum',width:60},			          
 			          { title: '进货金额',field: 'InSumPrice',width:60},
diff --git a/src/main/webapp/pages/reports/gift_manage_report.jsp b/src/main/webapp/pages/reports/gift_manage_report.jsp
index 7d206c7c..a236958e 100644
--- a/src/main/webapp/pages/reports/gift_manage_report.jsp
+++ b/src/main/webapp/pages/reports/gift_manage_report.jsp
@@ -92,7 +92,7 @@
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
 					  { title: '规格',field: 'MaterialStandard',width:80},
-			          { title: '颜色',field: 'MaterialColor',width:80},
+			          { title: '颜色',field: 'MaterialColor',width:80,hidden:true},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '结存数量',field: 'thisSum',width:80}
 					]],
diff --git a/src/main/webapp/pages/reports/in_out_stock_report.jsp b/src/main/webapp/pages/reports/in_out_stock_report.jsp
index f04061ae..5ee0ae64 100644
--- a/src/main/webapp/pages/reports/in_out_stock_report.jsp
+++ b/src/main/webapp/pages/reports/in_out_stock_report.jsp
@@ -195,7 +195,6 @@
 					animate:false,
 					//选中单行
 					singleSelect : true,
-					//url:'<%=path %>/depotItem/findByAll.action?pageSize=' + initPageSize,
 					pagination: true,
 					//交替出现背景
 					striped : true,
@@ -206,7 +205,7 @@
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
 					  { title: '规格',field: 'MaterialStandard',width:80},
-			          { title: '颜色',field: 'MaterialColor',width:80},
+			          { title: '颜色',field: 'MaterialColor',width:80,hidden:true},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '单价',field: 'UnitPrice',width:60,formatter: function(value,row,index){
 							return value.toFixed(2);
diff --git a/src/main/webapp/pages/reports/sale_out_report.jsp b/src/main/webapp/pages/reports/sale_out_report.jsp
index a7243985..082c7bbc 100644
--- a/src/main/webapp/pages/reports/sale_out_report.jsp
+++ b/src/main/webapp/pages/reports/sale_out_report.jsp
@@ -75,7 +75,6 @@
 					animate:false,
 					//选中单行
 					singleSelect : true,
-					//url:'<%=path %>/depotItem/saleOut.action?pageSize=' + initPageSize,
 					pagination: true,
 					//交替出现背景
 					striped : true,
@@ -86,7 +85,7 @@
 			          { title: '名称',field: 'MaterialName',width:60},
 			          { title: '型号',field: 'MaterialModel',width:80},
 					  { title: '规格',field: 'MaterialStandard',width:80},
-			          { title: '颜色',field: 'MaterialColor',width:80},
+			          { title: '颜色',field: 'MaterialColor',width:80,hidden:true},
 					  { title: '单位',field: 'MaterialUnit',width:80},
 			          { title: '销售数量',field: 'OutSum',width:60},			          
 			          { title: '销售金额',field: 'OutSumPrice',width:60},