【多币别】【采购、销售界面列表关于币别调整】

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -66,7 +66,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         xtype:'numbercolumn',
         dataIndex: "cr_rate",
         width:80
-    },, {
+    }, {
         text: "业务员编号",
         dataIndex: "cu_sellercode",
         width:150,

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

@@ -9,62 +9,6 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
             'dbfindtrigger[name=pb_vendname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dbColumns:[{
-                            text: "供应商ID",
-                            hidden: true,
-                            dataIndex: "id",
-                            xtype: "numbercolumn"
-                        },{
-                            text: "供应商编号",
-                            dataIndex: "ve_code",
-                            width: 150
-                        }, {
-                            text: "供应商名称",
-                            dataIndex: "ve_name",
-                            width: 200
-                        }, {
-                            text: "供应商类型",
-                            dataIndex: "ve_type",
-                            width: 110,
-                        }, {
-                            text: "税率(%)",
-                            dataIndex: "ve_taxrate",
-                            width: 80,
-                            xtype: 'numbercolumn',
-                            align:'end',
-                            renderer : function(v, m, r) {
-                                return saas.util.BaseUtil.numberFormat(v, 2, false);
-                            }
-                        }, {
-                            text: "应付款余额",
-                            dataIndex: "ve_leftamount",
-                            width:110,
-                            xtype: 'numbercolumn',
-                            renderer : function(v, m, r) {
-                                return saas.util.BaseUtil.numberFormat(v, 2, true);
-                            }
-                        },{
-                            text: "结算天数",
-                            dataIndex: "ve_promisedays",
-                            width: 110,
-                            xtype: 'numbercolumn',
-                            align: 'end',
-                            renderer : function(v, m, r) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            text: "纳税人识别号",
-                            dataIndex: "ve_nsrzh",
-                            width: 150
-                        }, {
-                            text: "开户银行",
-                            dataIndex: "ve_bankcode",
-                            width: 150
-                        }, {
-                            text: "银行账户",
-                            dataIndex: "ve_bankaccount",
-                            width: 200
-                        }],
                         dbfinds: [{
                             from: 've_code',
                             to: 'pb_vendcode'

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

@@ -9,72 +9,6 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dbColumns: [{
-                            conditionCode: 'id',
-                            text: "客户ID",
-                            dataIndex: "id",
-                            hidden:true,
-                            xtype: "",
-                        }, {
-                            conditionCode: 'cu_code',
-                            text: "客户编号",
-                            dataIndex: "cu_code",
-                            width: 150,
-                            xtype: "",
-                        }, {
-                            conditionCode: 'cu_name',
-                            text: "客户名称",
-                            dataIndex: "cu_name",
-                            width: 200,
-                            xtype: "",
-                        }, {
-                            conditionCode: 'cu_type',
-                            text: "客户类型",
-                            dataIndex: "cu_type",
-                            width: 110,
-                            xtype: "",
-                        }, {
-                            text: "业务员编号",
-                            dataIndex: "cu_sellercode",
-                            width:110
-                        }, {
-                            text: "业务员",
-                            dataIndex: "cu_sellername",
-                            width:110
-                        }, {
-                            text: "税率(%)",
-                            dataIndex: "cu_taxrate",
-                            xtype: 'numbercolumn',
-                            width:80,
-                            renderer: function(v, m, r) {
-                                return saas.util.BaseUtil.numberFormat(v, 2, false);
-                            }
-                        },{
-                            text: "应收款余额",
-                            dataIndex: "cu_leftamount",
-                            width:110,
-                            xtype: 'numbercolumn',
-                            renderer : function(v, m, r) {
-                                return saas.util.BaseUtil.numberFormat(v, 2, true);
-                            }
-                        }, {
-                            text: "结算天数",
-                            dataIndex: "cu_promisedays",
-                            width:110,
-                            xtype: 'numbercolumn',
-                            renderer: function(v, m, r) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            text: "额度",
-                            dataIndex: "cu_credit",
-                            width:110,
-                            xtype: 'numbercolumn',
-                        }, {
-                            text: "客户地址",
-                            dataIndex: "ca_address",
-                            width: 250
-                        }],
                         //赋值 
                         dbfinds:[{
                             from: 'id', to: 'rb_custid',ignore:true

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

@@ -43,6 +43,29 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 name: "pu_vendname",
                 fieldLabel: "供应商名称",
                 allowBlank: false,
+                columnWidth: 0.5
+            }, {
+                xtype: 'condbfindtrigger',
+                fieldLabel: '币别汇率',
+                allowBlank: false,
+                dbType: 'currencyDbfindTrigger',
+                dbfinds: [{
+                    from: 'cr_name', to: 'pu_currency'
+                }, {
+                    from: 'cr_rate', to: 'pu_rate'
+                }],
+                defaultValue: {
+                    pu_currency: 'RMB',
+                    pu_rate: 1
+                },
+                supFieldConfig: {
+                    xtype: 'numberfield',
+                    readOnly: false,
+                    defaultReadOnly: false,
+                    defaultValue: 1,
+                    decimalPrecision: 6,
+                    vtype: 'positiveNumber'
+                }
             }, {
                 xtype: "datefield",
                 name: "pu_delivery",
@@ -73,40 +96,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     });
                     this.dialog.show();
                 }
-            }, {
-                xtype: 'condbfindtrigger',
-                fieldLabel: '币别汇率',
-                allowBlank: false,
-                dbType: 'currencyDbfindTrigger',
-                dbfinds: [{
-                    from: 'cr_name', to: 'pu_currency'
-                }, {
-                    from: 'cr_rate', to: 'pu_rate'
-                }],
-                defaultValue: {
-                    pu_currency: 'RMB',
-                    pu_rate: 1
-                },
-                supFieldConfig: {
-                    xtype: 'numberfield',
-                    readOnly: false,
-                    defaultReadOnly: false,
-                    defaultValue: 1,
-                    decimalPrecision: 6,
-                    vtype: 'positiveNumber'
-                }
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "pu_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "pu_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

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

@@ -252,6 +252,19 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '币别',
+                    dataIndex: 'pu_currency',
+                    align: 'center',
+                    width: 65
+                }, {
+                    text: "汇率",
+                    dataIndex: "pu_rate",
+                    xtype: 'numbercolumn',
+                    width: 80,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    }
                 }, {
                     text: '关联销售单号',
                     dataIndex: 'pd_salecode',

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

@@ -64,13 +64,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 name: 'pi_vendname',
                 fieldLabel: '供应商名称',
                 allowBlank: false,
-            }, {
-                xtype: "datefield",
-                name: "pi_date",
-                fieldLabel: "单据日期",
-                allowBlank: false,
-                columnWidth: 0.25,
-                defaultValue: new Date()
+                columnWidth: 0.5
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -93,18 +87,13 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 },
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "pi_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "pi_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
+            }, {
+                xtype: "datefield",
+                name: "pi_date",
+                fieldLabel: "单据日期",
+                allowBlank: false,
+                columnWidth: 0.25,
+                defaultValue: new Date()
             },{
                 xtype: "hidden",
                 name: "pi_puid",

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

@@ -263,6 +263,19 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                }, {
+                    text: '币别',
+                    dataIndex: 'pi_currency',
+                    align: 'center',
+                    width: 65
+                }, {
+                    text: "汇率",
+                    dataIndex: "pi_rate",
+                    xtype: 'numbercolumn',
+                    width: 80,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    }
                 }, {
                     text: '关联采购单号',
                     dataIndex: 'pi_pucode',

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

@@ -60,13 +60,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 name: 'pi_vendname',
                 fieldLabel: '供应商名称',
                 allowBlank: false,
-            }, {
-                xtype: "datefield",
-                name: "pi_date",
-                fieldLabel: "单据日期",
-                allowBlank: false,
-                columnWidth: 0.25,
-                defaultValue: new Date()
+                columnWidth: 0.5
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -89,18 +83,13 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "pi_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "pi_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
+            }, {
+                xtype: "datefield",
+                name: "pi_date",
+                fieldLabel: "单据日期",
+                allowBlank: false,
+                columnWidth: 0.25,
+                defaultValue: new Date()
             }, {
                 xtype: "hidden",
                 name: "pi_puid",

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

@@ -268,6 +268,19 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     },
+                }, {
+                    text: '币别',
+                    dataIndex: 'pi_currency',
+                    align: 'center',
+                    width: 65
+                }, {
+                    text: "汇率",
+                    dataIndex: "pi_rate",
+                    xtype: 'numbercolumn',
+                    width: 80,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    }
                 }, {
                     text: '关联验收单号',
                     dataIndex: 'pi_iocode',

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

@@ -44,6 +44,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 name: "sa_custname",
                 fieldLabel: "客户名称",
                 allowBlank: false,
+                columnWidth: 0.5,
                 setValue: function (value) {
                     var me = this,
                         bind, valueBind;
@@ -79,22 +80,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     }
                     return me;
                 }
-            }, {
-                xtype: "datefield",
-                name: "sa_delivery",
-                fieldLabel: "交货日期",
-                allowBlank: false,
-                defaultValue: new Date(),
-                columnWidth: 0.25,
-            }, {
-                name: "sa_toplace",
-                xtype: "remotecombo",
-                fieldLabel: "交货地址",
-                editable: false,
-                allowBlank: false,
-                columnWidth: 0.5,
-                storeUrl: '/api/document/customer/getAddressCombo',
-                hiddenBtn: true, //true 则会关闭新增按钮功能
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -117,18 +102,22 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "sa_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "sa_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
+            }, {
+                xtype: "datefield",
+                name: "sa_delivery",
+                fieldLabel: "交货日期",
+                allowBlank: false,
+                defaultValue: new Date(),
+                columnWidth: 0.25,
+            }, {
+                name: "sa_toplace",
+                xtype: "remotecombo",
+                fieldLabel: "交货地址",
+                editable: false,
+                allowBlank: false,
+                columnWidth: 0.5,
+                storeUrl: '/api/document/customer/getAddressCombo',
+                hiddenBtn: true, //true 则会关闭新增按钮功能
             },{
                 name: "detailGridField",
                 xtype: "detailGridField",

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

@@ -5,7 +5,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
         var me = this;
         this.control({
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=sa_custname]': {
+            'customerDbfindTrigger[name=sa_custname]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dbfinds: [{
@@ -30,7 +30,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         }, {
                             from:'cu_sellerid',to:'cu_sellerid'
                         },{
-                            from:'cu_currency',to:'sa_currency'
+                            from:'cu_currency',to:'sa_currency' 
                         },{
                             from:'cr_rate',to:'sa_rate'
                         }

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

@@ -260,6 +260,19 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                     renderer : function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '币别',
+                    dataIndex: 'sa_currency',
+                    align:'center',
+                    width: 65
+                }, {
+                    text: '汇率',
+                    dataIndex: 'sa_rate',
+                    xtype: 'numbercolumn',
+                    width: 80,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    }
                 }, {
                     text: '备注',
                     dataIndex: 'sd_remark',

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

@@ -52,6 +52,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 name: "pi_custname",
                 fieldLabel: "客户名称",
                 allowBlank: false,
+                columnWidth: 0.5,
                 setValue: function (value) {
                     var me = this,
                         bind, valueBind;
@@ -87,22 +88,6 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     }
                     return me;
                 }
-            }, {
-                xtype: "datefield",
-                name: "pi_date",
-                fieldLabel: "单据日期",
-                allowBlank: false,
-                columnWidth: 0.25,
-                defaultValue: new Date()
-            }, {
-                columnWidth: 0.5,
-                name: "pi_address",
-                xtype: "remotecombo",
-                fieldLabel: "交货地址",
-                editable: false,
-                allowBlank: false,
-                storeUrl: '/api/document/customer/getAddressCombo',
-                hiddenBtn: true, //true 则会关闭新增按钮功能
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -125,18 +110,22 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
-            // }, {
-            //     xtype: "currencyDbfindTrigger",
-            //     name: "pi_currency",
-            //     fieldLabel: "币别",
-            //     defaultValue: 'RMB'
-            // }, {
-            //     xtype: "numberfield",
-            //     name: "pi_rate",
-            //     fieldLabel: "汇率",
-            //     defaultValue: 1,
-            //     decimalPrecision: 6,
-            //     vtype: 'positiveNumber'
+            }, {
+                xtype: "datefield",
+                name: "pi_date",
+                fieldLabel: "单据日期",
+                allowBlank: false,
+                columnWidth: 0.25,
+                defaultValue: new Date()
+            }, {
+                columnWidth: 0.5,
+                name: "pi_address",
+                xtype: "remotecombo",
+                fieldLabel: "交货地址",
+                editable: false,
+                allowBlank: false,
+                storeUrl: '/api/document/customer/getAddressCombo',
+                hiddenBtn: true, //true 则会关闭新增按钮功能
             },{
                 name: "detailGridField",
                 xtype: "detailGridField",

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

@@ -262,6 +262,19 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '币别',
+                    dataIndex: 'pi_currency',
+                    align:'center',
+                    width: 65
+                }, {
+                    text: '汇率',
+                    dataIndex: 'pi_rate',
+                    xtype: 'numbercolumn',
+                    width: 80,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    }
                 }, {
                     text: '关联出货单号',
                     dataIndex: 'pi_iocode',

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

@@ -61,6 +61,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 name: "pi_custname",
                 fieldLabel: "客户名称",
                 allowBlank: false,
+                columnWidth: 0.5,
                 setValue: function (value) {
                     var me = this,
                         bind, valueBind;
@@ -96,22 +97,6 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     }
                     return me;
                 }
-            }, {
-                xtype: "datefield",
-                name: "pi_date",
-                fieldLabel: "单据日期",
-                allowBlank: false,
-                columnWidth: 0.25,
-                defaultValue: new Date()
-            }, {
-                columnWidth: 0.5,
-                name: "pi_address",
-                xtype: "remotecombo",
-                fieldLabel: "交货地址",
-                editable: false,
-                allowBlank: false,
-                storeUrl: '/api/document/customer/getAddressCombo',
-                hiddenBtn: true, //true 则会关闭新增按钮功能
             }, {
                 xtype: 'condbfindtrigger',
                 fieldLabel: '币别汇率',
@@ -134,6 +119,22 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     decimalPrecision: 6,
                     vtype: 'positiveNumber'
                 }
+            }, {
+                xtype: "datefield",
+                name: "pi_date",
+                fieldLabel: "单据日期",
+                allowBlank: false,
+                columnWidth: 0.25,
+                defaultValue: new Date()
+            }, {
+                columnWidth: 0.5,
+                name: "pi_address",
+                xtype: "remotecombo",
+                fieldLabel: "交货地址",
+                editable: false,
+                allowBlank: false,
+                storeUrl: '/api/document/customer/getAddressCombo',
+                hiddenBtn: true, //true 则会关闭新增按钮功能
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

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

@@ -262,6 +262,19 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
                     renderer: function(v, m, r) {
                         return saas.util.BaseUtil.numberFormat(v, 2, true);
                     }
+                }, {
+                    text: '币别',
+                    dataIndex: 'pi_currency',
+                    align: 'center',
+                    width: 65
+                }, {
+                    text: "汇率",
+                    dataIndex: "pi_rate",
+                    xtype: 'numbercolumn',
+                    width: 80,
+                    renderer: function(v, m, r) {
+                        return saas.util.BaseUtil.numberFormat(v, 6, false);
+                    }
                 }, {
                     text: '关联销售单号',
                     dataIndex: 'pd_ordercode',