【界面标准化】【资金报表】

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -85,7 +85,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value"
                 }
             },{
-                text : "转出账户余额", 
+                text : "转出账户余额(元)", 
                 dataIndex : "bk_outthisamount", 
                 ignore:true
             }, {

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

@@ -44,7 +44,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
         dataIndex: 'kind',
         width: 100
     }, {
-        text: '收入',
+        text: '收入(元)',
         dataIndex: 'inamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',
@@ -57,7 +57,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
-        text: '支出',
+        text: '支出(元)',
         dataIndex: 'outamount',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',

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

@@ -80,7 +80,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
         dataIndex: 'bl_bankname',
         width: 150
     }, {
-        text: '收入',
+        text: '收入(元)',
         dataIndex: 'bl_income',
         exportFormat: 'Amount',
         width: 120,
@@ -92,7 +92,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
-        text: '支出',
+        text: '支出(元)',
         dataIndex: 'bl_spending',
         exportFormat: 'Amount',
         width: 120,

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

@@ -18,7 +18,7 @@ Ext.define('saas.view.money.report.PayDetail', {
     searchItems: [ {
         xtype: 'vendorDbfindTrigger',
         name: 'pd_vendname',
-        fieldLabel: '供应商名称',
+        emptyText:'请输入供应商名称',
         columnWidth: 0.25
     }, {
         xtype: 'conmonthfield',
@@ -45,7 +45,7 @@ Ext.define('saas.view.money.report.PayDetail', {
         dataIndex: 'pd_buyername',
         width: 80
     },{
-        text: '增加应付',
+        text: '增加应付(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'pd_addpay',
@@ -58,7 +58,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
-        text: '增加预付',
+        text: '增加预付(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
         dataIndex: 'pd_addpre',
@@ -107,7 +107,7 @@ Ext.define('saas.view.money.report.PayDetail', {
                 return lasts[key];
             });
 
-            return Ext.Array.sum(arr);
+            return saas.util.BaseUtil.numberFormat(Ext.Array.sum(arr), 2, true);
         }
     }, {
         dataIndex: '',

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

@@ -12,7 +12,6 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
 
     groupField: null,
     listUrl: '/api/money/report/vendormonthdetails',
-    // listUrl: 'http://192.168.253.139:8560/api/money/report/vendormonthdetails',
     defaultCondition: null,
     reportTitle: '应付总账',
     QueryWidth: 0.35,
@@ -46,7 +45,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     }, {
         text: '期初',
         columns: [{
-            text: '预付',
+            text: '预付(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'vm_beginpreamount',
@@ -55,7 +54,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '应付',
+            text: '应付(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'vm_beginamount',
@@ -67,7 +66,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     }, {
         text: '本期',
         columns: [{
-            text: '预付',
+            text: '预付(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'vm_nowpreamount',
@@ -76,7 +75,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '应付',
+            text: '应付(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'vm_nowamount',
@@ -85,7 +84,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '核销',
+            text: '核销(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'vm_nowpayamount',
@@ -97,7 +96,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     }, {
         text: '期末',
         columns: [{
-            text: '预付',
+            text: '预付(元)',
             dataIndex: 'vm_endpreamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
@@ -110,7 +109,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '应付',
+            text: '应付(元)',
             dataIndex: 'vm_endamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',

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

@@ -46,7 +46,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
     }, {
         text: '期初',
         columns: [{
-            text: '预收',
+            text: '预收(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'cm_beginpreamount',
@@ -55,7 +55,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '应收',
+            text: '应收(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'cm_beginamount',
@@ -67,7 +67,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
     }, {
         text: '本期',
         columns: [{
-            text: '预收',
+            text: '预收(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'cm_nowpreamount',
@@ -76,7 +76,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '应收',
+            text: '应收(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'cm_nowamount',
@@ -85,7 +85,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '核销',
+            text: '核销(元)',
             xtype: 'numbercolumn',
             exportFormat: 'Amount',
             dataIndex: 'cm_nowpayamount',
@@ -97,7 +97,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
     }, {
         text: '期末',
         columns: [{
-            text: '预收',
+            text: '预收(元)',
             dataIndex: 'cm_endpreamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
@@ -110,7 +110,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }, {
-            text: '应收',
+            text: '应收(元)',
             dataIndex: 'cm_endamount',
             exportFormat: 'Amount',
             xtype: 'numbercolumn',
@@ -124,7 +124,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             }
         }]
     }, {
-        text: '应收余额',
+        text: '应收余额(元)',
         dataIndex: 'cm_endamount-cm_endpreamount',
         exportFormat: 'Amount',
         xtype: 'numbercolumn',

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
     searchItems: [ {
         xtype: 'vendorDbfindTrigger',
         name: 'pi_vendname',
-        fieldLabel: '供应商名称',
+        emptyText:'请输入供应商名称',
         columnWidth: 0.2,
         listeners: {
             beforequery: function(f) {

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         xtype: 'vendorDbfindTrigger',
         name: 'pu_vendname',
         columnWidth: 0.25,
-        emptyText:'请输入供应商编号或名称'
+        emptyText:'请输入供应商名称'
     }, {
         xtype: 'condatefield',
         name: 'createTime',
@@ -36,7 +36,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         dataIndex: 'pu_vendname',
         width: 200
     }, {
-        text : "日期", 
+        text : "单据日期", 
         dataIndex : "createTime", 
         xtype:'datecolumn',
         width: 110
@@ -91,10 +91,9 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         }
     }, {
         text: '付款比例(%)',
-        //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
         xtype: 'numbercolumn',
-        width: 100,
+        width: 110,
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, false);
         }

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

@@ -64,6 +64,16 @@ Ext.define('saas.view.sale.report.Sale', {
         xtype: 'datecolumn',
         dataIndex: 'sa_date',
         width: 110
+    }, {
+        text: '序号',
+        xtype: 'numbercolumn',
+        dataIndex: 'sd_detno',
+        align: 'center',
+        exportFormat: 'Integer',
+        width: 65,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 0, true);
+        }
     }, {
         text: '物料编号',
         width: 150,

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

@@ -23,7 +23,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     }, {
         xtype: 'customerDbfindTrigger',
         name: 'sa_custname',
-        emptyText:'请输入客户编号或名称',
+        emptyText:'请输入客户名称',
         columnWidth: 0.2
     }, {
         xtype: 'condatefield',

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     }, {		
         xtype: 'productDbfindTrigger',
         name: 'pr_code',
-        emptyText:'输入物料编号或名称',
+        emptyText:'输入物料编号、名称或型号',
         columnWidth: 0.2,
         margin:'0 0 0 20',
     }, {
@@ -87,7 +87,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             summaryType: 'sum',
             summaryLabel: '期初成本',
             summaryRenderer: function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, false);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -113,7 +113,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             summaryType: 'sum',
             summaryLabel: '入库成本',
             summaryRenderer: function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, false);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -139,7 +139,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             summaryType: 'sum',
             summaryLabel: '出库成本',
             summaryRenderer: function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, false);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }, {
@@ -165,7 +165,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             summaryType: 'sum',
             summaryLabel: '结存成本',
             summaryRenderer: function(v) {
-                return saas.util.BaseUtil.numberFormat(v, 3, false);
+                return saas.util.BaseUtil.numberFormat(v, 2, true);
             }
         }]
     }]

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -17,7 +17,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     searchItems: [ {		
         xtype: 'textfield',
         name: 'pd_prodcode',
-        emptyText:'输入单号、关联订单号或物料编号',
+        emptyText:'请输入单号、关联单号或物料编号',
         columnWidth: 0.2,
         getCondition:function(v){
             return "(upper(pd_prodcode) like '%" + v.toUpperCase() + "%' or upper(pi_inoutno) like '%" + v.toUpperCase() + "%' or upper(pd_ordercode) like '%" + v.toUpperCase() + "%')";
@@ -61,7 +61,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         dataIndex: 'pi_class',
         width: 100
     }, {
-        text: '日期',
+        text: '单据日期',
         dataIndex: 'pi_date',
         xtype: 'datecolumn',
         width: 110,