Browse Source

【多币别】【采购付款一览表、销售收款一览表、应收应付账款明细表新增币别字段】

rainco 7 years ago
parent
commit
9a18f89845

+ 1 - 0
frontend/saas-web/app/model/report/PurchasePay.js

@@ -20,5 +20,6 @@ Ext.define('saas.model.report.PurchasePay', {
         { name: 'pb_payrate', type: 'float', }, // 付款比例
         { name: 'pb_payrate', type: 'float', }, // 付款比例
         { name: 'pb_manname', type: 'string' }, // 付款人
         { name: 'pb_manname', type: 'string' }, // 付款人
         { name: 'pb_remark', type: 'string' }, // 备注
         { name: 'pb_remark', type: 'string' }, // 备注
+        { name: 'pi_currency', type:'string' } //币别
     ],
     ],
 });
 });

+ 3 - 1
frontend/saas-web/app/model/report/SaleRec.js

@@ -19,6 +19,8 @@ Ext.define('saas.model.report.SaleRec', {
                 return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
                 return Number(saas.util.BaseUtil.numberFormat(t, 2, false));
             },
             },
             depends: ['pi_total', 'pi_nettotal']
             depends: ['pi_total', 'pi_nettotal']
-        },{ name: 'rb_remark', type: 'string' }
+        },
+        { name: 'rb_remark', type: 'string' },
+        { name: 'pi_currency', type: 'string' }
     ],
     ],
 });
 });

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

@@ -44,6 +44,10 @@ Ext.define('saas.view.money.report.PayDetail', {
         text: '采购员',
         text: '采购员',
         dataIndex: 'pd_buyername',
         dataIndex: 'pd_buyername',
         width: 80
         width: 80
+    }, {
+        text: '币别',
+        dataIndex: 'pd_currency',
+        width: 80
     },{
     },{
         text: '增加应付(元)',
         text: '增加应付(元)',
         xtype: 'numbercolumn',
         xtype: 'numbercolumn',

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

@@ -45,6 +45,10 @@ Ext.define('saas.view.money.report.RecDetail', {
         text: '业务员',
         text: '业务员',
         dataIndex: 'rd_sellername',
         dataIndex: 'rd_sellername',
         width: 80
         width: 80
+    }, {
+        text: '币别',
+        dataIndex: 'rd_currency',
+        width: 80
     }, {
     }, {
         text: '增加应收(元)',
         text: '增加应收(元)',
         dataIndex: 'rd_addrec',
         dataIndex: 'rd_addrec',

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

@@ -89,6 +89,10 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         summaryRenderer: function(v) {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
         }
+    }, {
+        text: '币别',
+        dataIndex: 'pi_currency',
+        width: 80
     }, {
     }, {
         text: '付款比例(%)',
         text: '付款比例(%)',
         dataIndex: 'pb_payrate',
         dataIndex: 'pb_payrate',

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

@@ -92,6 +92,10 @@ Ext.define('saas.view.sale.report.SaleRec', {
         renderer : function(v, m, r) {
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
         }
+    }, {
+        text: '币别',
+        dataIndex: 'pi_currency',
+        width: 80
     }, {
     }, {
         text: '回款比例(%)',
         text: '回款比例(%)',
         dataIndex: 'rb_backrate',
         dataIndex: 'rb_backrate',