Merge remote-tracking branch 'origin/dev' into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/ProdIODetailMapper.java

@@ -31,7 +31,7 @@ public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
 
     void deleteByFK(Long id);
 
-    void calcProdIn(@Param("pi_id") Long pi_id,@Param("pi_class") String pi_class);
+    void calcProdIn(@Param("pi_id") Long pi_id);
 
-    void calcProdOut(@Param("pi_id") Long pi_id,@Param("pi_class") String pi_class);
+    void calcProdOut(@Param("pi_id") Long pi_id);
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/ProdInOutService.java

@@ -74,6 +74,7 @@ public interface ProdInOutService extends CommonBaseService<ProdInOutMapper, Pro
 
     void batchOpen(BatchDealBaseDTO baseDTOs);
 
-    void updateYqty(ProdInOut prodInOut);
+
+    void calcProdInout(Long pi_id, String pi_class);
 
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -350,11 +350,11 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     }
 
 
-    private void calcProdInout(Long pi_id, String pi_class) {
+    public void calcProdInout(Long pi_id, String pi_class) {
         if ("采购验收单".equals(pi_class)) {
-            prodIODetailMapper.calcProdIn(pi_id,pi_class);
+            prodIODetailMapper.calcProdIn(pi_id);
         } else if ("采购验退单".equals(pi_class)) {
-            prodIODetailMapper.calcProdOut(pi_id,pi_class);
+            prodIODetailMapper.calcProdOut(pi_id);
         }
     }
 
@@ -401,7 +401,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_pucode(sourcePi.getPi_pucode());
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
-        targetPi.setCreatorId(sourcePi.getCreatorId());
         targetPi.setCreateTime(new Date());
 
 
@@ -409,7 +408,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         getMapper().insertSelective(targetPi);
         //插入验退单从表
         long pi_id = targetPi.getId();
-        for (int i = 1;i<=sourcePids.size();i++){
+        for (int i = 0;i<sourcePids.size();i++){
              ProdIODetail sourcePid = sourcePids.get(i);
              ProdIODetail targetPid = new ProdIODetail();
              pdInqty = sourcePid.getPd_inqty()==null?0:sourcePid.getPd_inqty();
@@ -419,7 +418,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                  targetPid.setPd_piid(pi_id);
                  targetPid.setPd_inoutno(piInoutno);
                  targetPid.setPd_piclass(BillCodeSeq.PURCHASEOUT.getName());
-                 targetPid.setPd_pdno(i);
+                 targetPid.setPd_pdno(i+1);
                  targetPid.setPd_orderid(sourcePid.getPd_orderid());
                  targetPid.setPd_ordercode(sourcePid.getPd_ordercode());
                  targetPid.setPd_orderdetno(sourcePid.getPd_orderdetno());
@@ -442,7 +441,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
          }
 
         //采购验退单相关计算
-        updateYqty(targetPi);
+        calcProdInout(pi_id,"采购验退单");
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(pi_id);
         baseDTO.setCode(piInoutno);

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -413,7 +413,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         prodInOut.setPi_puid(purchase.getId().intValue());
         prodInOut.setPi_pucode(purchase.getPu_code());
         prodInOut.setCompanyId(purchase.getCompanyId());
-        prodInOut.setCreatorId(purchase.getCreatorId());
         prodInOut.setCreateTime(new Date());
 
 
@@ -425,7 +424,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         //插入验收单从表
         long pi_id = prodInOut.getId();
 
-        for (int i=1;i<=purchaseDetails.size();i++){
+        for (int i=0;i<purchaseDetails.size();i++){
             PurchaseDetail purchaseDetail =purchaseDetails.get(i);
             ProdIODetail prodIODetail = new ProdIODetail();
             pdQty = purchaseDetail.getPd_qty()==null?0:purchaseDetail.getPd_qty();
@@ -435,7 +434,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 prodIODetail.setPd_piid(pi_id);
                 prodIODetail.setPd_inoutno(piInoutno);
                 prodIODetail.setPd_piclass("采购验收单");
-                prodIODetail.setPd_pdno(i);
+                prodIODetail.setPd_pdno(i+1);
                 prodIODetail.setPd_orderid(purchaseDetail.getId().intValue());
                 prodIODetail.setPd_ordercode(purchase.getPu_code());
                 prodIODetail.setPd_orderdetno(purchaseDetail.getPd_detno());
@@ -456,7 +455,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             }
         }
         //采购单相关计算
-        prodInOutService.updateYqty(prodInOut);
+        prodInOutService.calcProdInout(pi_id,"采购验收单");
         DocBaseDTO baseDTO = new DocBaseDTO();
         baseDTO.setId(pi_id);
         baseDTO.setCode(piInoutno);

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -2,6 +2,8 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     extend: 'Ext.grid.Panel',
     xtype: 'core-query-querygridpanel',
 
+    cls: 'x-core-query',
+
     //工具类
     BaseUtil: Ext.create('saas.util.BaseUtil'),
     //字段属性
@@ -210,15 +212,17 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
         me.callParent(arguments);
     },
     listeners: {
-        itemdblClick: function (tableView, record, item, index, e, eOpts) {
-            var grid = tableView.up('grid'),
-            idValue = record.get(grid.idField),
-            codeValue = record.get(grid.codeField),
-            id = grid.addXtype + '-' + idValue;
-            openTab(grid.addXtype, grid.addTitle+"("+codeValue+")", id, {
-                initId: idValue
-            });
-        }
+        itemClick: function(tableView, record, item, index, e, eOpts) {
+            if(e.target.parentElement.classList.contains('x-querygrid-code-column')) {
+                var grid = tableView.up('grid'),
+                idValue = record.get(grid.idField),
+                codeValue = record.get(grid.codeField),
+                id = grid.addXtype + '-' + idValue;
+                openTab(grid.addXtype, grid.addTitle+"("+codeValue+")", id, {
+                    initId: idValue
+                });
+            }
+        },
     },
     getFields: function() {
         var me = this;

frontend/saas-web/app/view/core/query/QueryGridPanel.scss

@@ -0,0 +1,11 @@
+.x-core-query {
+
+    .x-querygrid-code-column {
+
+        .x-grid-cell-inner {
+            text-decoration: underline;
+            color: blue;
+            cursor: pointer;
+        }
+    }
+}

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -92,8 +92,25 @@ Ext.define('saas.view.core.query.QueryPanel', {
 
     setQuertGridConfigs: function() {
         var me = this,
-        queryGrid = me.items[1];
-        me.queryGridConfig['columns']=me.queryGridConfig.baseColumn || [];
+        queryGrid = me.items[1],
+        queryGridConfig = me.queryGridConfig;
+        
+        var columns = queryGridConfig.baseColumn || [];
+
+        Ext.Array.each(columns, function(c) {
+            if(c.xtype == 'numbercolumn') {
+                Ext.applyIf(c, {
+                    align: 'end'
+                });
+            }
+            if(c.dataIndex == queryGridConfig.codeField) {
+                Ext.applyIf(c, {
+                    tdCls: 'x-querygrid-code-column'
+                });
+            }
+        });
+
+        me.queryGridConfig['columns']=columns;
         Ext.apply(queryGrid,me.queryGridConfig);
     },
 

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

@@ -110,14 +110,24 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "金额", 
                 dataIndex : "ftd_nowbalance", 
+                width : 120.0, 
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 2
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "结算方式号", 
                 dataIndex : "ftd_paycode", 

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

@@ -58,8 +58,13 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         }, {
             text: '金额',
             dataIndex: 'ftd_nowbalance',
-            xtype : "numbercolumn",
-            width: 120
+            width: 120,
+            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);
+            },
         }, {
             text: '结算方式',
             dataIndex: 'ftd_paymethod',

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

@@ -102,38 +102,35 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
             }, {
                 text : "金额", 
                 dataIndex : "ord_nowbalance", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
-            }, {
-                text : "单价", 
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 2
                 },
-                format:'0,000.00',
-                dataIndex : "sd_price", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                items : null,
-                summaryType: 'sum'
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "备注", 
                 dataIndex : "ord_remark",
-                width : 120.0, 
-                items : null,
-                flex : 1.0,
+                width : 220, 
                 editor : {
-                    xtype : ""
+                    xtype : "textarea"
                 }
             }
         ]
     }, {
-        xtype : "textfield", 
+        xtype : "numberfield", 
         name : "or_amount", 
         fieldLabel : "收款金额",
         readOnly:true

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

@@ -75,7 +75,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         }, {
             text: '金额',
             dataIndex: 'or_amount',
-            xtype: 'numbercolumn',
             width: 120
         }, {
             text: '备注',

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

@@ -102,38 +102,56 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
             }, {
                 text : "金额", 
                 dataIndex : "osd_nowbalance", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 2
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "单价", 
+                dataIndex : "sd_price", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                format:'0,000.00',
-                dataIndex : "sd_price", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                items : null,
-                summaryType: 'sum'
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "备注", 
                 dataIndex : "osd_remark",
-                width : 120.0, 
-                items : null,
+                width : 250, 
                 editor : {
-                    xtype : ""
+                    xtype : "textfield"
                 },
-                flex : 1.0,
             }
         ]
     }, {
-        xtype : "textfield", 
+        xtype : "numberfield", 
         name : "os_amount", 
         fieldLabel : "收款金额",
         readOnly:true

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

@@ -75,8 +75,13 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         }, {
             text: '金额',
             dataIndex: 'os_amount',
-            xtype: 'numbercolumn',
-            width: 120
+            width: 120,
+            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);
+            },
         }, {
             text: '备注',
             dataIndex: 'os_remark',

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

@@ -112,8 +112,22 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "付款金额",
             dataIndex: "pd_amount",
-            editor:{
-                xtype: 'numberfield'
+            editor : {
+                xtype : "numberfield",
+                decimalPrecision: 2
+            },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "结算方式",
@@ -124,6 +138,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "备注",
             dataIndex: "pd_remark",
+            width: 250,
             editor:{
                 xtype: 'textfield'
             }
@@ -163,30 +178,87 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "单据金额",
             dataIndex: "pbd_amount",
-            editor:{
-                xtype: 'numberfield'
+            // editor : {
+            //     xtype : "numberfield",
+            //     decimalPrecision: 2
+            // },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "已核销金额",
             dataIndex: "pb_remark",
-            editor:{
-                xtype: 'numberfield'
+            // editor : {
+            //     xtype : "numberfield",
+            //     decimalPrecision: 2
+            // },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "未核销金额",
             dataIndex: "pb_remark",
-            editor:{
-                xtype: 'numberfield'
+            // editor : {
+            //     xtype : "numberfield",
+            //     decimalPrecision: 2
+            // },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "本次核销金额",
             dataIndex: "pbd_nowbalance",
-            editor:{
-                xtype: 'numberfield'
+            editor : {
+                xtype : "numberfield",
+                decimalPrecision: 2
+            },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: '备注',
             dataIndex: 'pbd_remark',
+            width: 250,
             editor:{
                 xtype: 'textfield'
             }

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

@@ -119,8 +119,22 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "收款金额",
             dataIndex: "rd_amount",
-            editor: {
-                xtype: 'numberfield'
+            editor : {
+                xtype : "numberfield",
+                decimalPrecision: 2
+            },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "结算方式",
@@ -137,6 +151,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "备注",
             dataIndex: "rd_remark",
+            width: 250,
             editor: {
                 xtype: 'textfield'
             }
@@ -185,26 +200,82 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "单据金额",
             dataIndex: "rbd_amount",
-            editor: {
-                xtype: 'numberfield'
+            // editor : {
+            //     xtype : "numberfield",
+            //     decimalPrecision: 2
+            // },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "已核销金额",
             dataIndex: "rbd_nowbalance",
-            editor: {
-                xtype: 'numberfield'
+            // editor : {
+            //     xtype : "numberfield",
+            //     decimalPrecision: 2
+            // },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "未核销金额",
             dataIndex: "pbd_nowbalance",
-            editor: {
-                xtype: 'numberfield'
+            // editor : {
+            //     xtype : "numberfield",
+            //     decimalPrecision: 2
+            // },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         }, {
             text: "本次核销金额",
             dataIndex: "pbd_nowbalance",
-            editor: {
-                xtype: 'numberfield'
+            editor : {
+                xtype : "numberfield",
+                decimalPrecision: 2
+            },
+            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('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
             }
         // }, {
         //     text: '备注',

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

@@ -145,61 +145,123 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_qty", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0,000.00',
-                summaryType: 'sum'
+                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);
+                },
+                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_yqty", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0,
-                format:'0,000.00', 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null
+                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);
+                },
+                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", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                format:'0,000.00',
-                dataIndex : "pd_price", 
-                width : 120.0, 
-                xtype : "numbercolumn",
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, 
             {
                 text : "税率", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 dataIndex : "pd_taxrate", 
-                format:'0,000.00',
-                width : 120.0, 
-                xtype : "numbercolumn",
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
             },
             {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                format:'0,000.00',
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, 
             {
                 text : "未含税金额", 
                 dataIndex : "pd_taxtotal", 
                 width : 120.0,
-                format:'0,000.00', 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },{
                 text : "需求日期", 
                 dataIndex : "pd_delivery", 

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

@@ -134,7 +134,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             dataIndex: 'pu_total',
             xtype: 'numbercolumn',
             width: 120,
-            flex: 1
         }],
         relativeColumn: [{
             text: 'id',

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

@@ -164,22 +164,45 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                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);
+                },
+                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_yqty", 
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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);
+                },
+                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 : "仓库id", 
                 dataIndex : "pd_whid", 
@@ -253,22 +276,53 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "税率", 
-                editor : {
-                    xtype : "numberfield"
-                }, 
                 dataIndex : "pd_taxrate", 
-                width : 120.0, 
-                xtype : "numbercolumn"
+                width : 120.0,
+                editor : {
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
             },
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },
             {
                 text : "采购单明细id", 
@@ -285,7 +339,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
                 width : 120.0,
-                format: '0000',
+                format: '0',
                 renderer: function(v) {
                     return v ? v : null;
                 }

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

@@ -113,53 +113,112 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "数量", 
                 dataIndex : "sd_qty", 
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0,000.00',
-                items : null,
-                allowBlank:false,
-                summaryType: 'sum'
+                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);
+                },
+                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 : "sd_yqty", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0.00'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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);
+                },
+                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 : "sd_price", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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);
                 },
-                format:'0,000.00',
-                dataIndex : "sd_price", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                items : null
             }, 
             {
                 text : "税率", 
-                editor : {
-                    xtype : "numberfield"
-                },
                 dataIndex : "sd_taxrate", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                },
             },
             {
                 text : "含税金额", 
                 dataIndex : "sd_total", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, 
             {
-                text : "未税金额", 
-                dataIndex : "sd_nettotal", 
-                xtype : "numbercolumn"
+                text : "未含税金额", 
+                dataIndex : "sd_nettotal",
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },{
                 text : "交货日期", 
                 dataIndex : "sd_delivery", 
@@ -178,11 +237,11 @@ Ext.define('saas.view.sale.sale.FormPanel', {
             },{
                 text : "备注", 
                 dataIndex : "sd_remark",
-                width : 120.0, 
+                width : 250, 
                 items : null,
                 ignore:true,
                 editor : {
-                    xtype : ""
+                    xtype : "textfield"
                 },
             }
         ]

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

@@ -108,13 +108,24 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
                 allowBlank:false,
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                summaryType: 'sum'
+                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);
+                },
+                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 : "仓库ID", 
                 dataIndex : "pd_whid", 
@@ -122,7 +133,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whcode", 
-                width :0
+                hidden :true
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
@@ -147,30 +158,68 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 dataIndex : "pd_sendprice", 
                 width : 120.0, 
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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_total", 
                 width : 120.0, 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
                 editor : {
-                    xtype : "numberfield"
-                },
-                xtype : "numbercolumn", 
-                items : null
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
             },
             {
-                text : "未税金额", 
+                text : "未含税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },
             {
                 text : "销售订单明细id", 
@@ -186,8 +235,8 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 text : "销售序号", 
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
-                flex:1,
-                format: '0000',
+                width: 100,
+                format: '0',
                 renderer: function(v) {
                     return v ? v : null;
                 }

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

@@ -117,15 +117,25 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             },  {
                 text : "出货数量", 
                 dataIndex : "pd_outqty", 
+                width : 120.0, 
+                allowBlank:false,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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);
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0,000.00',
-                items : null,
                 summaryType: 'sum',
-                allowBlank:false,
+                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 : "仓库ID", 
                 dataIndex : "pd_whid", 
@@ -133,7 +143,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whcode", 
-                width :0
+                hidden :true
             }, {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
@@ -157,36 +167,70 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             {
                 text : "单价", 
                 dataIndex : "pd_sendprice", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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);
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
             }, 
            {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn",
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 2
                 },
-                summaryType: 'sum'
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
                 width : 120.0, 
-                xtype : "numbercolumn", 
                 editor : {
-                    xtype : "numberfield"
-                },
-                items : null
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
             },
             {
-                text : "未税金额", 
+                text : "未含税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },
             {
                 text : "销售单号", 
@@ -197,7 +241,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 dataIndex : "pd_orderdetno", 
                 xtype : "numbercolumn",
                 width : 120.0,
-                format: '0000',
+                format: '0',
                 renderer: function(v) {
                     return v ? v : null;
                 }

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -162,14 +162,24 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                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);
+                },
+                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 : "拨出仓库id", 
                 dataIndex : "pd_whid", 

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -159,14 +159,24 @@ Ext.define('saas.view.stock.make.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_qty", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                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);
+                },
+                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 : "仓库id",
                 dataIndex : "mm_whid",
@@ -204,7 +214,7 @@ Ext.define('saas.view.stock.make.FormPanel', {
             }, {
                 text : "备注",
                 dataIndex : "mm_remark",
-                width : 120.0,
+                width : 250,
                 hidden:true
             }]
     },{

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

@@ -157,14 +157,24 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
+                    xtype : "numberfield",
+                    decimalPrecision: 8
                 },
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
+                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);
+                },
+                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 : "仓库id", 
                 dataIndex : "pd_whid", 
@@ -198,34 +208,69 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             {
                 text : "单价", 
                 dataIndex : "pd_orderprice",
+                width : 120.0,
                 editor : {
-                    xtype : "numberfield"
-                },   
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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);
+                },
             }, 
            {
                 text : "含税金额", 
                 dataIndex : "pd_total", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate",
                 editor : {
-                    xtype : "numberfield"
-                },   
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
             },
             {
-                text : "未税金额", 
+                text : "未含税金额", 
                 dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }
         ]
     }, {

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

@@ -153,14 +153,24 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             {
                 text: "数量",
                 dataIndex: "pd_outqty",
-                editor: {
-                    xtype: "numberfield"
-                },
                 width: 120.0,
-                xtype: "numbercolumn",
-                format: '0',
-                items: null,
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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);
+                },
+                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: "仓库id",
                 dataIndex: "pd_whid",
@@ -195,33 +205,74 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 text: "单价",
                 dataIndex: "pd_orderprice",
                 editor : {
-                    xtype : "numberfield"
-                },  
-                width: 120.0,
-                xtype: "numbercolumn",
-                items: null
+                    xtype : "numberfield",
+                    decimalPrecision: 8
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },
             {
                 text: "含税金额",
                 dataIndex: "pd_total",
                 width: 120.0,
-                xtype: "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }, {
                 text: "税率",
                 dataIndex: "pd_taxrate",
                 editor : {
-                    xtype : "numberfield"
-                },  
-                width: 120.0,
-                xtype: "numbercolumn",
-                items: null
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
             },
             {
-                text: "未税金额",
+                text: "未含税金额",
                 dataIndex: "pd_nettotal",
-                xtype: "numbercolumn",
-                summaryType: 'sum'
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2
+                },
+                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('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             }
         ]
     }, {

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/field/Number.js

@@ -3,10 +3,12 @@
  * 2017年10月12日
  */
 Ext.define('Ext.locale.zh_CN.field.Number', {
-    override: 'Ext.field.Number',
+    override: 'Ext.form.field.Number',
 
     decimalsText: '最大小数位数为 {0}',
-    minValueText: '该输入项的最小值是 {0}',
-    maxValueText: '该输入项的最大值是 {0}',
+    minText: '该输入项的最小值是 {0}',
+    maxText: '该输入项的最大值是 {0}',
+    nanText: '{0} 不是一个合法的数字',
+    negativeText: '该值不能为负',
     badFormatMessage: '不是一个有效的数值'
 });

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/field/Text.js

@@ -3,7 +3,9 @@
  * 2017年10月12日
  */
 Ext.define('Ext.locale.zh_CN.field.Text', {
-    override: 'Ext.field.Text',
+    override: 'Ext.form.field.Text',
+
+    maxLengthText: '字段长度不能超过 {0}个字符',
 
     config: {
         requiredMessage: '必填项',

frontend/saas-web/overrides/form/field/Text.js

@@ -1,6 +0,0 @@
-Ext.define('saas.override.form.field.Text', {
-    override: 'Ext.form.field.Text',
-
-    maxLengthText: '字段长度不能超过{0}个字符',
-
-});