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

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -99,7 +99,6 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         var mainGrid = me.dbfindtrigger.column.ownerCt.ownerCt;
                         var rec = mainGrid.selModel.getLastSelected();
                         if(rec){
-                            console.log("rec:",rec);
                             var nowRec = me.dbfindtrigger.column.ownerCt.ownerCt.store.getData().getByKey(rec.id);
                             nowRec.set(item.to,record.get(item.from));
                             //me.column.getEditor().setValue(record.get(item.from));

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

@@ -74,17 +74,6 @@ Ext.define('saas.view.core.form.MseeageLog', {
     condition:[],
     initComponent: function() {
         var me = this;
-        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',{
@@ -109,7 +98,17 @@ Ext.define('saas.view.core.form.MseeageLog', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = me.defualtCondition;
+                            condition = [{
+                                type: 'number',
+                                field: 'ml_keyvalue',
+                                operation: '=',
+                                value: me.mlKeyvalue
+                            },{
+                                type: 'string',
+                                field: 'ml_caller',
+                                operation: '=',
+                                value: me.mlCaller
+                            }];
                         }
                         
                         Ext.apply(store.proxy.extraParams, {
@@ -138,7 +137,17 @@ Ext.define('saas.view.core.form.MseeageLog', {
      */
     getCondition: function(items) {
         var me = this,
-        conditions = me.defualtCondition;
+        conditions = [{
+            type: 'number',
+            field: 'ml_keyvalue',
+            operation: '=',
+            value: me.mlKeyvalue
+        },{
+            type: 'string',
+            field: 'ml_caller',
+            operation: '=',
+            value: me.mlCaller
+        }];
         for(var i = 0; i < items.length; i++) {
             var item = items[i];
             var field = item.name,

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

@@ -316,7 +316,6 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             }
         })
         .catch(function(res) {
-            console.error(res);
             showToast('导出失败: ' + res.message);
         });
     },
@@ -325,8 +324,18 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     },onOpenOrder:function(me){
         me.up('grid').vastOperation("batchOpen");
     },
-    onDelete: function (btn) {
-        btn.up('grid').vastOperation("batchDelete");
+    onDelete: function (btns) {
+        var grid = btns.up('grid');
+        var data = grid.getGridSelected();
+        if(data&&data.length>0){
+            warnMsg("是否删除所选单据？",function(btn){
+                if(btn == 'yes'){
+                    grid.vastOperation("batchDelete");
+                }
+            });
+        }else{
+            showToast('请勾选至少一条明细。');
+        }
     },
     vastOperation :function(type){
         var me = this;
@@ -355,6 +364,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             showToast('请勾选至少一条明细。');
         }
     },
+    /** */
     /**
      * 获取grid被选数据
 	 * grid:原始字符串

frontend/saas-web/app/view/core/view/BoundListAdd.js

@@ -250,7 +250,6 @@ Ext.define('saas.view.core.view.BoundListAdd', {
 
     createPagingToolbar: function() {
         var me = this;
-        console.log(me.addHandler);
         return new Ext.Toolbar({
             id: me.id + '-toolbar',
             border: true,

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

@@ -381,7 +381,6 @@ Ext.define('saas.view.document.bom.FormController', {
             }
         })
         .catch(function(res) {
-            console.log(res);
             showToast('关闭失败: ' + res.message);
         });
     }

frontend/saas-web/app/view/document/customer/FormController.js

@@ -58,7 +58,6 @@ Ext.define('saas.view.document.customer.FormController', {
             }
         })
         .catch(function(res) {
-            console.log(res);
             showToast('禁用失败: ' + res.message);
         });
     }

frontend/saas-web/app/view/document/employee/FormModel.js

@@ -3,15 +3,6 @@ Ext.define('saas.view.document.employee.FormModel', {
     alias: 'viewmodel.document-employee-formpanel',
 
     data: {
-        id: 0
-    },
-
-    formulas:{
-        showAuditBtn:{
-            bind:'{id}',
-            get:function(value){
-                return value;
-            }
-        }
+        showAuditBtn:false
     }
 });

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

@@ -146,7 +146,6 @@ Ext.define('saas.view.document.kind.Kind', {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
-                    console.log("format:",format);
                     return Ext.util.Format.number(v, format);
                 },
                 flex: 1
@@ -158,7 +157,6 @@ Ext.define('saas.view.document.kind.Kind', {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                     var format = '0,000.' + xr.join();
-                    console.log("format:",format);
                     return Ext.util.Format.number(v, format);
                 },
                 flex: 1

frontend/saas-web/app/view/document/product/BasePanel.js

@@ -102,20 +102,44 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "总库存数", 
             dataIndex : "po_onhand",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
-            text : "单位成本", 
+            text : "标准单价", 
             dataIndex : "pr_standardprice",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text : "最新采购单价", 
             dataIndex : "pr_purcprice",
-            xtype: 'numbercolumn', 
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }, 
             width : 200.0, 
         }, {
             text : "最新出库单价", 
             dataIndex : "pr_saleprice",
-            xtype: 'numbercolumn', 
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }, 
             width : 200.0, 
         }, {
             text : "型号", 
@@ -129,11 +153,17 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "最小包装", 
             dataIndex : "pr_zxbzs",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text : "L/T", 
             dataIndex : "pr_leadtime",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, {
             text : "状态", 
             dataIndex : "pr_status"

frontend/saas-web/app/view/home/HomeModel.js

@@ -47,7 +47,6 @@ Ext.define('saas.view.home.HomeModel', {
             }],
             listeners: {
                 load: function() {
-                    console.log();
                 }
             }
         },

frontend/saas-web/app/view/main/Main.js

@@ -75,7 +75,6 @@ Ext.define('saas.view.main.Main', {
                             text: '新手导航',
                             iconCls:'x-fa fa-comment-o',
                             handler:function(){
-                               console.log("新手导航");
                                openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
                         },{
@@ -147,14 +146,11 @@ Ext.define('saas.view.main.Main', {
                     } ,
                      listeners:{
                         'mouseover':function(btn){
-                            console.log("btn:",btn);
                             btn.menu ? (btn.menu.isVisible() ? '' : btn.showMenu()) : '';
                         },
                         'mouseout':function(btn,e){
-                            console.log("btn:",btn);
                             window.setTimeout(function(){
                                 var cx = e.browserEvent.clientX, cy = e.browserEvent.clientY;
-                                console.log(btn.el.dom);
                                 var btnLayout = btn.el.dom.getBoundingClientRect();
                                 if(cx <= btnLayout.left || cx >= btnLayout.left+btnLayout.width || cy <= btnLayout.top) {
                                     btn.hideMenu();

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle:'账户资料',
+                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_bankcode'
@@ -24,23 +24,24 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            emptyText : "请输入账户编号或名称", 
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -58,12 +59,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "width": 120,
                             "xtype": ""
                         }, {
-                            "text": "当前余额",
+                            "text": "账户余额",
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
                             xtype: 'numbercolumn',
-                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,
@@ -79,7 +79,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle:'账户资料',
+                        addTitle:'资金账户',
                         dbfinds:[
                         {
                             from:'bk_bankcode',to:'ftd_inbankcode'
@@ -93,23 +93,24 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbSearchFields:[{
-                            xtype : "textfield", 
-                            name: 'name',
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            emptyText:'输入账户编号或名称',
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -121,7 +122,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -132,7 +133,6 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                             "dataIndex": "bk_thisamount",
                             "width": 120,
                             xtype: 'numbercolumn',
-                            align:'end',
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -119,7 +119,8 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        addTitle: '账户资料',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'or_bankcode'
@@ -139,7 +140,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             width: 100
                         }],
                         dbSearchFields: [{
-                            emptyText: '输入银行账户编号或名称',
+                            emptyText: '查找资金账户',
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
@@ -155,7 +156,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "width": 0,
                             "xtype": ""
                         }, {
-                            "text": "账户编号",
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -167,7 +168,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,

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

@@ -108,26 +108,38 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'or_bankcode'
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
                             from:'id',to:'or_bankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbColumns:[{
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -139,7 +151,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -157,7 +169,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                             "width": 120,
                             "xtype": "datecolumn"
                         }]
-                    }) ;   
+                    });
 
                 }
             }

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

@@ -92,7 +92,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        addTitle: '账户资料',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'bk_bankcode',
                             to: 'os_bankcode'
@@ -103,17 +104,6 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             from: 'id',
                             to: 'os_bankid'
                         }],
-                        defaultCondition: "1=1",
-                        dbSearchFields:[{
-                            emptyText:'输入账户编号或名称',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(bk_bankname) like '%"+v.toUpperCase()+"%' or upper(bk_bankcode) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
                         dbtpls: [{
                             field: 'bk_bankcode',
                             width: 100
@@ -121,14 +111,24 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        dbColumns:[{
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -140,7 +140,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -151,7 +151,6 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             "dataIndex": "bk_thisamount",
                             "width": 120,
                             xtype: 'numbercolumn',
-                            align:'end'
                         }, {
                             "text": "建帐日期",
                             "flex": 1,

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

@@ -96,26 +96,38 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                     Ext.apply(f,{
                         conditionCode:'os_bankcode',
                         dataUrl:'/api/document/bankinformation/list',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds:[{
                             from:'bk_bankcode',to:'os_bankcode'
                         },{
                             from:'bk_bankname',to:'os_bankname'
                         },{
                             from:'id',to:'os_bankid'
-                    }],
+                        }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbColumns:[{
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -127,7 +139,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -145,7 +157,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "width": 120,
                             "xtype": "datecolumn"
                         }]
-                    }) ;   
+                    }); 
 
                 }
             }

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

@@ -193,7 +193,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle: '账户资料',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
                             to: 'pd_bankid'
@@ -211,34 +211,53 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        defaultCondition: "1=1",
                         otherConditon:'',
-                        dbSearchFields:[{
-                            emptyText:'输入账户名称或者编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            allowBlank : true,
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
-                            "text": "账户id",
-                            "hidden": true,
+                        dbColumns: [{
+                            "text": "账户ID",
+                            "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "账户编号",
+                            "xtype": ""
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100
+                            "width": 120,
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "width": 100
+                            "width": 150,
+                            "xtype": ""
+                        }, {
+                            "text": "账户类别",
+                            "flex": 1,
+                            "dataIndex": "bk_type",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            xtype: 'numbercolumn',
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     });
 

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

@@ -273,8 +273,8 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/bankinformation/list',
-                        // addXtype: 'document-banksubledger-formpanel',
-                        addTitle: '账户资料',
+                        addXtype: 'other-bankinformation',
+                        addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
                             to: 'rd_bankid'
@@ -292,33 +292,52 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field: 'bk_bankname',
                             width: 100
                         }],
-                        defaultCondition: "1=1",
-                        dbSearchFields:[{
-                            emptyText:'输入账户名称或者编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            allowBlank : true,
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
-                            "text": "账户id",
-                            "hidden": true,
+                        dbColumns: [{
+                            "text": "账户ID",
+                            "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "账户编号",
+                            "xtype": ""
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
-                            "width": 100
+                            "width": 120,
+                            "xtype": ""
                         }, {
                             "text": "账户名称",
                             "flex": 1,
                             "dataIndex": "bk_bankname",
-                            "width": 100
+                            "width": 150,
+                            "xtype": ""
+                        }, {
+                            "text": "账户类别",
+                            "flex": 1,
+                            "dataIndex": "bk_type",
+                            "width": 120,
+                            "xtype": ""
+                        }, {
+                            "text": "账户余额",
+                            "flex": 1,
+                            "dataIndex": "bk_thisamount",
+                            "width": 120,
+                            xtype: 'numbercolumn',
+                        }, {
+                            "text": "建帐日期",
+                            "flex": 1,
+                            "dataIndex": "bk_date",
+                            "width": 120,
+                            "xtype": "datecolumn"
                         }]
                     });
 

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

@@ -9,7 +9,7 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                     Ext.apply(f,{
                         dataUrl:'/api/document/bankinformation/list',
                         addXtype: 'other-bankinformation',
-                        addTitle:'账户资料',
+                        addTitle: '资金账户',
                         dbfinds:[
                             {
                                 from:'bk_bankname',to:'bankname'
@@ -19,23 +19,24 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
-                        dbSearchFields:[{
-                            xtype : "textfield",
-                            name: 'name',
-                            getCondition: function(v) {
+                        dbSearchFields: [{
+                            emptyText: '查找资金账户',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
                                 return "(upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%')";
                             },
-                            emptyText : "请输入账户编号或名称",
-                            columnWidth : 0.25
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
-                        dbColumns:[{
+                        dbColumns: [{
                             "text": "账户ID",
                             "flex": 0,
                             "dataIndex": "id",
                             "width": 0,
                             "xtype": ""
-                        },{
-                            "text": "账户编号",
+                        }, {
+                            "text": "资金账户",
                             "flex": 1,
                             "dataIndex": "bk_bankcode",
                             "width": 120,
@@ -47,7 +48,7 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                             "width": 150,
                             "xtype": ""
                         }, {
-                            "text": "账户类型",
+                            "text": "账户类别",
                             "flex": 1,
                             "dataIndex": "bk_type",
                             "width": 120,
@@ -57,7 +58,6 @@ Ext.define('saas.view.money.report.AccountBalanceController', {
                             "flex": 1,
                             "dataIndex": "bk_thisamount",
                             "width": 120,
-                            align:'end',
                             xtype: 'numbercolumn',
                         }, {
                             "text": "建帐日期",

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

@@ -122,7 +122,6 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
                 var format = '0,000.' + xr.join();
-                console.log("format:",format);
                 return Ext.util.Format.number(v, format);
             }
         }, {

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

@@ -410,7 +410,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         mm_whname:item.productDTO.pr_whname
                     })                
                 });
-                console.log(loadData);
                 store.loadData(loadData);
             }
         })