数字右对齐

frontend/saas-web/app/view/home/charts/KeyData.js

@@ -19,7 +19,7 @@ Ext.define('saas.view.home.charts.KeyData', {
                     '<div class="x-title">{label}</div>',
                     '<div class="x-contain">',
                         '<div class="x-icon x-icon-{icon}"></div>',
-                        '<div class="x-value">￥{value}元</div>',
+                        '<div class="x-value">{value}元</div>',
                     '</div>',
                 '</div>',
             '</div>',
@@ -77,8 +77,6 @@ Ext.define('saas.view.home.charts.KeyData', {
             data: me.cards,
             updateValue: function(datas) {
                 this.each(function(r, index) {
-                    // var v = datas[r.get('name')];
-                    // var d = saas.util.BaseUtil.formatAmount(v);
                     var d = Ext.util.Format.number(datas[r.get('name')], '0,000.00');
                     r.set('value', d);
                 });

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -180,6 +180,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             width: 110
         } ,{
             text: '明细金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'ord_nowbalance',
             width: 110
         } ,{

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -116,6 +116,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 150
         },{
             text: '付款金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'os_amount',
             width: 110,
             renderer : function(v) {
@@ -158,6 +159,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 150
         },{
             text: '付款金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'os_amount',
             width: 110,
             renderer : function(v) {
@@ -177,6 +179,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
             width: 110
         }, {
             text: '明细金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'osd_nowbalance',
             width: 110
         },{

frontend/saas-web/app/view/purchase/purchaseIn/QueryPanel.js

@@ -123,10 +123,12 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
             width: 150
         },{
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         },{
             text: '价税合计(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             width: 110
         },{

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -10,9 +10,9 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'pi_inoutno',
-        emptyText:'请输入单号或供应商',
-        getCondition: function(value) {
-            return  ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%'+value+'%\' or pi_vendname like \'%'+value+'%\') ';
+        emptyText: '请输入单号或供应商',
+        getCondition: function (value) {
+            return ' (pi_inoutno like\'%' + value + '%\' or pi_vendcode like \'%' + value + '%\' or pi_vendname like \'%' + value + '%\') ';
         }
     }, {
         xtype: 'condatefield',
@@ -24,12 +24,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'productDbfindTrigger',
         name: 'pr_detail',
         fieldLabel: '物料',
-        emptyText:'输入物料编号或名称',
+        emptyText: '输入物料编号或名称',
         showDetail: true,
-        getCondition: function(value) {
-            if(!value) {
+        getCondition: function (value) {
+            if (!value) {
                 return '1=1';
-            }else {
+            } else {
                 return ' pr_detail = \'' + value + '\' ';
             }
         }
@@ -38,8 +38,8 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         name: 'pi_statuscode',
         fieldLabel: '单据状态',
         allowBlank: true,
-        emptyText :'全部',
-        editable:false,
+        emptyText: '全部',
+        editable: false,
         queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
@@ -51,10 +51,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                 ["UNAUDITED", "未审核"]
             ]
         }),
-        getCondition: function(value) {
-            if(value == 'ALL') {
+        getCondition: function (value) {
+            if (value == 'ALL') {
                 return '1=1';
-            }else {
+            } else {
                 return 'pi_statuscode=\'' + value + '\'';
             }
         }
@@ -62,7 +62,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'multicombo',
         name: 'pi_prstatuscode',
         fieldLabel: '付款状态',
-        emptyText :'全部',
+        emptyText: '全部',
         datas: [
             ["PAYNONE", "未付款"],
             ["PAYPART", "部分付款"],
@@ -72,12 +72,12 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'warehouseDbfindTrigger',
         name: 'pd_whname',
         fieldLabel: '仓库',
-        emptyText:'请输入仓库编号或名称',
+        emptyText: '请输入仓库编号或名称',
         showDetail: true,
-        getCondition: function(value) {
-            if(!value) {
+        getCondition: function (value) {
+            if (!value) {
                 return '1=1';
-            }else {
+            } else {
                 return 'prodiodetail.pd_whname like\'%' + value + '%\'';
             }
         }
@@ -90,11 +90,11 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
-        emptyText:'请输入账户名称或姓名',
-        getCondition: function(value) {
-            if(!value) {
+        emptyText: '请输入账户名称或姓名',
+        getCondition: function (value) {
+            if (!value) {
                 return '1=1';
-            }else {
+            } else {
                 return 'prodinout.creatorName like\'%' + value + '%\'';
             }
         }
@@ -102,52 +102,54 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
-        emptyText:'请输入账户名称或姓名'
+        emptyText: '请输入账户名称或姓名'
     }],
     queryGridConfig: {
-        idField:'id',
-        codeField:'pi_inoutno',
-        addTitle:'采购验退单',
-        addXtype:'purchase-purchaseout-formpanel',
-        defaultCondition:' pi_class = \'采购验退单\'',
-        baseVastUrl:'/api/purchase/prodinout/',
-        caller:'PurchaseOut',
+        idField: 'id',
+        codeField: 'pi_inoutno',
+        addTitle: '采购验退单',
+        addXtype: 'purchase-purchaseout-formpanel',
+        defaultCondition: ' pi_class = \'采购验退单\'',
+        baseVastUrl: '/api/purchase/prodinout/',
+        caller: 'PurchaseOut',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            hidden:true,
+            hidden: true,
             xtype: 'numbercolumn'
         }, {
             text: '验退单号',
             dataIndex: 'pi_inoutno',
             width: 150
-        },{
+        }, {
             text: '单据类型',
             dataIndex: 'pi_class',
             width: 0
-        },{
+        }, {
             text: '单据日期',
             dataIndex: 'pi_date',
-            xtype:'datecolumn',
+            xtype: 'datecolumn',
             width: 110
-        },{
+        }, {
             text: '供应商名称',
             dataIndex: 'pi_vendname',
             width: 150
         }, {
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         }, {
             text: '价税合计(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_total',
             width: 110
-        },{
+        }, {
             text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',
             width: 80
-        },{
+        }, {
             text: '付款状态',
             align: 'center',
             dataIndex: 'pi_prstatus',
@@ -161,133 +163,132 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             dataIndex: 'pi_remark',
             width: 250
         }],
-        relativeColumn: [
-            {
-                text: 'id',
-                dataIndex: 'pu_id',
-                xtype: 'numbercolumn',
-                hidden:true
-            }, {
-                text: '验退单号',
-                dataIndex: 'pi_inoutno',
-                width: 150
-            }, {
-                text: '单据日期',
-                dataIndex: 'pi_date',
-                xtype:'datecolumn',
-                width: 110
-            },{
-                text: '供应商名称',
-                dataIndex: 'pi_vendname',
-                width: 200
-            },{
-                text: '审核状态',
-                align: 'center',
-                dataIndex: 'pi_status',
-                width: 80
-            }, {
-                text: '物料编号',
-                dataIndex: 'pd_prodcode',
-                width: 150
-            }, {
-                text: '品牌',
-                dataIndex: 'pr_brand',
-                width: 100
-            },{
-                text: '物料名称',
-                dataIndex: 'pr_detail',
-                width: 150
-            },{
-                text: '型号',
-                dataIndex: 'pr_orispeccode',
-                width: 200
-            },{
-                text: '规格',
-                dataIndex: 'pr_spec',
-                width: 200
-            },{
-                text: '仓库',
-                dataIndex: 'pd_whname',
-                width: 80
-            },{
-                text: '验退数量',
-                dataIndex: 'pd_outqty',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : 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);
-                },
-            }, {
-                text: '单位',
-                dataIndex: 'pr_unit',
-                width: 65
-            }, {
-                text: '单价(元)',
-                dataIndex: 'pd_netprice',
-                xtype:'numbercolumn',
-                renderer : 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);
-                },            
-                width: 110
-            }, {
-                text: '含税单价(元)',
-                dataIndex: 'pd_netprice',
-                xtype:'numbercolumn',
-                renderer : 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);
-                },            
-                width: 110
-            }, {
-                text: '金额(元)',
-                dataIndex: 'pd_nettotal',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : 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);
-                },
-            }, {
-                text: '税额(元)',
-                dataIndex: 'pd_taxamount',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : function(v,g,r) {
-                    v = (r.data["pd_ordertotal"]||0.0) - (r.data["pd_nettotal"]||0.0);
-                    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);
-                }
-            }, {
-                text: '价税合计(元)',
-                dataIndex: 'pd_ordertotal',
-                xtype:'numbercolumn',
-                width: 110,
-                renderer : 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);
-                },
-            }, {
-                text: '关联验收单号',
-                dataIndex: 'pi_iocode',
-                width: 150
-            }, {
-                text: '备注',
-                dataIndex: 'iodetno',
-                width: 250
-            }]
+        relativeColumn: [{
+            text: 'id',
+            dataIndex: 'pu_id',
+            xtype: 'numbercolumn',
+            hidden: true
+        }, {
+            text: '验退单号',
+            dataIndex: 'pi_inoutno',
+            width: 150
+        }, {
+            text: '单据日期',
+            dataIndex: 'pi_date',
+            xtype: 'datecolumn',
+            width: 110
+        }, {
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
+            width: 200
+        }, {
+            text: '审核状态',
+            align: 'center',
+            dataIndex: 'pi_status',
+            width: 80
+        }, {
+            text: '物料编号',
+            dataIndex: 'pd_prodcode',
+            width: 150
+        }, {
+            text: '品牌',
+            dataIndex: 'pr_brand',
+            width: 100
+        }, {
+            text: '物料名称',
+            dataIndex: 'pr_detail',
+            width: 150
+        }, {
+            text: '型号',
+            dataIndex: 'pr_orispeccode',
+            width: 200
+        }, {
+            text: '规格',
+            dataIndex: 'pr_spec',
+            width: 200
+        }, {
+            text: '仓库',
+            dataIndex: 'pd_whname',
+            width: 80
+        }, {
+            text: '验退数量',
+            dataIndex: 'pd_outqty',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: 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);
+            },
+        }, {
+            text: '单位',
+            dataIndex: 'pr_unit',
+            width: 65
+        }, {
+            text: '单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn',
+            renderer: 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);
+            },
+            width: 110
+        }, {
+            text: '含税单价(元)',
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn',
+            renderer: 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);
+            },
+            width: 110
+        }, {
+            text: '金额(元)',
+            dataIndex: 'pd_nettotal',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: 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);
+            },
+        }, {
+            text: '税额(元)',
+            dataIndex: 'pd_taxamount',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: function (v, g, r) {
+                v = (r.data["pd_ordertotal"] || 0.0) - (r.data["pd_nettotal"] || 0.0);
+                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);
+            }
+        }, {
+            text: '价税合计(元)',
+            dataIndex: 'pd_ordertotal',
+            xtype: 'numbercolumn',
+            width: 110,
+            renderer: 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);
+            },
+        }, {
+            text: '关联验收单号',
+            dataIndex: 'pi_iocode',
+            width: 150
+        }, {
+            text: '备注',
+            dataIndex: 'iodetno',
+            width: 250
+        }]
     }
 });

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -112,6 +112,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             width: 200
         }, {
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         }, {

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -112,6 +112,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             width: 200
         }, {
             text: '金额(元)',
+            xtype: 'numbercolumn',
             dataIndex: 'pi_nettotal',
             width: 110
         }, {