报表数字右对齐，BOM资料单号

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -247,6 +247,16 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 Ext.applyIf(c, {
                     format: 'Y-m-d'
                 })
+            }else if(c.xtype == 'numbercolumn') {
+                Ext.applyIf(c, {
+                    align: 'end',
+                    renderer : function(v) {
+                        var arr = (v + '.').split('.');
+                        var xr = (new Array(arr[1].length)).fill('0');
+                        var format = '0.' + xr.join();
+                        return Ext.util.Format.number(v, format);
+                    }
+                });
             }
         })
 

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -10,7 +10,7 @@ Ext.define('saas.view.document.bom.FormPanel', {
     //字段属性
     _title:'BOM资料',
     _idField: 'id',
-    _codeField: 'bo_mothercode',
+    _codeField: 'codefied',
     _statusField: 'bo_status',
     _statusCodeField: 'bo_statuscode',
     _readUrl:'/api/document/bom/read/',

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -65,13 +65,11 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }, {
                             "text": "税率",
                             "dataIndex": "ve_taxrate",
-                            "width": 100,
-                            align:'right'
+                            "width": 100
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100,
-                            align:'right'
+                            "width": 100
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.AccountBalance', {
 
     groupField: null,
     listUrl: '/api/money/report/accountBalance',
-    // listUrl: 'http://192.168.253.35:8880/report/accountBalance',
     defaultCondition: null,
     reportTitle: '资金账户收支明细',
     QueryWidth:0.1,
@@ -44,13 +43,16 @@ Ext.define('saas.view.money.report.AccountBalance', {
             dataIndex: 'kind'
         },{
             text:'收入',
-            dataIndex:'outamount'
+            dataIndex:'outamount',
+            xtype: 'numbercolumn'
         },{
             text:'支出',
-            dataIndex:'thisamount'
+            dataIndex:'thisamount',
+            xtype: 'numbercolumn'
         },{
             text: '账户余额',
-            dataIndex: 'pr_code'
+            dataIndex: 'pr_code',
+            xtype: 'numbercolumn'
         }, {
             text: '往来单位',
             dataIndex: 'bcode'

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
 
     groupField: null,
     listUrl: '/api/money/report/customercheck',
-    // listUrl: 'http://192.168.253.35:8880/report/customercheck',
     defaultCondition: null,
     reportTitle: '客户对账单',
     QueryWidth:0.1,
@@ -45,7 +44,8 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             width: 200
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            xtype: 'numbercolumn'
         },{
             text:'客户编号',
             dataIndex:'pi_vendcode',
@@ -69,24 +69,41 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         }, {
             text: '数量',
             dataIndex: 'qty',
-            summaryType: 'count'
+            xtype: 'numbercolumn'
         }, {
             text: '单价',
-            dataIndex: 'pd_orderprice'
+            dataIndex: 'pd_orderprice',
+            xtype: 'numbercolumn'
         }, {
             text: '税率',
-            dataIndex: 'pd_taxrate'
+            dataIndex: 'pd_taxrate',
+            xtype: 'numbercolumn'
         }, {
             text: '金额',
             dataIndex: 'pd_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '不含税单价',
-            dataIndex: 'pd_netprice'
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
             dataIndex: 'pd_nettotal',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '备注',
             dataIndex: 'pd_remark'

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

@@ -4,12 +4,10 @@ Ext.define('saas.view.money.report.PayDetail', {
 
     controller: 'money-report-paydetail',
     viewModel: 'money-report-paydetail',
-
     viewName: 'money-report-paydetail',
 
     groupField: null,
     listUrl: '/api/money/report/payDetail',
-    // listUrl: 'http://192.168.253.35:8880/report/payDetail',
     defaultCondition: null,
     reportTitle: '应付账款明细表',
     QueryWidth:0.1,
@@ -58,22 +56,46 @@ Ext.define('saas.view.money.report.PayDetail', {
         }, {
             text: '期初应付余额',
             dataIndex: 've_beginapamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '本期付款金额',
             dataIndex: 'pb_pdamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应付余额',
             dataIndex: 'mustpay',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应付日期',
             dataIndex: 'mustdate',
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '备注',
             dataIndex: 'pi_remark'

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.RecDetail', {
 
     groupField: null,
     listUrl: '/api/money/report/recDetail',
-    // listUrl: 'http://192.168.253.35:8880/report/recDetail',
     defaultCondition: null,
     reportTitle: '应收账款明细',
     QueryWidth:0.1,
@@ -49,7 +48,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200
         },{
             text: '业务员',
-            dataIndex: 'PU_BUYERNAME',
+            dataIndex: 'pu_buyername',
             width: 200
         }, {
             text: '单据日期',
@@ -57,25 +56,45 @@ Ext.define('saas.view.money.report.RecDetail', {
             width: 200,
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            xtype: 'numbercolumn'
         },{
             text:'期初应收',
             dataIndex:'cu_beginaramount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         },{
             text:'本期收款金额',
             dataIndex:'pb_pdamount',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         },{
             text: '应收余额',
             dataIndex: 'mustpay',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '应收日期',
             dataIndex: 'mustdate'
         }, {
             text: '单据总金额',
-            dataIndex: 'pi_total'
+            dataIndex: 'pi_total',
+            xtype: 'numbercolumn'
         }, {
             text: '备注',
             dataIndex: 'pd_unit'

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

@@ -9,7 +9,6 @@ Ext.define('saas.view.money.report.VendorCheck', {
 
     groupField: null,
     listUrl: '/api/money/report/vendorCheck',
-    // listUrl: 'http://192.168.253.35:8880/report/vendorCheck',
     defaultCondition: null,
     reportTitle: '供应商对账单',
     QueryWidth:0.1,
@@ -67,23 +66,39 @@ Ext.define('saas.view.money.report.VendorCheck', {
         }, {
             text: '采购数量',
             dataIndex: 'qty',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '单价',
-            dataIndex: 'pd_orderprice'
+            dataIndex: 'pd_orderprice',
+            xtype: 'numbercolumn'
         }, {
             text: '税率',
-            dataIndex: 'pd_taxrate'
+            dataIndex: 'pd_taxrate',
+            xtype: 'numbercolumn'
         }, {
             text: '金额',
             dataIndex: 'pd_total',
-            summaryType: 'count'
+            xtype: 'numbercolumn',
+            summaryType: 'sum',
+            summaryRenderer: function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+            }
         }, {
             text: '不含税单价',
-            dataIndex: 'pd_netprice'
+            dataIndex: 'pd_netprice',
+            xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
-            dataIndex: 'pd_nettotal'
+            dataIndex: 'pd_nettotal',
+            xtype: 'numbercolumn'
         }, {
             text: '备注',
             dataIndex: 'pd_remark'

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -22,14 +22,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
      _unAuditUrl: '/api/purchase/purchase/unAudit/',
      _deleteUrl:'/api/purchase/purchase/delete/',
      _turnInUrl:'/api/purchase/purchase/turnProdin/',
-
-    // _readUrl:'http://localhost:8800/purchase/read/',
-    // _saveUrl:'http://localhost:8800/purchase/save',
-    // _auditUrl:'http://localhost:8800/purchase/audit',
-    // _unAuditUrl:'http://localhost:8800/purchase/unAudit/',
-    // _deleteUrl:'http://localhost:8800/purchase/delete/',
-    // _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
-
      initId:0,
  
      toolBtns: [{
@@ -139,7 +131,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 dataIndex : "pr_detail",
                 ignore:true,
                 renderer: function (v, m, r) {
-                    debugger
                     if(!v){
                         return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:null; 
                     }                     
@@ -312,7 +303,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
     },
     {
         xtype : "textfield", 
-        name : "PU_REMARK", 
+        name : "pu_remark", 
         fieldLabel : "备注", 
         columnWidth : 1
     },
@@ -325,7 +316,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pu_auditman", 

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

@@ -22,17 +22,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
     _turnOutUrl:'/api/purchase/prodinout/turnProdOut/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _unAuditUrl:'http://localhost:8800/prodinout/unAudit/',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-    // _turnOutUrl:'http://localhost:8800/prodinout/turnProdOut/',
-
-
-
     initId:0,
 
     toolBtns: [{
@@ -46,14 +35,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -61,25 +48,21 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         columnWidth : 0.0
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,
@@ -87,7 +70,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     },{
         xtype : "textfield", 
         name : "pi_total", 
-        bind : "{pi_total}", 
         fieldLabel : "总额", 
         allowBlank : true,
         readOnly: true,
@@ -95,14 +77,12 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_puid", 
-        bind : "{pi_puid}", 
         fieldLabel : "采购单id", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
         xtype : "hidden", 
         name : "pi_pucode", 
-        bind : "{pi_pucode}", 
         fieldLabel : "采购单号", 
         allowBlank : true, 
         columnWidth : 0.25
@@ -110,7 +90,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
-        // deleteDetailUrl:'http://localhost:8800/prodinout/deleteDetail/',
         deleteDetailUrl:'/api/purchase/prodinout/deleteDetail/',
         detnoColumn:  'pd_pdno',
         columns : [

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

@@ -21,30 +21,17 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     _auditUrl:'/api/purchase/prodinout/audit',
     _unAuditUrl:'/api/purchase/prodinout/unAudit/',
     _deleteUrl:'/api/purchase/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:8800/prodinout/read/',
-    // _saveUrl:'http://localhost:8800/prodinout/save',
-    // _auditUrl:'http://localhost:8800/prodinout/audit',
-    // _deleteUrl:'http://localhost:8800/prodinout/delete/',
-
-
-
     initId:0,
-
     toolBtns: [],
-
     defaultItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'id',
         allowBlank: true,
         columnWidth: 0
     },{
         xtype : "textfield", 
         name : "pi_class", 
-        bind : "{pi_class}", 
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true, 
@@ -52,7 +39,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     }, {
         xtype : "hidden", 
         name : "pi_vendid", 
-        bind : "{pi_vendid}", 
         fieldLabel : "供应商ID", 
         allowBlank : true, 
         hidden:true,
@@ -60,18 +46,15 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
     },{
         xtype: 'hidden',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号'
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         allowBlank : false,
     },{
         xtype : "datefield", 
         name : "pi_date", 
-        bind : "{pi_date}", 
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25,

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

@@ -65,7 +65,8 @@ Ext.define('saas.view.purchase.report.Purchase', {
         dataIndex: 'pu_date'
     }, {
         text: '序号',
-        dataIndex: 'pd_detno'
+        dataIndex: 'pd_detno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode'
@@ -96,29 +97,49 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '采购数量',
         dataIndex: 'pd_qty',
-        summaryType: 'count'
+        xtype: 'numbercolumn',
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '单价',
-        dataIndex: 'pd_price'
+        dataIndex: 'pd_price',
+        xtype: 'numbercolumn'
     }, {
         text: '税率',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'pd_taxrate',
+        xtype: 'numbercolumn'
     }, {
         text: '金额',
         dataIndex: 'pd_total',
-        summaryType: 'count'
+        xtype: 'numbercolumn',
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '不含税单价',
-        dataIndex: 'pd_taxprice'
+        dataIndex: 'pd_taxprice',
+        xtype: 'numbercolumn'
     }, {
         text: '不含税金额',
-        dataIndex: 'pd_taxtotal'
+        dataIndex: 'pd_taxtotal',
+        xtype: 'numbercolumn'
     }, {
         text: '收货数量',
-        dataIndex: 'pd_acceptqty'
+        dataIndex: 'pd_acceptqty',
+        xtype: 'numbercolumn'
     }, {
         text: '收货金额',
-        dataIndex: 'pd_accepttotal'
+        dataIndex: 'pd_accepttotal',
+        xtype: 'numbercolumn'
     }, {
         text: '备注'
     }]

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

@@ -61,13 +61,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {//∑求和
         text: '采购金额',
         dataIndex: 'pbd_amount',
+        xtype: 'numbercolumn',
         width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -78,13 +73,8 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {//∑求和
         text: '本次付款',
         dataIndex: 'pbd_nowbalance',
+        xtype: 'numbercolumn',
         width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -95,18 +85,12 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {
         text: '应付余额',
         dataIndex: 'pb_pbdamount',
-        width: 200,
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn'
     }, {
         text: '付款比例',
         //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
-        width: 200
+        xtype: 'numbercolumn'
     }, {
         text: '备注',
         dataIndex: 'pd_remark',

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

@@ -70,7 +70,8 @@ Ext.define('saas.view.sale.report.Sale', {
         dataIndex: 'sa_date'
     }, {
         text: '序号',
-        dataIndex: 'sd_detno'
+        dataIndex: 'sd_detno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料编号',
         dataIndex: 'sd_prodcode',
@@ -103,12 +104,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {//∑数量
         text: '数量',
         dataIndex: 'sd_qty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -119,24 +115,15 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '单价',
         dataIndex: 'sd_price',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text: '税率',
-        dataIndex: 'sd_taxrate'
+        dataIndex: 'sd_taxrate',
+        xtype: 'numbercolumn'
     }, {//∑金额
         text: '金额',
         dataIndex: 'sd_total',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -147,12 +134,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {//∑不含税金额
         text: '不含税金额',
         dataIndex: 'sd_nettotal',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -163,12 +145,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '出货数量',
         dataIndex: 'sd_sendqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text : "备注", 
         dataIndex : "sd_remark",

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

@@ -80,25 +80,32 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         dataIndex: 'pr_unit'
     }, {
         text: '数量',
-        dataIndex: 'pd_outqty'
+        dataIndex: 'pd_outqty',
+        xtype: 'numbercolumn'
     }, {
         text: '单价',
-        dataIndex: 'pd_sendprice'
+        dataIndex: 'pd_sendprice',
+        xtype: 'numbercolumn'
     }, {
         text: '税率%',
-        dataIndex: 'pd_taxrate'
+        dataIndex: 'pd_taxrate',
+        xtype: 'numbercolumn'
     }, {
         text: '含税金额',
-        dataIndex: 'pd_ordertotal'
+        dataIndex: 'pd_ordertotal',
+        xtype: 'numbercolumn'
     }, {
         text: '成本金额',
-        dataIndex: 'pd_total'
+        dataIndex: 'pd_total',
+        xtype: 'numbercolumn'
     }, {
         text: '毛利润',
-        dataIndex: 'pd_profit'
+        dataIndex: 'pd_profit',
+        xtype: 'numbercolumn'
     }, {
         text: '毛利率%',
-        dataIndex: 'pd_profitpresent'
+        dataIndex: 'pd_profitpresent',
+        xtype: 'numbercolumn'
     }, {
         text : "备注", 
         dataIndex : "pd_remark",

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

@@ -56,17 +56,23 @@ Ext.define('saas.view.sale.report.SaleRec', {
         dataIndex: 'rbd_slkind'
     }, {
         text: '销售金额',
+        xtype: 'numbercolumn',
         dataIndex: 'rbd_amount'
     }, {
         text: '本次收款',
+        xtype: 'numbercolumn',
         dataIndex: 'rbd_nowbalance'
     }, {
-        text: '应收余额'
+        text: '应收余额',
+        xtype: 'numbercolumn',
+        dataIndex: 'rb_rbdamount'
     }, {
-        text: '回款比例'
+        text: '回款比例',
+        xtype: 'numbercolumn',
+        dataIndex: 'rb_backrate'
     }, {
         text: '备注',
-        dataIndex: 'rbd_remark'
+        dataIndex: 'rb_remark'
     }]
 
 });

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

@@ -54,7 +54,9 @@ Ext.define('saas.view.sale.sale.FormPanel', {
     }, {
         xtype : "datefield", 
         name : "sa_date", 
-        fieldLabel : "单据日期"
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_toplace", 
@@ -278,7 +280,8 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "datefield", 
         name : "sa_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_auditman", 

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

@@ -49,6 +49,13 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -265,7 +272,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -110,12 +110,14 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '含税金额',
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '未税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
@@ -165,22 +167,26 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             text: '销售单价',
             dataIndex: 'pd_sendprice',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '金额',
             dataIndex: 'pd_total',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '税率',
             dataIndex: 'pd_taxrate',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         },{
             text: '成本单价',
             dataIndex: 'pd_price',
             xtype:'numbercolumn',
-            width: 120
+            width: 120,
+            align:'right'
         }, {
             text: '备注',
             dataIndex: 'pd_remark',

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

@@ -57,6 +57,13 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         name : "pi_custname", 
         fieldLabel : "客户名称",
         allowBlank:false,
+    }, {
+        xtype : "datefield", 
+        name : "pi_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        columnWidth : 0.25,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_address", 
@@ -270,7 +277,8 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         xtype : "datefield", 
         name : "pi_recorddate", 
         fieldLabel : "录入日期",
-        readOnly:true
+        readOnly:true,
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -8,27 +8,27 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     viewName: 'stock-report-prodinoutCount',
     //按物料分组
     groupField: null,
-    listUrl: '/api/stock/report/prodinoutCount',
+    listUrl: '/api/storage/report/prodinoutCount',
     defaultCondition: null,
     reportTitle: '物料收发汇总表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：仓库、物料、物料类型、时间			
     searchItems: [{		
         xtype: 'dbfindtrigger',
-        name: 'pd_whcode',
-        fieldLabel: '仓库编号',
-        columnWidth: 0.25
+        name: 'wh_description',
+        fieldLabel: '仓库',
+        columnWidth: 0.2
     }, {		
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {		
         xtype: 'remotecombo',
         editable:false,
         name: 'pd_prodcode',
         fieldLabel: '物料类型',
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         storeUrl:'/api/document/producttype/getCombo',
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
@@ -76,30 +76,46 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     }, {
         text: '期初',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_beginqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_beginamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '入库合计',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_nowinqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_nowinamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '出库合计',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_nowoutqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_nowoutamount',
+            xtype: 'numbercolumn'
         }]
     }, {
         text: '结存',
         columns: [{
-            text: '数量'
+            text: '数量',
+            dataIndex:'pwm_endqty',
+            xtype: 'numbercolumn'
         },{
-            text: '成本'
+            text: '成本',
+            dataIndex:'pwm_endamount',
+            xtype: 'numbercolumn'
         }]
     }]
 });

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.stock.report.ProdinoutCountController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'stock-report-prodinoutCount',
+    alias: 'controller.stock-report-prodinoutCount',
     init: function (form) {
         this.control({
            //放大镜赋值关系 以及 tpl模板
@@ -102,7 +102,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
 
                 }
             },
-            'dbfindtrigger[name=pd_whcode]':{
+            'dbfindtrigger[name=wh_description]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         conditionCode:'wh_code',
@@ -112,7 +112,7 @@ Ext.define('saas.view.stock.report.ProdinoutCountController', {
                         dbfinds:[{
                             from:'id',to:'id',ignore:true 
                         }, { 
-                            from:'wh_code',to:'pd_whcode'
+                            from:'wh_code',to:'wh_code'
                         }, {
                             from:'wh_description',to:'wh_description'
                         }],

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

@@ -1,4 +1,4 @@
 Ext.define('saas.view.stock.report.ProdinoutCountModel', {
     extend: 'saas.view.core.report.ReportPanelModel',
-    alias: 'stock-report-prodinoutCount'
+    alias: 'viewmodel.stock-report-prodinoutCount'
 });

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

@@ -8,17 +8,17 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     viewName: 'stock-report-prodiodetail',
   //  按物料分组
     groupField: 'pd_prodcode',
-    listUrl: '/api/stock/report/prodiodetail',
+    listUrl: '/api/storage/report/prodioDetail',
     defaultCondition: null,
     reportTitle: '物料出入库明细表',
-    QueryWidth:0.25,
+    QueryWidth:0.1,
     //筛选：单据类型、物料、日期
     searchItems: [{
         xtype: 'multicombo',
         name: 'pi_class',
         fieldLabel: '单据类型',
         allowBlank: true,
-        columnWidth: 0.25,
+        columnWidth: 0.2,
         datas: [
             ["采购验收单", "采购验收单"],
             ["采购验退单", "采购验退单"],
@@ -35,7 +35,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
         fieldLabel: '物料编号',
-        columnWidth: 0.25
+        columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
@@ -70,7 +70,8 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'datecolumn'
     }, {
         text: '序号',
-        dataIndex: 'pd_pdno'
+        dataIndex: 'pd_pdno',
+        xtype: 'numbercolumn'
     }, {
         text: '物料类型',
         dataIndex: 'pr_kind'
@@ -91,12 +92,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     }, {
         text: '入库数量',
         dataIndex: 'inqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -107,12 +103,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     }, {
         text: '出库数量',
         dataIndex: 'outqty',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        },
+        xtype: 'numbercolumn',
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -123,12 +114,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     }, {
         text: '成本单价',
         dataIndex: 'pd_price',
-        renderer : function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length)).fill('0');
-            var format = '0,000.' + xr.join();
-            return Ext.util.Format.number(v, format);
-        }
+        xtype: 'numbercolumn'
     }, {
         text: '备注',
         dataIndex: 'pd_remark',

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.stock.report.ProdiodetailController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'stock-report-prodiodetail',
+    alias: 'controller.stock-report-prodiodetail',
     init: function (form) {
         this.control({
             //放大镜赋值关系 以及 tpl模板

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

@@ -1,4 +1,4 @@
 Ext.define('saas.view.stock.report.ProdiodetailModel', {
     extend: 'saas.view.core.report.ReportPanelModel',
-    alias: 'stock-report-prodiodetail'
+    alias: 'viewmodel.stock-report-prodiodetail'
 });