diff --git a/erp_web/js/pages/manage/supplier.js b/erp_web/js/pages/manage/supplier.js index fd34c947..cf75db4e 100644 --- a/erp_web/js/pages/manage/supplier.js +++ b/erp_web/js/pages/manage/supplier.js @@ -561,17 +561,15 @@ function editSupplier(index) { var res = $("#tableData").datagrid("getRows")[index]; var sId = res.id; - var beginNeedGet = res.beginNeedGet; - var beginNeedPay = res.beginNeedPay; var row = { supplier : res.supplier, contacts : res.contacts, phonenum : res.phoneNum, email : res.email, - BeginNeedGet : beginNeedGet == "0"? "":beginNeedGet, - BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay, - AllNeedGet: "", - AllNeedPay: "", + BeginNeedGet : res.beginNeedGet == "0"? "":res.beginNeedGet, + BeginNeedPay : res.beginNeedPay == "0"? "":res.beginNeedPay, + AllNeedGet: res.allNeedGet == "0"? "":res.allNeedGet, + AllNeedPay: res.allNeedPay == "0"? "":res.allNeedPay, description : res.description, type : res.type, fax : res.fax, diff --git a/erp_web/js/print/print.html b/erp_web/js/print/print.html index 7fa8c511..6501a8fe 100644 --- a/erp_web/js/print/print.html +++ b/erp_web/js/print/print.html @@ -6,6 +6,7 @@ body{background:white;margin:0px;padding:0px;font-size:13px;text-align:left;} .div-title{font-size: 16pt;} .div-time{font-size: 11pt;} + .div-total{font-size: 11pt;} .pb{font-size:13px;border-collapse:collapse;} .pb th{font-weight:bold;text-align:center;border:1px solid #333333;padding:2px;} .pb td{border:1px solid #333333;padding:2px;} diff --git a/erp_web/js/print/print.js b/erp_web/js/print/print.js index 47fda471..a907c9c4 100644 --- a/erp_web/js/print/print.js +++ b/erp_web/js/print/print.js @@ -12,13 +12,18 @@ function CreateFormPage(strPrintName, printDatagrid) { companyName = config.companyName; } var tableString = '
' + companyName + "-" + listTitle + '\n
'; - if(beginDate && endDate) { - tableString+='\n
日期:' + beginDate + ' 至 ' + endDate + ' \n
'; - } - if(getMonth) { - tableString += '\n
月份:' + getMonth + ' \n
'; - } - tableString+='\n'; + if(beginDate && endDate) { + tableString+='\n
日期:' + beginDate + ' 至 ' + endDate + '
'; + } + if(getMonth) { + tableString += '\n
月份:' + getMonth + '
'; + } + if(listTitle == "供应商对账"){ + tableString += '\n期初应付:' + $(".first-total").text() + ' 期末应付:' + $(".last-total").text() + ''; + } else if(listTitle == "客户对账"){ + tableString += '\n期初应收:' + $(".first-total").text() + ' 期末应收:' + $(".last-total").text() + ''; + } + tableString+='\n
'; var frozenColumns = printDatagrid.datagrid("options").frozenColumns; // 得到frozenColumns对象 var columns = printDatagrid.datagrid("options").columns; // 得到columns对象 var nameList = ''; diff --git a/erp_web/pages/manage/customer.html b/erp_web/pages/manage/customer.html index d8f25378..a7ee8af0 100644 --- a/erp_web/pages/manage/customer.html +++ b/erp_web/pages/manage/customer.html @@ -100,12 +100,12 @@ - + - + - + - + - + - +
累计应收期末应收 累计应付期末应付 diff --git a/erp_web/pages/manage/member.html b/erp_web/pages/manage/member.html index 2597820b..f9a3d722 100644 --- a/erp_web/pages/manage/member.html +++ b/erp_web/pages/manage/member.html @@ -100,12 +100,12 @@
累计应收期末应收 累计应付期末应付 diff --git a/erp_web/pages/manage/vendor.html b/erp_web/pages/manage/vendor.html index 74a07679..267684fa 100644 --- a/erp_web/pages/manage/vendor.html +++ b/erp_web/pages/manage/vendor.html @@ -100,12 +100,12 @@
累计应收期末应收 累计应付期末应付 diff --git a/erp_web/pages/reports/vendor_account.html b/erp_web/pages/reports/vendor_account.html index 083c251f..2ecfef28 100644 --- a/erp_web/pages/reports/vendor_account.html +++ b/erp_web/pages/reports/vendor_account.html @@ -43,8 +43,8 @@ 打印
- 期初应收:0   - 期末应收:0(请选择供应商) + 期初应付:0   + 期末应付:0(请选择供应商)