界面调整：出入库备注字段，基础资料标准化

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

@@ -303,6 +303,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         form = me.getView(),
         viewModel = me.getViewModel(),
         mlKeyvalue = viewModel.get(form._idField),
+        mlCaller = form.caller,
         win = Ext.getCmp(form.xtype+mlKeyvalue);
         if (!win&&mlKeyvalue!=0) {
             var win = form.add(Ext.create('Ext.window.Window', {
@@ -317,7 +318,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 layout: 'fit',
                 items: [{
                     xtype: 'core-form-mseeageLog',
-                    mlKeyvalue:mlKeyvalue
+                    mlKeyvalue:mlKeyvalue,
+                    mlCaller:mlCaller
                 }],
                 listeners:{
                     'close':function(){

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

@@ -74,12 +74,17 @@ Ext.define('saas.view.core.form.MseeageLog', {
     condition:[],
     initComponent: function() {
         var me = this;
-        me.defualtCondition = {
+        me.defualtCondition = [{
             type: 'number',
             field: 'ml_keyvalue',
             operation: '=',
             value: me.mlKeyvalue
-        };
+        },{
+            type: 'string',
+            field: 'ml_caller',
+            operation: '=',
+            value: me.mlCaller
+        }];
         if(me.columns){
             var fields = me.columns.map(column => column.dataIndex);
             me.store = Ext.create('Ext.data.Store',{
@@ -104,7 +109,7 @@ Ext.define('saas.view.core.form.MseeageLog', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = [me.defualtCondition];
+                            condition = me.defualtCondition;
                         }
                         
                         Ext.apply(store.proxy.extraParams, {
@@ -133,8 +138,7 @@ Ext.define('saas.view.core.form.MseeageLog', {
      */
     getCondition: function(items) {
         var me = this,
-        conditions = [];
-        conditions.push(this.defualtCondition);
+        conditions = me.defualtCondition;
         for(var i = 0; i < items.length; i++) {
             var item = items[i];
             var field = item.name,

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -94,15 +94,15 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 name:'id'
             },{
                 xtype:'textfield',
-                name:'bk_bankname',
+                name:'bk_bankcode',
                 allowBlank:false,
-                fieldLabel:'账户名称',
+                fieldLabel:'账户编号',
                 maxLength: 20
             },{
                 xtype:'textfield',
-                name:'bk_bankcode',
+                name:'bk_bankname',
                 allowBlank:false,
-                fieldLabel:'账户编号',
+                fieldLabel:'账户名称',
                 maxLength: 20
             },{
                 xtype:'numberfield',
@@ -135,7 +135,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'datefield',
                 name:'bk_date',
                 fieldLabel:'建账日期',
-                format:'Y-m-d H:i:s',
+                format:'Y-m-d',
                 listeners:{
                     beforerender:function(d){
                         d.setValue(new Date())

frontend/saas-web/app/view/document/kind/Kind.js

@@ -137,7 +137,7 @@ Ext.define('saas.view.document.kind.Kind', {
             },{
                 xtype:'datecolumn',
                 text: '建账日期',
-                format:'Y-m-d H:i:s',
+                format:'Y-m-d',
                 dataIndex: 'bk_date',
                 flex: 1
             },{

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

@@ -93,7 +93,10 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "额度",
                             "flex": 1,

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

@@ -77,13 +77,22 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "dataIndex": "cu_promisedays",
                                 align: 'end',
                                 xtype: 'numbercolumn',
-                                "width": 100
+                                "width": 100, 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,
                                 "dataIndex": "cu_credit",
                                 "width": 100,
                                 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);
+                                }
                             }, {
                                 "text": "客户地址",
                                 "flex": 1,

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

@@ -69,7 +69,10 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -72,7 +72,10 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }, {
                             "text": "承付天数",
                             "dataIndex": "ve_promisedays",
-                            "width": 100
+                            "width": 100, 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -61,7 +61,10 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -79,7 +79,10 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",
@@ -156,7 +159,10 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -62,7 +62,10 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -109,6 +109,6 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             }
         }, {
             text: '备注',
-            dataIndex: 'pd_remark'
+            dataIndex: 'pd_text1'
         }]
 });

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

@@ -69,7 +69,10 @@ Ext.define('saas.view.money.report.CustomerCheckController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -60,7 +60,10 @@ Ext.define('saas.view.money.report.PayDetailController', {
                                 "dataIndex": "ve_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "纳税人识别号",
                                 "dataIndex": "ve_bankaccount",

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

@@ -69,7 +69,10 @@ Ext.define('saas.view.money.report.RecDetailController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -60,7 +60,10 @@ Ext.define('saas.view.money.report.VendorCheckController', {
                                 "dataIndex": "ve_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "纳税人识别号",
                                 "dataIndex": "ve_bankaccount",

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

@@ -69,7 +69,10 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -61,7 +61,10 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -322,6 +322,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 renderer: function(v) {
                     return v ? v : null;
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_remark",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     },{

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

@@ -74,7 +74,10 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -63,7 +63,10 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -304,6 +304,14 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 renderer: function(v) {
                     return v ? v : null;
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_remark",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     },{

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

@@ -73,7 +73,10 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -62,7 +62,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -60,7 +60,10 @@ Ext.define('saas.view.purchase.report.PurchaseController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -61,7 +61,10 @@ Ext.define('saas.view.purchase.report.PurchasePayController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -90,7 +90,10 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -109,7 +109,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         xtype: 'numbercolumn'
     }, {
         text : "备注", 
-        dataIndex : "pd_remark",
+        dataIndex : "pd_text1",
         width : 250 
     }]
 

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

@@ -91,7 +91,10 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     QueryWidth:0.25,
     searchItems: [{//筛选：客户、日期	
         xtype: 'dbfindtrigger',
-        name: 'sa_custname',
+        name: 'rb_custname',
         fieldLabel: '客户',
         columnWidth: 0.25
     }, {

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

@@ -91,7 +91,10 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -253,7 +253,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 ignore:true
             },{
                 text : "备注", 
-                dataIndex : "sd_text1",
+                dataIndex : "sd_remark",
                 width : 250, 
                 items : null,
                 editor : {

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

@@ -92,7 +92,10 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align:'end'
+                                align:'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -88,7 +88,10 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -256,6 +256,14 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 renderer: function(v) {
                     return v ? v : null;
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_text1",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     }, {

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

@@ -93,7 +93,10 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "额度",
                             "flex": 1,

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

@@ -189,7 +189,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             align:'right'
         }, {
             text: '备注',
-            dataIndex: 'pd_remark',
+            dataIndex: 'pd_text1',
             width: 250
         }]
     }

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

@@ -81,7 +81,10 @@ Ext.define('saas.view.sale.saleIn.QueryPanelController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -261,6 +261,14 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 renderer: function(v) {
                     return v ? v : null;
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_text1",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     }, {

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

@@ -90,7 +90,10 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align:'end'
+                                align:'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -184,7 +184,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             width: 120
         }, {
             text: '备注',
-            dataIndex: 'pd_remark',
+            dataIndex: 'pd_text1',
             width: 250
         }]
     }

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

@@ -90,7 +90,10 @@ Ext.define('saas.view.sale.saleout.QueryPanelController', {
                                 "dataIndex": "cu_promisedays",
                                 "width": 100,
                                 xtype: 'numbercolumn',
-                                align: 'end'
+                                align: 'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
                             }, {
                                 "text": "额度",
                                 "flex": 1,

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

@@ -221,13 +221,21 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_text1",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     }, {
         xtype : "textfield", 
         name : "pi_remark", 
         fieldLabel : "备注", 
-        columnWidth : 0.75
+        columnWidth : 1
     }, {
         xtype : "textfield", 
         name : "pi_recordman", 

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

@@ -72,7 +72,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -153,7 +156,10 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -63,7 +63,10 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -63,7 +63,10 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",

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

@@ -275,6 +275,14 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_text1",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     },{

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

@@ -67,7 +67,10 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -150,7 +153,10 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -63,7 +63,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -246,7 +249,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -271,6 +271,14 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
+            },{
+                text : "备注", 
+                dataIndex : "pd_text1",
+                width : 250, 
+                items : null,
+                editor : {
+                    xtype : "textfield"
+                },
             }
         ]
     },{

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

@@ -67,7 +67,10 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -148,7 +151,10 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -63,7 +63,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "dataIndex": "ve_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align: 'end'
+                            align: 'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         }, {
                             "text": "纳税人识别号",
                             "dataIndex": "ve_bankaccount",
@@ -246,7 +249,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                             "dataIndex": "cu_promisedays",
                             "width": 100,
                             xtype: 'numbercolumn',
-                            align:'end'
+                            align:'end', 
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
                         },{
                             "text": "额度",
                             "dataIndex": "cu_credit",

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

@@ -120,7 +120,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
         xtype: 'numbercolumn'
     }, {
         text: '备注',
-        dataIndex: 'pd_remark',
+        dataIndex: 'pd_text1',
         width: 250
     }]