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? "已审核":"未审核";
}
- },
- { title: '单据备注',field: 'Remark',width:100}
+ }
]],
- view: detailview,
- detailFormatter: function(rowIndex, rowData){
- var mList = rowData.MaterialsList.replace(","," , ");
- return '
' +
- '| ' +
- ' 商品信息: ' + mList + ' ' +
- ' | ' +
- '
';
- },
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-
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 @@
-