Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -2,6 +2,10 @@ Ext.define('saas.view.core.form.SettingWin', {
     extend: 'Ext.window.Window',
     xtype: 'settingwin',
 
+    requires: [
+        'Ext.grid.plugin.DragDrop'
+    ],
+
     controller: 'settingwin',
 
     cls: 'x-window-dbfind x-setting-win',

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

@@ -272,7 +272,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 beforeload: function (store, op) {
                     var condition = me.getConditions(),
                         defaultCondition = me.defaultCondition,
-                        summarys = me.summarys;
+                        summarys = me.removeSummarys ? '' : JSON.stringify(me.summarys);
 
                     if (defaultCondition) {
                         condition.push({
@@ -286,7 +286,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         size: store.exportPageSize ? store.exportPageSize : store.pageSize,
                         mode: me.queryMode || 'DETAIL',
                         condition: JSON.stringify(condition),
-                        calculateFields: JSON.stringify(summarys)
+                        calculateFields: summarys
                     });
                     Ext.apply(store.proxy.extraParams, params);
 

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

@@ -150,7 +150,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 }, {
                     text: "结算方式",
                     dataIndex: "pd_paymethod",
-                    width: 200.0,
+                    width: 150.0,
                     editor: {
                         xtype: 'combo',
                         queryMode: 'local',
@@ -185,7 +185,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 }, {
                     text: "结算号",
                     dataIndex: "pd_paycode",
-                    width: 150.0,
                     editor: {
                         xtype: 'textfield'
                     }

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

@@ -32,17 +32,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 fieldLabel: '日期',
                 columnWidth: 0.5,
                 operation: 'between'
-            }/*,  {
-                xtype: 'textfield',
-                name: 'pbd_slcode',
-                fieldLabel: '来源单号',
-                showDetail: true
-            } ,{
-                xtype:'textfield',
-                name:'pbd_slkind',
-                fieldLabel: '业务类型',
-                showDetail: true
-            }*/, {
+            }, {
                 xtype: 'accountDbfindTrigger',
                 name: 'creatorName',
                 fieldLabel: '录入人',
@@ -59,6 +49,12 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 name: 'pb_auditman',
                 fieldLabel: '审核人',
                 emptyText:'请输入账户名称或姓名'
+            }, {
+                xtype: 'bandinfoDbfindTrigger',
+                name: 'pd_bankcode',
+                fieldLabel: '资金账户',
+                emptyText:'请输入资金账户名称或姓名',
+                showDetail: true
             }],
             moreQueryFormItems: [],
             queryGridConfig: {
@@ -78,12 +74,12 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                     }, {
                         text: '付款单号',
                         dataIndex: 'pb_code',
-                        width: 130
+                        width: 150
                     }, {
-                        text: '日期',
+                        text: '单据日期',
                         dataIndex: 'pb_date',
                         xtype: 'datecolumn',
-                        width: 100
+                        width: 110
                     }, {
                         text: '供应商名称',
                         dataIndex: 'pb_vendname',
@@ -92,7 +88,15 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                         text: '单据状态',
                         align: 'center',
                         dataIndex: 'pb_status',
-                        width: 90
+                        width: 80
+                    }, {
+                        text: '付款金额(元)',
+                        xtype: 'numbercolumn',
+                        dataIndex: 'pd_amount',
+                        width: 120,
+                        renderer: function (v) {
+                            return saas.util.BaseUtil.numberFormat(v, 2, true);
+                        },
                     }, {
                         text: '付款人',
                         dataIndex: 'pb_manname',
@@ -110,12 +114,12 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 }, {
                     text: '付款单号',
                     dataIndex: 'pb_code',
-                    width: 130
+                    width: 150
                 }, {
-                    text: '日期',
+                    text: '单据日期',
                     dataIndex: 'pb_date',
                     xtype: 'datecolumn',
-                    width: 100
+                    width: 110
                 }, {
                     text: '供应商名称',
                     dataIndex: 'pb_vendname',
@@ -124,15 +128,15 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                     text: '单据状态',
                     align: 'center',
                     dataIndex: 'pb_status',
-                    width: 90
+                    width: 80
                 }, {
                     text: '付款人',
                     dataIndex: 'pb_manname',
-                    width: 110
+                    width: 80
                 },{
                     text: '资金账户',
                     dataIndex: 'pd_bankname',
-                    width: 110
+                    width: 150
                 },{
                     text: '付款金额(元)',
                     xtype: 'numbercolumn',
@@ -144,11 +148,11 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
                 } ,{
                     text: '结算方式',
                     dataIndex: 'pd_paymethod',
-                    width: 100
+                    width: 120
                 },{
                     text: '结算号',
                     dataIndex: 'pd_paycode',
-                    width: 100
+                    width: 120
                 },{
                     text: '备注',
                     dataIndex: 'pd_remark',

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

@@ -31,6 +31,18 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         }],
                     });
                 }
+            },'bandinfoDbfindTrigger[name=pd_bankcode]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id', to: 'pd_bankid',ignore:true
+                        }, {
+                            from:'bk_bankcode', to:'pd_bankcode'
+                        },{
+                            from:'bk_bankname', to:'pd_bankcode'
+                        }],
+                    });
+                }
             }
         });
 

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

@@ -41,6 +41,12 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 name: 'rb_auditman',
                 fieldLabel: '审核人',
                 emptyText: '请输入账户名称或姓名'
+            }, {
+                xtype: 'bandinfoDbfindTrigger',
+                name: 'rd_bankname',
+                fieldLabel: '资金账户',
+                emptyText:'请输入资金账户名称或姓名',
+                showDetail: true
             }],
             moreQueryFormItems: [],
             queryGridConfig: {
@@ -60,25 +66,32 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 }, {
                     text: '收款单号',
                     dataIndex: 'rb_code',
-                    width: 130
+                    width: 150
                 }, {
-                    text: '日期',
+                    text: '单据日期',
                     dataIndex: 'rb_date',
                     xtype: 'datecolumn',
-                    width: 100
+                    width: 110
                 }, {
                     text: '客户名称',
                     dataIndex: 'rb_custname',
                     width: 200,
                 }, {
-                    text: '单据状态',
+                    text: '审核状态',
                     align: 'center',
                     dataIndex: 'rb_status',
                     width: 80
+                }, {
+                    text: '收款金额(元)',
+                    dataIndex: 'rb_amount',
+                    width: 120,
+                    renderer : function(v) {
+                        return saas.util.BaseUtil.numberFormat(v, 2, true);
+                    }
                 }, {
                     text: '收款人',
                     dataIndex: 'rb_manname',
-                    width: 110
+                    width: 80
                 }, {
                     text: '备注',
                     dataIndex: 'rb_remark',
@@ -93,48 +106,48 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
                 }, {
                     text: '收款单号',
                     dataIndex: 'rb_code',
-                    width: 130
+                    width: 150
                 }, {
-                    text: '日期',
+                    text: '单据日期',
                     dataIndex: 'rb_date',
                     xtype: 'datecolumn',
-                    width: 100
-                }, {
-                    text: '单据状态',
-                    align: 'center',
-                    dataIndex: 'rb_status',
-                    width: 80
+                    width: 110
                 }, {
                     text: '客户名称',
                     dataIndex: 'rb_custname',
                     width: 200,
+                }, {
+                    text: '审核状态',
+                    align: 'center',
+                    dataIndex: 'rb_status',
+                    width: 80
                 }, {
                     text: '收款人',
                     dataIndex: 'rb_manname',
-                    width: 100
+                    width: 80
                 }, {
                     text: '资金账户',
                     dataIndex: 'rd_bankname',
-                    width: 100
+                    width: 150
                 }, {
                     text: '收款金额(元)',
                     xtype: 'numbercolumn',
                     dataIndex: 'rd_amount',
-                    width: 100,
+                    width: 120,
                     renderer: function (v) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
                 }, {
                     text: '结算方式',
                     dataIndex: 'rd_paymethod',
-                    width: 90
+                    width: 120
                 }, {
                     text: '结算号',
                     dataIndex: 'rd_paycode',
-                    width: 90
+                    width: 120
                 }, {
                     text: '备注',
-                    dataIndex: 'rb_remark',
+                    dataIndex: 'rd_remark',
                     width: 250
                 }]
             }

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

@@ -31,6 +31,18 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                         }],
                     });
                 }
+            },'bandinfoDbfindTrigger[name=rd_bankname]':{
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id', to: 'rd_bankid',ignore:true
+                        }, {
+                            from:'bk_bankcode', to:'rd_bankcode'
+                        },{
+                            from:'bk_bankname', to:'rd_bankname'
+                        }],
+                    });
+                }
             }
         });
 

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

@@ -11,25 +11,22 @@ Ext.define('saas.view.stock.report.DataList', {
     listUrl: '/api/document/product/ReserveCost',
     defaultCondition: null,
     reportTitle: '物料库存数量金额表',
-    QueryWidth: 0.65,
+    QueryWidth: 0.4,
     printAble: false,
     exportAble: true,
     queryMode: 'MAIN',
 
     searchItems: [{
-        name: 'pr_code',
-        xtype: 'textfield',
+        xtype: 'productDbfindTrigger',
+        name: 'pr_detail',
         emptyText: '请输入物料编号、名称或规格',
-        columnWidth: 0.25,
-        getCondition: function (v) {
-            return "(upper(pr_spec) like '%" + v.toUpperCase() + "%' or upper(pr_code) like '%" + v.toUpperCase() + "%' or upper(pr_detail) like '%" + v.toUpperCase() + "%')";
-        },
+        columnWidth: 0.25
     }, {
-        name: 'wh_code',
-        xtype: 'textfield',
+        xtype: 'warehouseDbfindTrigger',
+        name: 'wh_description',
         emptyText: '请输入仓库编号或名称',
+        hidden:true,
         columnWidth: 0.25,
-        hidden: true,
         getCondition: function (v) {
             return "(upper(wh_code) like '%" + v.toUpperCase() + "%' or upper(wh_description) like '%" + v.toUpperCase() + "%')";
         }

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

@@ -1,7 +1,44 @@
 Ext.define('saas.view.stock.report.DataListController', {
     extend: 'saas.view.core.report.ReportPanelController',
     alias: 'controller.stock-report-datalist',
+    init: function (form) {
+        var me = this;
+        this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'productDbfindTrigger[name=pr_detail]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'pr_code',to:'pd_prodcode'                          
+                        },{
+                            from:'pr_detail',to:'pr_detail'
+                        },{
+                            from:'pr_spec',to:'pr_spec'
+                        },{
+                            from: 'pr_brand', to: 'pr_brand'
+                        },{
+                            from: 'pr_orispeccode', to: 'pr_orispeccode'
+                        },{
+                            from: 'pr_unit', to: 'pr_unit'
+                        }],
+                    });   
+                }
+            },
+            //放大镜赋值关系 以及 tpl模板
+            'warehouseDbfindTrigger[name=wh_description]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'wh_code',to:'wh_code'                          
+                        },{
+                            from:'wh_description',to:'wh_description'
+                        }],
+                    }) ;   
 
+                }
+            }
+        });
+    },
     toggle_change: function(field, newValue, oldValue, eOpts) {
         var me = this,
         reportPanel = me.getView(),
@@ -11,7 +48,6 @@ Ext.define('saas.view.stock.report.DataListController', {
         mySummaryBar = grid.query('#mysummaryBar')[0],
         toggleColumns = [],
         store = grid.store;
-
         for(var x = 0; x < columns.length; x++) {
             var c = columns[x];
             if(c.toggle) {
@@ -19,7 +55,7 @@ Ext.define('saas.view.stock.report.DataListController', {
             }
         }
         
-        var whCodeField = form.getForm().findField('wh_code');
+        var whCodeField = form.getForm().findField('wh_description');
         var con = form.items.items[3];
 
         whCodeField.setValue('');
@@ -28,9 +64,11 @@ Ext.define('saas.view.stock.report.DataListController', {
         if(newValue) {
             con.columnWidth = 0.4;
             reportPanel.queryMode = 'DETAIL';
+            reportPanel.removeSummarys = true;
         }else {
             con.columnWidth = 0.65;
             reportPanel.queryMode = 'MAIN';
+            reportPanel.removeSummarys = false;
         }
         mySummaryBar.setHidden(newValue);