优化供应商和客户对账

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,
+            BeginNeedGet : res.beginNeedGet == "0"? "":res.beginNeedGet,
-            BeginNeedPay : beginNeedPay == "0"? "":beginNeedPay,
+            BeginNeedPay : res.beginNeedPay == "0"? "":res.beginNeedPay,
-            AllNeedGet: "",
+            AllNeedGet: res.allNeedGet == "0"? "":res.allNeedGet,
-            AllNeedPay: "",
+            AllNeedPay: res.allNeedPay == "0"? "":res.allNeedPay,
             description : res.description,
             type : res.type,
             fax : res.fax,

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;}

erp_web/js/print/print.js

@@ -12,13 +12,18 @@ function CreateFormPage(strPrintName, printDatagrid) {
         companyName = config.companyName;
     }
     var tableString = '<div class="div-title">' + companyName + "-" + listTitle + '\n</div>';
-        if(beginDate && endDate) {
+    if(beginDate && endDate) {
-            tableString+='\n<div class="div-time">日期：' + beginDate + ' 至 ' + endDate + ' \n</div>';
+        tableString+='\n<div class="div-time">日期：' + beginDate + ' 至 ' + endDate + '</div>';
-        }
+    }
-        if(getMonth) {
+    if(getMonth) {
-            tableString += '\n<div class="div-time">月份：' + getMonth + ' \n</div>';
+        tableString += '\n<div class="div-time">月份：' + getMonth + '</div>';
-        }
+    }
-        tableString+='\n<table cellspacing="0" class="pb">';
+    if(listTitle == "供应商对账"){
+        tableString += '\n<span class="div-total">期初应付：' + $(".first-total").text() + '  期末应付：' + $(".last-total").text() + '</span>';
+    } else if(listTitle == "客户对账"){
+        tableString += '\n<span class="div-total">期初应收：' + $(".first-total").text() + '  期末应收：' + $(".last-total").text() + '</span>';
+    }
+    tableString+='\n<table cellspacing="0" class="pb">';
     var frozenColumns = printDatagrid.datagrid("options").frozenColumns;  // 得到frozenColumns对象
     var columns = printDatagrid.datagrid("options").columns;    // 得到columns对象
     var nameList = '';

erp_web/pages/manage/customer.html

@@ -100,12 +100,12 @@
                 </td>
             </tr>
             <tr>
-                <td>累计应收</td>
+                <td>期末应收</td>
                 <td style="padding:5px">
                     <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-textbox" style="width: 160px;"
                            readonly="readonly"/>
                 </td>
-                <td>累计应付</td>
+                <td>期末应付</td>
                 <td style="padding:5px">
                     <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-textbox" style="width: 160px;"
                            readonly="readonly"/>

erp_web/pages/manage/member.html

@@ -100,12 +100,12 @@
                 </td>
             </tr>
             <tr>
-                <td>累计应收</td>
+                <td>期末应收</td>
                 <td style="padding:5px">
                     <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-textbox" style="width: 160px;"
                            readonly="readonly"/>
                 </td>
-                <td>累计应付</td>
+                <td>期末应付</td>
                 <td style="padding:5px">
                     <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-textbox" style="width: 160px;"
                            readonly="readonly"/>

erp_web/pages/manage/vendor.html

@@ -100,12 +100,12 @@
                 </td>
             </tr>
             <tr>
-                <td>累计应收</td>
+                <td>期末应收</td>
                 <td style="padding:5px">
                     <input name="AllNeedGet" id="AllNeedGet" class="easyui-textbox" style="width: 160px;"
                            readonly="readonly"/>
                 </td>
-                <td>累计应付</td>
+                <td>期末应付</td>
                 <td style="padding:5px">
                     <input name="AllNeedPay" id="AllNeedPay" class="easyui-textbox" style="width: 160px;"
                            readonly="readonly"/>

erp_web/pages/reports/vendor_account.html

@@ -43,8 +43,8 @@
             <a href="javascript:void(0)" class="easyui-linkbutton" iconCls="icon-print" id="printBtn">打印</a>
         </div>
         <div class="form-group">
-            期初应收：<span class="first-total">0</span>&nbsp;&nbsp;
+            期初应付：<span class="first-total">0</span>&nbsp;&nbsp;
-            期末应收：<span class="last-total">0</span><span id="pleaseSelect">（请选择供应商）</span>
+            期末应付：<span class="last-total">0</span><span id="pleaseSelect">（请选择供应商）</span>
         </div>
     </div>
     <table id="tableData" style="top:300px;border-bottom-color:#FFFFFF"></table>