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 @@ + +