From b9711d7934ba5465667800995dd448825c46e099 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 27 Sep 2017 23:51:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E5=9C=A8=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/pages/materials/in_out.js  | 20 +++++++------------
 .../pages/materials/allocation_out_list.jsp   |  1 -
 .../webapp/pages/materials/assemble_list.jsp  |  1 -
 .../pages/materials/disassemble_list.jsp      |  1 -
 .../webapp/pages/materials/gift_out_list.jsp  |  1 -
 .../pages/materials/gift_recharge_list.jsp    |  1 -
 .../webapp/pages/materials/other_in_list.jsp  |  1 -
 .../webapp/pages/materials/other_out_list.jsp |  1 -
 .../pages/materials/purchase_back_list.jsp    |  1 -
 .../pages/materials/purchase_in_list.jsp      |  1 -
 .../pages/materials/retail_back_list.jsp      |  1 -
 .../pages/materials/retail_out_list.jsp       |  1 -
 .../webapp/pages/materials/sale_back_list.jsp |  1 -
 .../webapp/pages/materials/sale_out_list.jsp  |  1 -
 14 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/src/main/webapp/js/pages/materials/in_out.js b/src/main/webapp/js/pages/materials/in_out.js
index 3a9032fa..738e5a8c 100644
--- a/src/main/webapp/js/pages/materials/in_out.js
+++ b/src/main/webapp/js/pages/materials/in_out.js
@@ -545,9 +545,13 @@
 					}
 				},
 				{ title: organNameTitle, field: 'OrganName',width:120, hidden:isShowOrganNameColumn},
-				{ title: '单据编号',field: 'Number',width:140},
+				{ title: '单据编号',field: 'Number',width:130},
+				{ title: '商品信息',field: 'MaterialsList',width:180,formatter:function(value){
+						return value.replace(",","，");
+					}
+				},
 				{ title: '单据日期 ',field: 'OperTime',width:130},
-				{ title: '操作员',field: 'OperPersonName',width:80},
+				{ title: '操作员',field: 'OperPersonName',width:60},
 				{ title: '金额合计',field: 'TotalPrice',width:60},
 				{ title: '含税合计',field: 'TotalTaxLastMoney',hidden:isShowLastMoneyColumn,width:60,formatter:function(value,rec){
 						return (rec.DiscountMoney + rec.DiscountLastMoney).toFixed(2);
@@ -558,18 +562,8 @@
 				{ title: '状态',field: 'Status',width:70,align:"center",formatter:function(value){
 						return value? "<span style='color:green;'>已审核</span>":"<span style='color:red;'>未审核</span>";
 					}
-				},
-				{ title: '单据备注',field: 'Remark',width:100}
+				}
 			]],
-			view: detailview,
-			detailFormatter: function(rowIndex, rowData){
-				var mList = rowData.MaterialsList.replace(","," ， ");
-				return '<table><tr>' +
-					'<td style="border:0">' +
-					'<p>商品信息： ' + mList + '</p>' +
-					'</td>' +
-					'</tr></table>';
-			},
 			toolbar:tableToolBar,
 			onLoadError:function() {
 				$.messager.alert('页面加载提示','页面加载异常，请稍后再试！','error');
diff --git a/src/main/webapp/pages/materials/allocation_out_list.jsp b/src/main/webapp/pages/materials/allocation_out_list.jsp
index 3e4d91a4..1d06358f 100644
--- a/src/main/webapp/pages/materials/allocation_out_list.jsp
+++ b/src/main/webapp/pages/materials/allocation_out_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/assemble_list.jsp b/src/main/webapp/pages/materials/assemble_list.jsp
index 02337a00..7b5b671f 100644
--- a/src/main/webapp/pages/materials/assemble_list.jsp
+++ b/src/main/webapp/pages/materials/assemble_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/disassemble_list.jsp b/src/main/webapp/pages/materials/disassemble_list.jsp
index 7aae59e8..14da5f30 100644
--- a/src/main/webapp/pages/materials/disassemble_list.jsp
+++ b/src/main/webapp/pages/materials/disassemble_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/gift_out_list.jsp b/src/main/webapp/pages/materials/gift_out_list.jsp
index 588430ce..537ff17d 100644
--- a/src/main/webapp/pages/materials/gift_out_list.jsp
+++ b/src/main/webapp/pages/materials/gift_out_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/gift_recharge_list.jsp b/src/main/webapp/pages/materials/gift_recharge_list.jsp
index 48b42ac1..961c8f6d 100644
--- a/src/main/webapp/pages/materials/gift_recharge_list.jsp
+++ b/src/main/webapp/pages/materials/gift_recharge_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/other_in_list.jsp b/src/main/webapp/pages/materials/other_in_list.jsp
index 5b7e7b6c..b8885a88 100644
--- a/src/main/webapp/pages/materials/other_in_list.jsp
+++ b/src/main/webapp/pages/materials/other_in_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/other_out_list.jsp b/src/main/webapp/pages/materials/other_out_list.jsp
index 9e731226..d134ecda 100644
--- a/src/main/webapp/pages/materials/other_out_list.jsp
+++ b/src/main/webapp/pages/materials/other_out_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/purchase_back_list.jsp b/src/main/webapp/pages/materials/purchase_back_list.jsp
index be7aebf0..288d1dad 100644
--- a/src/main/webapp/pages/materials/purchase_back_list.jsp
+++ b/src/main/webapp/pages/materials/purchase_back_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/purchase_in_list.jsp b/src/main/webapp/pages/materials/purchase_in_list.jsp
index 9468c481..db7bacf8 100644
--- a/src/main/webapp/pages/materials/purchase_in_list.jsp
+++ b/src/main/webapp/pages/materials/purchase_in_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/retail_back_list.jsp b/src/main/webapp/pages/materials/retail_back_list.jsp
index 5afd238b..ba80d698 100644
--- a/src/main/webapp/pages/materials/retail_back_list.jsp
+++ b/src/main/webapp/pages/materials/retail_back_list.jsp
@@ -19,7 +19,6 @@
 	<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 	<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 	<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-	<script src="<%=path %>/js/datagrid-detailview.js"></script>
 	<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 	<script src="<%=path %>/js/common/common.js"></script>
 	<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/retail_out_list.jsp b/src/main/webapp/pages/materials/retail_out_list.jsp
index 64eadce4..0c2fdaf7 100644
--- a/src/main/webapp/pages/materials/retail_out_list.jsp
+++ b/src/main/webapp/pages/materials/retail_out_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/sale_back_list.jsp b/src/main/webapp/pages/materials/sale_back_list.jsp
index 5d61cbd9..13a9235b 100644
--- a/src/main/webapp/pages/materials/sale_back_list.jsp
+++ b/src/main/webapp/pages/materials/sale_back_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>
diff --git a/src/main/webapp/pages/materials/sale_out_list.jsp b/src/main/webapp/pages/materials/sale_out_list.jsp
index fe1e41e8..3869b31c 100644
--- a/src/main/webapp/pages/materials/sale_out_list.jsp
+++ b/src/main/webapp/pages/materials/sale_out_list.jsp
@@ -19,7 +19,6 @@
 		<script src="<%=path %>/js/jquery-1.8.0.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/jquery.easyui.min.js"></script>
 		<script src="<%=path %>/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
-		<script src="<%=path %>/js/datagrid-detailview.js"></script>
 		<script src="<%=path %>/js/My97DatePicker/WdatePicker.js"></script>
 		<script src="<%=path %>/js/common/common.js"></script>		
 		<script src="<%=path %>/js/pages/materials/in_out.js"></script>