应收/付总账报表格式

frontend/saas-web/app/model/report/TotalPayDetail.js

@@ -0,0 +1,22 @@
+Ext.define('saas.model.report.TotalPayDetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+        { name: 'vm_yearmonth', type: 'string' }, // 期间
+        { name: 'vm_vendname', type: 'string' }, // 供应商名称
+        { name: 'vm_beginpreamount', type: 'float' }, // 期初预付
+        { name: 'vm_beginamount', type: 'float' }, // 期初应付
+        { name: 'vm_nowpreamount', type: 'float' }, // 本期预付
+        { name: 'vm_nowamount', type: 'float' }, // 本期应付
+        { name: 'vm_nowpayamount', type: 'float' }, // 本期核销
+        { name: 'vm_endpreamount', type: 'float' }, // 期末预付
+        { name: 'vm_endamount', type: 'float' }, // 期末应付
+        { name: 'vm_endamount-vm_endpreamount', type: 'float', // 应付余额
+            convert: function(v, rec) {
+                var t = (rec.get('vm_endamount') || 0.0) - (rec.get('vm_endpreamount') || 0.0);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
+            },
+            depends: ['vm_endamount', 'vm_endpreamount']
+        }
+    ],
+});

frontend/saas-web/app/model/report/TotalRecDetail.js

@@ -0,0 +1,22 @@
+Ext.define('saas.model.report.TotalRecDetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+        { name: 'cm_yearmonth', type: 'string' }, // 期间
+        { name: 'cm_custname', type: 'string' }, // 客户名称
+        { name: 'cm_beginpreamount', type: 'float' }, // 期初预收
+        { name: 'cm_beginamount', type: 'float' }, // 期初应收
+        { name: 'cm_nowpreamount', type: 'float' }, // 本期预收
+        { name: 'cm_nowamount', type: 'float' }, // 本期应收
+        { name: 'cm_nowpayamount', type: 'float' }, // 本期核销
+        { name: 'cm_endpreamount', type: 'float' }, // 期末预收
+        { name: 'cm_endamount', type: 'float' }, // 期末应收
+        { name: 'cm_endamount-cm_endpreamount', type: 'float', // 应收余额
+            convert: function(v, rec) {
+                var t = (rec.get('cm_endamount') || 0.0) - (rec.get('cm_endpreamount') || 0.0);
+                return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
+            },
+            depends: ['cm_endamount', 'cm_endpreamount']
+        }
+    ],
+});

frontend/saas-web/app/view/home/charts/KeyData.js

@@ -97,27 +97,6 @@ Ext.define('saas.view.home.charts.KeyData', {
                 itemclick: function(th, record, item, index, e, eOpts) {
                     saas.util.BaseUtil.openTab(record.get('viewType'), record.get('title'), record.get('id'));
                 },
-                // itemmouseenter: function(th, record, item, index, e, eOpts) {
-                //     var tip = th.tip;
-                //     if(!tip) {
-                //         var tip = Ext.create('Ext.tip.ToolTip', {
-                //             target: th.el,
-                //             minWidth: 100,
-                //             title: record.get('label'),
-                //             html: record.get('value'),
-                //             showOnTap: true,
-                //             trackMouse: true
-                //         });
-                //         th.tip = tip;
-                //         tip.showAt(e.getXY());
-                //     }
-                // },
-                // itemmouseleave: function(th, record, item, index, e, eOpts) {
-                //     var tip = th.tip;
-                //     if(tip) {
-                //         th.tip = Ext.destroy(th.tip);
-                //     }
-                // }
             }
         });
 

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

@@ -33,6 +33,8 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         columnWidth: 0.4
     }],
 
+    reportModel: 'saas.model.report.TotalPayDetail',
+
     reportColumns: [{
         text: '期间',
         dataIndex: 'vm_yearmonth',
@@ -111,7 +113,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         text: '期末',
         columns: [{
             text: '预付',
-            dataIndex: '',
+            dataIndex: 'vm_endpreamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
@@ -130,7 +132,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             }
         }, {
             text: '应付',
-            dataIndex: '',
+            dataIndex: 'vm_endamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
@@ -150,7 +152,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         }]
     }, {
         text: '应付余额',
-        dataIndex: 'vm_endamount',
+        dataIndex: 'vm_endamount-vm_endpreamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,

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

@@ -33,6 +33,8 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         columnWidth: 0.4
     }],
 
+    reportModel: 'saas.model.report.TotalRecDetail',
+
     reportColumns: [{
         text: '期间',
         dataIndex: 'cm_yearmonth',
@@ -111,7 +113,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         text: '期末',
         columns: [{
             text: '预收',
-            dataIndex: '',
+            dataIndex: 'cm_endpreamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
@@ -130,7 +132,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             }
         }, {
             text: '应收',
-            dataIndex: '',
+            dataIndex: 'cm_endamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
             width: 120,
@@ -150,7 +152,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         }]
     }, {
         text: '应收余额',
-        dataIndex: 'cm_endamount',
+        dataIndex: 'cm_endamount-cm_endpreamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,