采购付款一览表、销售收款一览表合并分组字段

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

@@ -20,6 +20,12 @@ Ext.define('saas.model.report.PurchasePay', {
         { name: 'pb_payrate', type: 'float', }, // 付款比例
         { name: 'pb_manname', type: 'string' }, // 付款人
         { name: 'pb_remark', type: 'string' }, // 备注
-        { name: 'pi_currency', type:'string' } //币别
+        { name: 'pi_currency', type:'string' }, //币别
+        { name: 'groupfield', type: 'string', // 供应商+币别分组
+            convert: function(v, rec) {
+                return rec.get('pu_vendname') + rec.get('pi_currency');
+            },
+            depends: ['pu_vendname', 'pi_currency']
+        }
     ],
 });

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

@@ -21,6 +21,12 @@ Ext.define('saas.model.report.SaleRec', {
             depends: ['pi_total', 'pi_nettotal']
         },
         { name: 'rb_remark', type: 'string' },
-        { name: 'pi_currency', type: 'string' }
+        { name: 'pi_currency', type: 'string' },
+        { name: 'groupfield', type: 'string', // 客户+币别分组
+            convert: function(v, rec) {
+                return rec.get('rb_custname') + rec.get('pi_currency');
+            },
+            depends: ['rb_custname', 'pi_currency']
+        }
     ],
 });

frontend/saas-web/app/view/core/dbfind/types/CurrencyDbfindTrigger.js

@@ -43,7 +43,11 @@ Ext.define('saas.view.core.dbfind.types.CurrencyDbfindTrigger', {
     }, {
         text: "汇率",
         width: 150,
+        xtype: 'numbercolumn',
         dataIndex: "cr_rate",
+        renderer : function(v, m, r) {
+            return saas.util.BaseUtil.numberFormat(v, 6, false);
+        },
     },{
         dataIndex: '',
         flex: 1

frontend/saas-web/app/view/purchase/report/PurchasePay.js

@@ -6,8 +6,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     viewModel: 'purchase-report-purchasepay',
 
     viewName: 'purchase-report-purchasepay',
-    groupField: 'pu_vendname',
-    groupHeaderTpl: '供应商名称: {[values.rows[0].data.pu_vendname]}',
+    groupField: 'groupfield',
+    groupHeaderTpl: '{[values.rows[0].data.pu_vendname]} ({[values.rows[0].data.pi_currency]})',
     listUrl: '/api/purchase/report/purchasePay',
     defaultCondition: null,
     reportTitle: '采购付款一览表',
@@ -27,7 +27,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
 
     reportModel: 'saas.model.report.PurchasePay',
 
-    reportColumns: [ {
+    reportColumns: [{
         text: '付款单号',
         dataIndex: 'pb_code',
         width: 150

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -7,8 +7,8 @@ Ext.define('saas.view.sale.report.SaleRec', {
 
     viewName: 'sale-report-salerec',
 
-    groupField: 'rb_custname',
-    groupHeaderTpl: '客户名称: {[values.rows[0].data.rb_custname]}',
+    groupField: 'groupfield',
+    groupHeaderTpl: '{[values.rows[0].data.rb_custname]} ({[values.rows[0].data.pi_currency]})',
     listUrl: '/api/sale/report/saleRec',
     defaultCondition: null,
     reportTitle: '销售收款报表',