Browse Source

放大镜调整

zhuth 7 years ago
parent
commit
667b9b060c

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

@@ -6,22 +6,27 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
         this.control({
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=os_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
-                        dbfinds:[{
-                            from:'id',to:'os_vendid'
-                        },{
-                            from:'ve_code',to:'os_vendcode'
-                        },{
-                            from:'ve_name',to:'os_vendname'
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'os_vendid'
+                        }, {
+                            from: 've_code',
+                            to: 'os_vendcode'
+                        }, {
+                            from: 've_name',
+                            to: 'os_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
+                        dbtpls: [{
+                            field: 've_code',
+                            width: 100
+                        }, {
+                            field: 've_name',
+                            width: 100
                         }],
                         defaultCondition: "ve_statuscode='OPEN'",
                         dbSearchFields:[{
@@ -82,7 +87,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "dataIndex": "ve_bankcode",
                             "width": 100
                         }]
-                    }) ;   
+                    });
 
                 }
             },

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

@@ -7,23 +7,24 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         this.control({
             // 供应商名称
             'dbfindtrigger[name=pb_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
-                        //赋值 
-                        dbfinds:[{
-                            from:'ve_code',to:'pd_vendcode'
-                        },{
-                            from:'ve_name',to:'pb_vendname'
+                        dbfinds: [{
+                            from: 've_code',
+                            to: 'pd_vendcode'
+                        }, {
+                            from: 've_name',
+                            to: 'pb_vendname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
+                        dbtpls: [{
+                            field: 've_code',
+                            width: 100
+                        }, {
+                            field: 've_name',
+                            width: 100
                         }],
                         defaultCondition: "ve_statuscode='OPEN'",
                         dbSearchFields:[{
@@ -36,71 +37,55 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25
                         }],
-                        //放大镜窗口列表
                         dbColumns:[{
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
-                            "width": 50,
-                            "xtype": "",
+                            "width": 200,
                             "items": null
-                        },{
+                        }, {
                             "text": "税率",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "ve_taxrate",
-                            "width": 50,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "承付天数",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "ve_promisedays",
-                            "width": 50,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "纳税人识别号",
-                            "flex": 0,
-                            "dataIndex": "ve_nsrzh",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
                             "text": "开户银行",
-                            "flex": 0,
-                            "dataIndex": "ve_bankcode",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "银行账户",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "ve_bankaccount",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
-                    }) ;   
+                    });
 
                 }
             },

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -27,37 +27,49 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field:'cu_name',width:100
                         }],
                         defaultCondition: 'cu_statuscode="OPEN"',
-                        //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入客户编号或名称',
-                            name : "cu_name", 
+                            xtype : "textfield", 
+                            name : "search", 
                             getCondition: function(v) {
                                 return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
-                            fieldLabel : "客户名称", 
+                            allowBlank : true, 
                             columnWidth : 0.25
                         }],
                         //放大镜窗口列表
                         dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
+                            "text": "客户ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
-                            "text": "供应商编号",
-                            "flex": 1,
+                            "text": "客户编号",
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
-                            "text": "供应商名称",
-                            "flex": 1,
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -98,25 +110,37 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         }],
                         //放大镜窗口列表
                         dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
+                            "text": "客户ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
-                            "text": "供应商编号",
-                            "flex": 1,
+                            "text": "客户编号",
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
-                            "text": "供应商名称",
-                            "flex": 1,
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

+ 28 - 15
frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -40,37 +40,50 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dbColumns:[{
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
                             "text": "供应商编号",
+                            "flex": 1,
                             "dataIndex": "ve_code",
+                            "width": 100
                         }, {
                             "text": "供应商名称",
+                            "flex": 1,
                             "dataIndex": "ve_name",
+                            "width": 100
                         }, {
                             "text": "供应商类型",
+                            "flex": 0,
                             "dataIndex": "ve_type",
-                        },{
+                            "width": 200,
+                            "items": null
+                        }, {
                             "text": "税率",
+                            "flex": 1,
                             "dataIndex": "ve_taxrate",
-                            "width": 80,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "承付天数",
+                            "flex": 1,
                             "dataIndex": "ve_promisedays",
-                            "width": 80,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "纳税人识别号",
-                            "dataIndex": "ve_nsrzh",
-                        },{
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
                             "text": "开户银行",
-                            "dataIndex": "ve_bankcode",
-                        },{
-                            "text": "银行账户",
+                            "flex": 1,
                             "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

+ 30 - 14
frontend/saas-web/app/view/purchase/purchase/QueryPanelController.js

@@ -34,36 +34,52 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -45,36 +45,52 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -44,36 +44,52 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -43,36 +43,52 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -94,9 +110,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             from:'cu_name',to:'pi_custname'
                         }],
                         dbtpls:[{
-                            field:'pi_custcode',width:100
+                            field:'cu_code',width:100
                         },{
-                            field:'pi_custname',width:100
+                            field:'cu_name',width:100
                         }],
                         defaultCondition:"cu_statuscode='OPEN'",
                         //放大镜窗口字段
@@ -112,54 +128,36 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         }],
                         dbColumns:[{
                             "text": "客户ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "客户编号",
-                            "flex": 1,
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
                             "text": "客户名称",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 200
                         },{
                             "text": "客户类型",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "业务员",
-                            "flex": 1,
                             "dataIndex": "cu_sellername",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "税率",
-                            "flex": 1,
                             "dataIndex": "cu_taxrate",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "承付天数",
-                            "flex": 1,
                             "dataIndex": "cu_promisedays",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "额度",
-                            "flex": 1,
                             "dataIndex": "cu_credit",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -38,36 +38,52 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -112,54 +128,36 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         }],
                         dbColumns:[{
                             "text": "客户ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "客户编号",
-                            "flex": 1,
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
                             "text": "客户名称",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 200
                         },{
                             "text": "客户类型",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "业务员",
-                            "flex": 1,
                             "dataIndex": "cu_sellername",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "税率",
-                            "flex": 1,
                             "dataIndex": "cu_taxrate",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "承付天数",
-                            "flex": 1,
                             "dataIndex": "cu_promisedays",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "额度",
-                            "flex": 1,
                             "dataIndex": "cu_credit",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }]
                     });
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -38,36 +38,52 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             }
                         }],                        
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -89,9 +105,9 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             from:'cu_name',to:'pi_custname'
                         }],
                         dbtpls:[{
-                            field:'pi_custcode',width:100
+                            field:'cu_code',width:100
                         },{
-                            field:'pi_custname',width:100
+                            field:'cu_name',width:100
                         }],
                         defaultCondition:"pi_statuscode='OPEN'",
                         //放大镜窗口字段
@@ -107,54 +123,36 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         }],
                         dbColumns:[{
                             "text": "客户ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "客户编号",
-                            "flex": 1,
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
                             "text": "客户名称",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 200
                         },{
                             "text": "客户类型",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "业务员",
-                            "flex": 1,
                             "dataIndex": "cu_sellername",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "税率",
-                            "flex": 1,
                             "dataIndex": "cu_taxrate",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "承付天数",
-                            "flex": 1,
                             "dataIndex": "cu_promisedays",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "额度",
-                            "flex": 1,
                             "dataIndex": "cu_credit",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -22,37 +22,64 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        defaultCondition:"ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            allowBlank : true, 
+                            columnWidth : 0.25,
+                            getCondition:function(v){
+                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
+                            }
+                        }],  
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;