【多币别】【供应商、客户放大镜新增币别、汇率；采购明细表、销售明细表 等报表新增币别字段】【前端处理】

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

@@ -21,6 +21,9 @@ Ext.define('saas.model.report.Purchase', {
         },
         { name: 'pd_total', type: 'float' }, // 价税合计
         { name: 'pd_pdacceptqty', type: 'float' }, // 收货数量
-        { name: 'pd_remark', type: 'string' }, // 备注
+        { name: 'pu_currency', type:'string'},//币别
+        { name: 'pu_rate', type:'float'},//汇率
+        { name: 'pd_remark', type: 'string' } // 备注
+        
     ],
 });

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

@@ -29,6 +29,9 @@ Ext.define('saas.model.report.Sale', {
         },
         { name: 'sd_total', type: 'float' },
         { name: 'sd_pdsendqty', type: 'float' },
-        { name: 'sd_remark', type: 'string' },
+        { name: 'sa_currency', type: 'string' },//币别
+        { name: 'sa_rate', type: 'float' },//税率
+        { name: 'sd_remark', type: 'string' },//备注
+
     ],
 });

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

@@ -30,6 +30,8 @@ Ext.define('saas.model.report.SaleProfit', {
         { name: 'pd_total', type: 'float' },
         { name: 'pd_profit', type: 'float' },
         { name: 'pd_profitpresent', type: 'float' },
-        { name: 'pd_remark', type: 'string' }
+        { name: 'pd_remark', type: 'string' },
+        { name: 'pi_currency', type: 'string' },
+        { name: 'pi_rate', type: 'float' }
     ],
 });

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

@@ -4,6 +4,7 @@ Ext.define('saas.model.report.TotalPayDetail', {
     fields: [
         { name: 'vm_yearmonth', type: 'string' }, // 期间
         { name: 'vm_vendname', type: 'string' }, // 供应商名称
+        { name: 'vm_currency', type:'string' }, //币别
         { name: 'vm_beginpreamount', type: 'float' }, // 期初预付
         { name: 'vm_beginamount', type: 'float' }, // 期初应付
         { name: 'vm_nowpreamount', type: 'float' }, // 本期预付

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

@@ -4,6 +4,7 @@ Ext.define('saas.model.report.TotalRecDetail', {
     fields: [
         { name: 'cm_yearmonth', type: 'string' }, // 期间
         { name: 'cm_custname', type: 'string' }, // 客户名称
+        { name: 'cm_currency', type:'string' }, //币别
         { name: 'cm_beginpreamount', type: 'float' }, // 期初预收
         { name: 'cm_beginamount', type: 'float' }, // 期初应收
         { name: 'cm_nowpreamount', type: 'float' }, // 本期预收

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

@@ -1,5 +1,5 @@
 /**
- * BOM资料放大镜
+ * 币别放大镜
  */
 Ext.define('saas.view.core.dbfind.types.CurrencyDbfindTrigger', {
     extend: 'saas.view.core.dbfind.DbfindTrigger',
@@ -12,10 +12,10 @@ Ext.define('saas.view.core.dbfind.types.CurrencyDbfindTrigger', {
     //联想设置
     dbtpls: [{
         field: 'cr_name',
-        width: 150
+        width: 65
     }, {
         field: 'cr_rate',
-        width: 200
+        width: 110
     }],
     
     //defaultCondition: "bo_statuscode='ENABLE'",
@@ -39,7 +39,8 @@ Ext.define('saas.view.core.dbfind.types.CurrencyDbfindTrigger', {
     }, {
         text: "币别",
         dataIndex: "cr_name",
-        width: 150,
+        align:'center',
+        width: 65,
     }, {
         text: "汇率",
         width: 150,

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

@@ -57,6 +57,16 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
     }, {
+        text: "币别",
+        dataIndex: "cu_currency",
+        width:65,
+        align:'center'
+    }, {
+        text: "汇率",
+        xtype:'numbercolumn',
+        dataIndex: "cr_rate",
+        width:80
+    },, {
         text: "业务员编号",
         dataIndex: "cu_sellercode",
         width:150,

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

@@ -58,6 +58,16 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         }
+    }, {
+        text: "币别",
+        dataIndex: "ve_currency",
+        width:65,
+        align:'center'
+    }, {
+        text: "汇率",
+        xtype:'numbercolumn',
+        dataIndex: "cr_rate",
+        width:80
     }, {
         text: "采购员编号",
         dataIndex: "ve_buyercode",

frontend/saas-web/app/view/document/bankinformation/DataList.js

@@ -37,7 +37,8 @@ Ext.define('saas.view.document.bankinformation.DataList', {
             },{
                 text: '币别',
                 dataIndex: 'bk_currency',
-                width: 100
+                align:'center',
+                width: 65
             },{
                 text: '期初金额(元)',
                 dataIndex: 'bk_beginamount',

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

@@ -95,6 +95,16 @@ Ext.define('saas.view.money.report.AccountDetails', {
         renderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    }, {
+        text: '币别',
+        dataIndex: 'currency',
+        align:'center',
+        width: 65
+    }, {
+        text: '汇率',
+        dataIndex: 'rate',
+        xtype: 'numbercolumn',
+        width: 80
     }, {
         dataIndex: '',
         flex: 1

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

@@ -47,7 +47,8 @@ Ext.define('saas.view.money.report.PayDetail', {
     }, {
         text: '币别',
         dataIndex: 'pd_currency',
-        width: 80
+        align:'center',
+        width: 65
     },{
         text: '增加应付(元)',
         xtype: 'numbercolumn',

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.money.report.ProfitDetail', {
         dataIndex: 'netamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 0,
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
@@ -63,12 +63,12 @@ Ext.define('saas.view.money.report.ProfitDetail', {
         dataIndex: 'saamount-netamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
-        width: 120,
+        width: 0,
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
     }, {
-        text: '价税合计(元)',
+        text: '销售金额(元)',
         dataIndex: 'saamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
@@ -77,7 +77,7 @@ Ext.define('saas.view.money.report.ProfitDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',
-        summaryLabel: '价税合计',
+        summaryLabel: '销售金额',
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
@@ -87,10 +87,14 @@ Ext.define('saas.view.money.report.ProfitDetail', {
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
         width: 120,
-        summaryLabel: '成本金额',
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
+        summaryType: 'sum',
+        summaryLabel: '成本金额',
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        }
     }, {
         text: '毛利润(元)',
         dataIndex: 'profit',

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

@@ -48,7 +48,8 @@ Ext.define('saas.view.money.report.RecDetail', {
     }, {
         text: '币别',
         dataIndex: 'rd_currency',
-        width: 80
+        align:'center',
+        width: 65
     }, {
         text: '增加应收(元)',
         dataIndex: 'rd_addrec',

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

@@ -39,6 +39,11 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
         text: '供应商名称',
         dataIndex: 'vm_vendname',
         width: 200,
+    }, {
+        text: '币别',
+        dataIndex: 'vm_currency',
+        align:'center',
+        width: 65,
     }, {
         text: '期初',
         columns: [{

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

@@ -39,6 +39,11 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
         text: '客户名称',
         dataIndex: 'cm_custname',
         width: 200,
+    }, {
+        text: '币别',
+        dataIndex: 'cm_currency',
+        align:'center',
+        width: 65,
     }, {
         text: '期初',
         columns: [{

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

@@ -104,10 +104,6 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'numbercolumn',
         renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, true);
-        },
-        summaryType: 'sum',
-        summaryRenderer: function(v, d, f, m) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
         }
     }, {
         text: '采购数量',
@@ -115,12 +111,8 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'numbercolumn',
         exportFormat: 'Quantity',
         width: 110,
-        summaryType: 'sum',
         renderer: function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
-        },
-        summaryRenderer: function(v, d, f, m) {
-            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -197,6 +189,16 @@ Ext.define('saas.view.purchase.report.Purchase', {
         summaryRenderer: function(v, d, f, m) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    }, {
+        text: '币别',
+        dataIndex: 'pu_currency',
+        align:'center',
+        width: 65
+    }, {
+        text: '汇率',
+        xtype: 'numbercolumn',
+        dataIndex: 'pu_rate',
+        width: 80
     }, {
         text: '备注',
         dataIndex: 'pd_remark',

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

@@ -92,7 +92,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {
         text: '币别',
         dataIndex: 'pi_currency',
-        width: 80
+        align:'center',
+        width: 65
     }, {
         text: '付款比例(%)',
         dataIndex: 'pb_payrate',

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

@@ -104,11 +104,6 @@ Ext.define('saas.view.sale.report.Sale', {
         width: 110,
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
-        },
-        summaryType: 'sum',
-        summaryLabel: '出货数量',
-        summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '销售数量',
@@ -118,11 +113,6 @@ Ext.define('saas.view.sale.report.Sale', {
         width: 110,
         renderer : function(v, m, r) {
             return saas.util.BaseUtil.numberFormat(v, 3, false);
-        },
-        summaryType: 'sum',
-        summaryLabel: '销售数量',
-        summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -197,6 +187,16 @@ Ext.define('saas.view.sale.report.Sale', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    }, {
+        text: '币别',
+        dataIndex: 'sa_currency',
+        align:'center',
+        width: 65
+    }, {
+        text: '汇率',
+        xtype: 'numbercolumn',
+        dataIndex: 'sa_rate',
+        width: 80
     },  {
         text : "备注", 
         dataIndex : "sd_remark",

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

@@ -91,6 +91,15 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         text: '单位',
         dataIndex: 'pr_unit',
         width: 65
+    }, {
+        text: '币别',
+        dataIndex: 'pi_currency',
+        align:'center',
+        width: 65
+    }, {
+        text: '汇率',
+        dataIndex: 'pi_rate',
+        width: 80
     }, {
         text: '单价(元)',
         dataIndex: 'pd_netprice',

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

@@ -95,7 +95,8 @@ Ext.define('saas.view.sale.report.SaleRec', {
     }, {
         text: '币别',
         dataIndex: 'pi_currency',
-        width: 80
+        align:'center',
+        width: 65
     }, {
         text: '回款比例(%)',
         dataIndex: 'rb_backrate',

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -133,10 +133,9 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     }
                 },{
                     text: '币别',
-                    align: 'center',
                     dataIndex: "sa_currency",
-                    defaultValue: 'RMB',
-                    width:80
+                    align:'center',
+                    width: 65
                 } ,{
                     text: '审核状态',
                     align: 'center',
@@ -177,10 +176,9 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     width: 200
                 }, {
                     text: '币别',
-                    align: 'center',
                     dataIndex: "sa_currency",
-                    defaultValue: 'RMB',
-                    width:80
+                    align:'center',
+                    width: 65
                 },{
                     text: '审核状态',
                     align: 'center',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -136,10 +136,9 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     }
                 }, {
                     text: '币别',
-                    align: 'center',
                     dataIndex: "pi_currency",
-                    defaultValue: 'RMB',
-                    width: 80
+                    align:'center',
+                    width: 65
                 }, {
                     text: '审核状态',
                     align: 'center',
@@ -179,10 +178,9 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     width: 200
                 }, {
                     text: '币别',
-                    align: 'center',
                     dataIndex: "pi_currency",
-                    defaultValue: 'RMB',
-                    width: 80
+                    align:'center',
+                    width: 65
                 }, {
                     text: '审核状态',
                     align: 'center',

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -134,18 +134,6 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
-            }, {
-                xtype: "currencyDbfindTrigger",
-                name: "pi_currency",
-                fieldLabel: "币别",
-                defaultValue: 'RMB'
-            }, {
-                xtype: "numberfield",
-                name: "pi_rate",
-                fieldLabel: "汇率",
-                defaultValue: 1,
-                decimalPrecision: 6,
-                vtype: 'positiveNumber'
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -136,10 +136,9 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     }
                 }, {
                     text: '币别',
-                    align: 'center',
                     dataIndex: "pi_currency",
-                    defaultValue: 'RMB',
-                    width: 80,
+                    align:'center',
+                    width: 65
                 }, {
                     text: '审核状态',
                     align: 'center',
@@ -179,10 +178,9 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     width: 200
                 }, {
                     text: '币别',
-                    align: 'center',
                     dataIndex: "pi_currency",
-                    defaultValue: 'RMB',
-                    width: 80
+                    align:'center',
+                    width: 65
                 }, {
                     text: '审核状态',
                     align: 'center',