1.总账修改

frontend/saas-web/app/view/money/report/TotalPayDetail.js

@@ -41,7 +41,11 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         text: '供应商名称',
         dataIndex: 'vm_vendname',
         width: 200,
-    }, {
+    }, {text: '期初预付',
+    xtype: 'numbercolumn',
+    dataIndex: 'vm_beginpreamount',
+    width: 150
+    },{
         text: '期初应付',
         xtype: 'numbercolumn',
         dataIndex: 'vm_beginamount',
@@ -53,7 +57,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '增加应付',
+        text: '本期应付',
         xtype: 'numbercolumn',
         dataIndex: 'vm_nowamount',
         width: 110,
@@ -64,8 +68,12 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '增加预付',
+        text: '本期核销',
         xtype: 'numbercolumn',
+
+        dataIndex: 'vm_nowpayamount',
+        width: 150,
+
         dataIndex: 'vm_nowpreamount',
         width: 110,
         renderer: function(v) {

frontend/saas-web/app/view/money/report/TotalRecDetail.js

@@ -42,6 +42,10 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         dataIndex: 'cm_custname',
         width: 200,
     }, {
+            text: '期初预收',
+            dataIndex: 'cm_beginpreamount',
+            width: 150
+        },{
         text: '期初应收',
         dataIndex: 'cm_beginamount',
         xtype: 'numbercolumn',
@@ -53,7 +57,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '增加应收',
+        text: '本期应收',
         xtype: 'numbercolumn',
         dataIndex: 'cm_nowamount',
         width: 150,
@@ -64,9 +68,9 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '增加预收',
+        text: '本期核销',
         xtype: 'numbercolumn',
-        dataIndex: 'cm_nowpreamount',
+        dataIndex: 'cm_nowpayamount',
         width: 150,
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -75,6 +79,11 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             return Ext.util.Format.number(v, format);
         }
     }, {
+            text: '预收余额',
+            xtype: 'numbercolumn',
+            dataIndex: 'cm_endpreamount',
+            width: 150
+        }, {
         text: '应收余额',
         dataIndex: 'cm_endamount',
         xtype: 'numbercolumn',