Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
JSH ERP
Commits
b9711d79
Commit
b9711d79
authored
Sep 27, 2017
by
季圣华
Browse files
优化单据列表,在列表展示商品信息
parent
b7db84b2
Changes
14
Show whitespace changes
Inline
Side-by-side
src/main/webapp/js/pages/materials/in_out.js
View file @
b9711d79
...
...
@@ -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
:
8
0
},
{
title
:
'
操作员
'
,
field
:
'
OperPersonName
'
,
width
:
6
0
},
{
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
'
);
...
...
src/main/webapp/pages/materials/allocation_out_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/assemble_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/disassemble_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/gift_out_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/gift_recharge_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/other_in_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/other_out_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/purchase_back_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/purchase_in_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/retail_back_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/retail_out_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/sale_back_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
src/main/webapp/pages/materials/sale_out_list.jsp
View file @
b9711d79
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment