From 434499eca54ac2f50b1c6e899fe81b8d1d0f7cef 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, 18 Mar 2018 13:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=A5=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=82=B9=E5=87=BB=E5=90=8E=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=88=E7=BB=AD=E5=A2=9E=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/css/common.css | 12 ++++++++++++ src/main/webapp/js/pages/materials/bill_detail.js | 4 ++-- src/main/webapp/pages/materials/material.jsp | 8 +++++++- src/main/webapp/pages/reports/customer_account.jsp | 8 +++++++- src/main/webapp/pages/reports/vendor_account.jsp | 8 +++++++- 5 files changed, 35 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/css/common.css b/src/main/webapp/css/common.css index 976fb07f..861c2e72 100644 --- a/src/main/webapp/css/common.css +++ b/src/main/webapp/css/common.css @@ -37,4 +37,16 @@ color:blue; text-decoration:underline; cursor:pointer; +} + +#tablePanel .n-link{ + color:blue; + text-decoration:underline; + cursor:pointer; +} + +#materialDetailListDlg .n-link{ + color:blue; + text-decoration:underline; + cursor:pointer; } \ No newline at end of file diff --git a/src/main/webapp/js/pages/materials/bill_detail.js b/src/main/webapp/js/pages/materials/bill_detail.js index 482c2422..7a112690 100644 --- a/src/main/webapp/js/pages/materials/bill_detail.js +++ b/src/main/webapp/js/pages/materials/bill_detail.js @@ -90,7 +90,7 @@ billType = "material"; $("#bill .purchase_in").show(); } - else if(listSubType == "采购退货") { + else if(listSubType == "采购退货出库") { billType = "material"; $("#bill .purchase_back").show(); } @@ -98,7 +98,7 @@ billType = "material"; $("#bill .sale_out").show(); } - else if(listSubType == "销售退货") { + else if(listSubType == "销售退货入库") { billType = "material"; $("#bill .sale_back").show(); } diff --git a/src/main/webapp/pages/materials/material.jsp b/src/main/webapp/pages/materials/material.jsp index a17c63ea..5413fa72 100644 --- a/src/main/webapp/pages/materials/material.jsp +++ b/src/main/webapp/pages/materials/material.jsp @@ -19,6 +19,7 @@ + @@ -738,7 +739,12 @@ pageSize: initPageSize, pageList: initPageNum, columns:[[ - { title: '单据编号',field: 'Number',width:150}, + { title: '单据编号',field: 'Number',width:150, + formatter: function (value, row) { + return "" + + row.Number + ""; + } + }, { title: '类型', field: 'Type',width:100}, { title: '数量', field: 'BasicNumber',width:80}, { title: '日期',field: 'OperTime',width:180} diff --git a/src/main/webapp/pages/reports/customer_account.jsp b/src/main/webapp/pages/reports/customer_account.jsp index 3cd71684..36f00481 100644 --- a/src/main/webapp/pages/reports/customer_account.jsp +++ b/src/main/webapp/pages/reports/customer_account.jsp @@ -19,6 +19,7 @@ + +