应收/付账款明细分组加上币别

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

@@ -0,0 +1,21 @@
+Ext.define('saas.model.report.PayDetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+        { name: 'pd_date', type: 'string' },
+        { name: 'pd_code', type: 'string' },
+        { name: 'pd_kind', type: 'date' },
+        { name: 'pd_buyername', type: 'string' },
+        { name: 'pd_currency', type: 'string' },
+        { name: 'pd_addpay', type: 'float' },
+        { name: 'pd_addpre', type: 'float' },
+        { name: 'pd_remain', type: 'float' },
+        { name: 'pd_vendname', type: 'string' },
+        { name: 'groupfield', type: 'string',
+            convert: function(v, rec) {
+                return rec.get('pd_vendname') + rec.get('pd_currency');
+            },
+            depends: ['pd_vendname', 'pd_currency']
+        }
+    ],
+});

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

@@ -0,0 +1,21 @@
+Ext.define('saas.model.report.RecDetail', {
+    extend: 'saas.model.Base',
+
+    fields: [
+        { name: 'rd_date', type: 'string' },
+        { name: 'rd_code', type: 'string' },
+        { name: 'rd_kind', type: 'date' },
+        { name: 'rd_sellername', type: 'string' },
+        { name: 'rd_currency', type: 'string' },
+        { name: 'rd_addrec', type: 'float' },
+        { name: 'rd_addpre', type: 'float' },
+        { name: 'rd_remain', type: 'float' },
+        { name: 'rd_custname', type: 'string' },
+        { name: 'groupfield', type: 'string',
+            convert: function(v, rec) {
+                return rec.get('rd_custname') + rec.get('rd_currency');
+            },
+            depends: ['rd_custname', 'rd_currency']
+        }
+    ],
+});

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

@@ -6,8 +6,8 @@ Ext.define('saas.view.money.report.PayDetail', {
     viewModel: 'money-report-paydetail',
     viewName: 'money-report-paydetail',
 
-    groupField:'pd_vendname',
-    groupHeaderTpl: '供应商名称: {[values.rows[0].data.pd_vendname]}',
+    groupField: 'groupfield',
+    groupHeaderTpl: '{[values.rows[0].data.pd_vendname]} ({[values.rows[0].data.pd_currency]})',
     listUrl: '/api/money/report/payDetail',
     defaultCondition: null,
     reportTitle: '应付账款明细表',
@@ -27,6 +27,8 @@ Ext.define('saas.view.money.report.PayDetail', {
         columnWidth: 0.5
     }],
 
+    reportModel: 'saas.model.report.PayDetail',
+
     reportColumns: [{
         text: '单据日期',
         xtype: 'datecolumn',

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

@@ -7,8 +7,8 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     viewName: 'money-report-recdetail',
 
-    groupField: 'rd_custname',
-    groupHeaderTpl: '客户名称: {[values.rows[0].data.rd_custname]}',
+    groupField: 'groupfield',
+    groupHeaderTpl: '{[values.rows[0].data.rd_custname]} ({[values.rows[0].data.rd_currency]})',
     listUrl: '/api/money/report/recDetail',
     defaultCondition: null,
     reportTitle: '应收账款明细',
@@ -28,6 +28,8 @@ Ext.define('saas.view.money.report.RecDetail', {
         columnWidth: 0.5
     }],
 
+    reportModel: 'saas.model.report.RecDetail',
+
     reportColumns: [{
         text: '单据日期',
         xtype: 'datecolumn',