【bug】供应商对账单/客户对账单导出后在标题显示供应商/客户名

frontend/saas-web/app/view/core/form/FormPanel.js

@@ -31,7 +31,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     remoteConfig: true, // 是否需要从远端读取form配置
     toolBtns: [], // 自定义按钮
     codeInHeader: true, // 单据编号显示在toolbar
-    invalidText: '表单校验有误，请检查', // 校验未通过提示内容
+    invalidText: '表单校验有误，请检查后重试', // 校验未通过提示内容
     dirtyAuditText: '表单数据有修改，是否先保存修改？', // 有修改时点击审核提示内容
     noDirtySaveText: '表单数据无修改', // 无修改点击保存提示内容
 

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

@@ -22,7 +22,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         listeners: {
             beforequery: function(f) {
                 return !!f.value;
-            }
+            },
+            change: 'pi_custname_change'
         }
     }, {
         xtype: 'condatefield',

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

@@ -15,5 +15,12 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
                 }
             }
         });
+    },
+
+    pi_custname_change: function(field, value) {
+        var me = this,
+        reportPanel = me.getView();
+
+        reportPanel.reportTitle = '客户对账单(' + value + ')'
     }
 });

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

@@ -22,7 +22,8 @@ Ext.define('saas.view.money.report.VendorCheck', {
         listeners: {
             beforequery: function(f) {
                 return !!f.value;
-            }
+            },
+            change: 'pi_vendname_change'
         }
     }, {
     //     xtype: 'monthdatefield',

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

@@ -15,5 +15,12 @@ Ext.define('saas.view.money.report.VendorCheckController', {
                 }
             }
         });
+    },
+
+    pi_vendname_change: function(field, value) {
+        var me = this,
+        reportPanel = me.getView();
+
+        reportPanel.reportTitle = '供应商对账单(' + value + ')'
     }
 });

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

@@ -135,6 +135,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '税率(%)',
         dataIndex: 'pd_taxrate',
+        exportFormat: 'Integer',
         xtype: 'numbercolumn',
         width: 80
     }, {

frontend/saas-web/overrides/exporter/Stylesheet.js

@@ -10,50 +10,56 @@ Ext.define('saas.override.exporter.Stylesheet', {
         'Currency': '"$"#,##0.00',
         'Euro Currency': '"€"#,##0.00',
         /**  new  */
-        'Number0': function(v) {
-            return Ext.util.Format.number(v, '0');
-        },
-        'Number1': function(v) {
-            return Ext.util.Format.number(v, '0.0');
-        },
-        'Number2': function(v) {
-            return Ext.util.Format.number(v, '0.00');
-        },
-        'Number3': function(v) {
-            return Ext.util.Format.number(v, '0.000');
-        },
-        'Number4': function(v) {
-            return Ext.util.Format.number(v, '0.0000');
-        },
-        'Integer': function(v) {
-            return Ext.util.Format.number(v, '0');
-        },
+        // 'Number0': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+        //     return Number(t);
+        // },
+        'Number0': '#,##0',
+        // 'Number1': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 1, false);
+        //     return Number(t);
+        // },
+        'Number1': '#,##0.0',
+        // 'Number2': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+        //     return Number(t);
+        // },
+        'Number2': '#,##0.00',
+        // 'Number3': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+        //     return Number(t);
+        // },
+        'Number3': '#,##0.000',
+        // 'Number4': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+        //     return Number(t);
+        // },
+        'Number4': '#,##0.0000',
+        // 'Integer': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+        //     return Number(t);
+        // },
+        'Integer': '#,##0',
         // 'Total':function(v) {
-        //     var arr = (v + '.').split('.');
-        //     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-        //     var format = '0,000.' + xr.join('');
-        //     return Ext.util.Format.number(v, format);
+        //     var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+        //     return Number(t);
         // },
         'Total': '#,##0.00',
-        'Amount': function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        },
-        'Quantity': function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        },
-        'Price': function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 4 ? 4 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
-        },
-        // 'Price': '#,##0.00',
+        // 'Amount': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+        //     return Number(t);
+        // },
+        'Amount': '#,##0.00',
+        // 'Quantity': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+        //     return Number(t);
+        // },
+        'Quantity': '#,##0.000',
+        // 'Price': function(v) {
+        //     var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+        //     return Number(t);
+        // },
+        'Price': '#,##0.00',
     },
 
 });

frontend/saas-web/overrides/exporter/file/Style.js

@@ -12,37 +12,35 @@ Ext.define('saas.override.exporter.file.Style', {
         }
 
         if(f === 'Number0') {
-            return Ext.util.Format.number(v, '0');
+            var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+            return Number(t);
         }else if(f === 'Number1') {
-            return Ext.util.Format.number(v, '0.0');
+            var t = saas.util.BaseUtil.numberFormat(v, 1, false);
+            return Number(t);
         }else if(f === 'Number2') {
-            return Ext.util.Format.number(v, '0.00');
+            var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+            return Number(t);
         }else if(f === 'Number3') {
-            return Ext.util.Format.number(v, '0.000');
+            var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+            return Number(t);
         }else if(f === 'Number4') {
-            return Ext.util.Format.number(v, '0.0000');
+            var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+            return Number(t);
         }else if(f === 'Integer') { // new
-            return Ext.util.Format.number(v, '0');
+            var t = saas.util.BaseUtil.numberFormat(v, 0, false);
+            return Number(t);
         }else if(f === 'Total') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+            return Number(t);
         }else if(f === 'Amount') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 2, false);
+            return Number(t);
         }else if(f === 'Quantity') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 3, false);
+            return Number(t);
         }else if(f === 'Price') {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join('');
-            return Ext.util.Format.number(v, format);
+            var t = saas.util.BaseUtil.numberFormat(v, 4, false);
+            return Number(t);
         }else if(f === 'Currency'){
             return fmt.currency(v);
         }else if(f === 'Euro Currency') {