报表放大镜，出入库、资金查询界面关闭按钮去除

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

@@ -24,9 +24,8 @@ Ext.define('saas.view.core.report.ReportPanel', {
 
     initComponent: function() {
         var me = this;
-
         var store = me.initStore();
-
+        columnWidth: 0.25,
         Ext.apply(me, {
             items: [{
                 xtype: 'form',
@@ -40,7 +39,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 },
                 items: me.initSearchItems().concat([{
                     xtype: 'container',
-                    columnWidth: 0.5,
+                    columnWidth: me.QueryWidth || 0.5,
                     items: [{
                         xtype: 'button',
                         text: '查询',

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.money.fundtransfer.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.money-fundtransfer-querypanel'
-
+    alias: 'viewmodel.money-fundtransfer-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.money.othreceipts.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.money-othreceipts-querypanel'
-
+    alias: 'viewmodel.money-othreceipts-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.money.othspendings.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.money-othspendings-querypanel'
-
+    alias: 'viewmodel.money-othspendings-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.money.paybalance.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.money-paybalance-querypanel'
-
+    alias: 'viewmodel.money-paybalance-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -1,5 +1,7 @@
 Ext.define('saas.view.money.recBalance.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.money-recbalance-querypanel'
-
+    alias: 'viewmodel.money-recbalance-querypanel',
+    data: {
+        closeEnable:false
+    }
 });

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

@@ -69,7 +69,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
     }, {
         xtype: 'multicombo',
         name: 'pu_acceptstatuscode',
-        fieldLabel: '入库状态',
+        fieldLabel: '业务状态',
         datas: [
             ["TURNIN", "已入库"],
             ["UNTURNIN", "未入库"],

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

@@ -11,12 +11,29 @@ Ext.define('saas.view.purchase.report.Purchase', {
     listUrl: '/api/purchase/purchase/list',
     defaultCondition: null,
     reportTitle: '采购明细报表',
-
-    searchItems: [{
+    QueryWidth:0.25,
+    //筛选：供应商、日期（必填）、业务状态			
+    searchItems: [ {
+        xtype: 'dbfindtrigger',
+        name: 'pu_vendname',
+        fieldLabel: '供应商名称',
+        columnWidth: 0.25
+    }, {
         xtype: 'condatefield',
         name: 'pu_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.5
+        columnWidth: 0.25
+    }, {
+        xtype: 'multicombo',
+        name: 'pu_acceptstatuscode',
+        fieldLabel: '业务状态',
+        columnWidth: 0.25,
+        datas: [
+            ["TURNIN", "已入库"],
+            ["UNTURNIN", "未入库"],
+            ["PART2IN", "部分入库"],
+            ["CLOSE", "已关闭"]
+        ]
     }],
 
     reportColumns: [

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

@@ -1,4 +1,80 @@
 Ext.define('saas.view.purchase.report.PurchaseController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'controller.purchase-report-purchase'
+    alias: 'controller.purchase-report-purchase',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pu_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds:[{
+                            from:'ve_code',to:'pu_vendcode'
+                        },{
+                            from:'ve_name',to:'pu_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "供应商ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "供应商编号",
+                            "dataIndex": "ve_code",
+                            "width": 200
+                        }, {
+                            "text": "供应商名称",
+                            "dataIndex": "ve_name",
+                            "width": 200
+                        }, {
+                            "text": "供应商类型",
+                            "dataIndex": "ve_type",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "税率",
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "dataIndex": "ve_bankaccount",
+                            "width": 150
+                        }, {
+                            "text": "开户银行",
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+    }
 });

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

@@ -11,15 +11,13 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     listUrl: '/api/money/paybalance/list',
     defaultCondition: null,
     reportTitle: '采购付款一览表',
-
-    searchItems: [{
+    QueryWidth:0.25,
+    searchItems: [
+    {
         xtype: 'dbfindtrigger',
-        name: 'pu_vendcode',
-        fieldLabel: '供应商编号'
-    }, {
-        xtype: 'textfield',
         name: 'pu_vendname',
-        fieldLabel: '供应商名称'
+        fieldLabel: '供应商名称',
+        columnWidth: 0.25
     }, {
         xtype: 'condatefield',
         name: 'pu_date',

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

@@ -1,4 +1,80 @@
 Ext.define('saas.view.purchase.report.PurchasePayController', {
     extend: 'saas.view.core.report.ReportPanelController',
-    alias: 'controller.purchase-report-purchasepay'
+    alias: 'controller.purchase-report-purchasepay',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=pu_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        dbfinds:[{
+                            from:'ve_code',to:'pu_vendcode'
+                        },{
+                            from:'ve_name',to:'pu_vendname'
+                        }],
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "供应商ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "供应商编号",
+                            "dataIndex": "ve_code",
+                            "width": 200
+                        }, {
+                            "text": "供应商名称",
+                            "dataIndex": "ve_name",
+                            "width": 200
+                        }, {
+                            "text": "供应商类型",
+                            "dataIndex": "ve_type",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "税率",
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "dataIndex": "ve_bankaccount",
+                            "width": 150
+                        }, {
+                            "text": "开户银行",
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
+                        }]
+                    }) ;   
+
+                }
+            }
+        });
+    }
 });

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.sale.report.Sale', {
     extend: 'saas.view.core.report.ReportPanel',
-    xtype: 'purchase-report-sale',
+    xtype: 'sale-report-sale',
 
     controller: 'sale-report-sale',
     viewModel: 'sale-report-sale',
@@ -11,19 +11,18 @@ Ext.define('saas.view.sale.report.Sale', {
     listUrl: '/api/sale/sale/list',
     defaultCondition: null,
     reportTitle: '销售明细报表',
-
-    searchItems: [{
-        xtype: 'dbfindtrigger',
-        name: 'pu_vendcode',
-        fieldLabel: '供应商编号'
-    }, {
-        xtype: 'hidden',
-        name: 'sa_custcode',
-        fieldLabel: '客户编号'
-    }, {
+    QueryWidth:0.25,
+    searchItems: [
+    {
         xtype: 'dbfindtrigger',
         name: 'sa_custname',
-        fieldLabel: '客户名称'
+        fieldLabel: '客户名称',
+        columnWidth: 0.25
+    }, {
+        xtype: 'condatefield',
+        name: 'sa_date',
+        fieldLabel: '单据日期',
+        columnWidth: 0.25
     }, {
         xtype: 'multicombo',
         name: 'sa_sendstatuscode',

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

@@ -11,8 +11,13 @@ Ext.define('saas.view.sale.report.SaleIn', {
     listUrl: '/api/money/recbalance/list',
     defaultCondition: null,
     reportTitle: '销售收款报表',
-
-    searchItems: [{
+    QueryWidth:0.25,
+    searchItems: [{//筛选：客户、日期	
+        xtype: 'dbfindtrigger',
+        name: 'sa_custname',
+        fieldLabel: '客户',
+        columnWidth: 0.25
+    }, {
         xtype: 'condatefield',
         name: 'rb_date',
         fieldLabel: '日期',

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

@@ -1,6 +1,6 @@
 Ext.define('saas.view.sale.report.SaleProfit', {
     extend: 'saas.view.core.report.ReportPanel',
-    xtype: 'purchase-report-saleprofit',
+    xtype: 'sale-report-saleprofit',
 
     controller: 'sale-report-saleprofit',
     viewModel: 'sale-report-saleprofit',
@@ -11,31 +11,23 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     listUrl: '/api/sale/sale/list',
     defaultCondition: null,
     reportTitle: '销售毛利润表',
-//筛选：客户、物料、时间		
+//筛选：客户、物料、时间	
+    QueryWidth:0.25, 	
     searchItems: [{
         xtype: 'dbfindtrigger',
-        name: 'pu_vendcode',
-        fieldLabel: '供应商编号'
-    }, {
-        xtype: 'hidden',
-        name: 'sa_custcode',
-        fieldLabel: '客户编号'
+        name: 'sa_custname',
+        fieldLabel: '客户',
+        columnWidth: 0.25
     }, {
         xtype: 'dbfindtrigger',
+        name: 'sd_prodcode',
+        fieldLabel: '物料',
+        columnWidth: 0.25
+    }, {
+        xtype: 'condatefield',
         name: 'sa_custname',
-        fieldLabel: '客户名称'
-    }, {
-        xtype: 'multicombo',
-        name: 'sa_sendstatuscode',
-        fieldLabel: '业务状态',
-        allowBlank: true,
-        columnWidth: 0.25,
-        datas: [
-            ["TURNOUT", "已出库"],
-            ["UNTURNOUT", "未出库"],
-            ["PARTOUT", "部分出库"],
-            ["CLOSE", "已关闭"]
-        ]
+        fieldLabel: '时间',
+        columnWidth: 0.25
     }],
 
     reportColumns: [

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

@@ -1,5 +1,8 @@
 Ext.define('saas.view.sale.saleIn.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.sale-salein-querypanel'
+    alias: 'viewmodel.sale-salein-querypanel',
+    data: {
+        closeEnable:false
+    }
 
 });

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

@@ -1,4 +1,7 @@
 Ext.define('saas.view.sale.saleout.QueryPanelModel', {
     extend: 'saas.view.core.query.QueryPanelModel',
-    alias: 'viewmodel.sale-saleout-querypanel'
+    alias: 'viewmodel.sale-saleout-querypanel',
+    data: {
+        closeEnable:false
+    }
 });