界面标准化

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

@@ -15,20 +15,20 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
     autoLoad: false,
     //筛选：客户、日期（必填）
     searchItems: [{
-        xtype: 'customerDbfindTrigger',
+        xtype: 'textfield',
         name: 'pi_custname',
-        fieldLabel: '客户名称',
+        emptyText: '请输入客户名称',
         columnWidth: 0.2,
-        listeners: {
-            beforequery: function(f) {
-                return !!f.value;
-            },
-            change: 'pi_custname_change'
-        }
+        // listeners: {
+        //     beforequery: function(f) {
+        //         return !!f.value;
+        //     },
+        //     change: 'pi_custname_change'
+        // }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.4
     }],
 
@@ -45,10 +45,12 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         width: 150
     }, {
         text: '业务类型',
+        align: 'center',
         dataIndex: 'pi_class',
         width: 100
     }, {
         text: '序号',
+        align: 'center',
         dataIndex: 'pd_pdno',
         exportFormat: 'Integer',
         xtype: 'numbercolumn',
@@ -145,6 +147,11 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
+        },
+        summaryType: 'sum',
+        summaryLabel: '税额',
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '价税合计(元)',
@@ -157,6 +164,11 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
+        },
+        summaryType: 'sum',
+        summaryLabel: '价税合计',
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }],
 

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

@@ -16,14 +16,10 @@ Ext.define('saas.view.money.report.ProfitDetail', {
     reportTitle: '毛利润分析表',
     QueryWidth: 0.2,
     searchItems: [{
-        xtype: 'customerDbfindTrigger',
+        xtype: 'textfield',
         name: 'pi_custname',
-        emptyText: '客户',
-        columnWidth: 0.15,
-        dbfinds:[
-            {
-                from:'cu_name',to:'pi_custname'
-            }]
+        emptyText: '请输入客户名称',
+        columnWidth: 0.15
     }, {
         xtype : "remotecombo", 
         storeUrl:'/api/document/customerkind/getCombo',

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

@@ -14,14 +14,14 @@ Ext.define('saas.view.sale.report.Sale', {
     QueryWidth:0.2,
     searchItems: [
     {
-        xtype: 'customerDbfindTrigger',
+        xtype: 'textfield',
         name: 'sa_custname',
-        fieldLabel: '客户名称',
+        emptyText:'请输入客户名称',
         columnWidth: 0.2
     }, {
         xtype: 'condatefield',
         name: 'sa_date',
-        fieldLabel: '单据日期',
+        fieldLabel: '日期',
         columnWidth: 0.4
     }, {
         xtype: 'multicombo',
@@ -98,6 +98,20 @@ Ext.define('saas.view.sale.report.Sale', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
+    },{
+        text: '出货数量',
+        dataIndex: 'sd_pdsendqty',
+        exportFormat: 'Quantity',
+        xtype: 'numbercolumn',
+        width: 110,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 3, true);
+        },
+        summaryType: 'sum',
+        summaryLabel: '出货数量',
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        }
     }, {
         text: '单位',
         dataIndex: 'pr_unit',
@@ -171,21 +185,7 @@ Ext.define('saas.view.sale.report.Sale', {
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
-    }, {
-        text: '出货数量',
-        dataIndex: 'sd_pdsendqty',
-        exportFormat: 'Quantity',
-        xtype: 'numbercolumn',
-        width: 110,
-        renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
-        },
-        summaryType: 'sum',
-        summaryLabel: '出货数量',
-        summaryRenderer: function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
-        }
-    }, {
+    },  {
         text : "备注", 
         dataIndex : "sd_remark",
         width : 250 

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

@@ -14,19 +14,25 @@ Ext.define('saas.view.sale.report.SaleProfit', {
 //筛选：客户、物料、时间	
     QueryWidth:0.2, 	
     searchItems: [{
-        xtype: 'customerDbfindTrigger',
+        xtype: 'textfield',
         name: 'sa_custname',
-        fieldLabel: '客户',
-        columnWidth: 0.2
+        emptyText:'请输入客户编号或名称',
+        columnWidth: 0.2,
+        getCondition: function(value) {
+            return  ' (sa_custname like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' ) ';
+        }
     }, {
-        xtype: 'productDbfindTrigger',
+        xtype: 'textfield',
         name: 'pr_detail',
-        fieldLabel: '物料',
-        columnWidth: 0.2
+        emptyText:'请输入物料编号或品牌',
+        columnWidth: 0.2,
+        getCondition: function(value) {
+            return  ' (pr_code like\'%' + value + '%\' or pr_brand like \'%'+value+'%\' ) ';
+        }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        fieldLabel: '时间',
+        fieldLabel: '日期',
         columnWidth: 0.4
     }],
     reportModel: 'saas.model.report.SaleProfit',
@@ -83,7 +89,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         xtype: 'numbercolumn',
         width: 110,
         renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 3, true);
+            return saas.util.BaseUtil.numberFormat(v, 3, false);
         }
     }, {
         text: '单位',
@@ -141,6 +147,11 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         width:120,
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
+        summaryType: 'sum',
+        summaryLabel: '价税合计',
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '成本单价(元)',
@@ -166,6 +177,11 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         xtype: 'numbercolumn',
         renderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
+        summaryType: 'sum',
+        summaryLabel: '毛利润',
+        summaryRenderer: function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
         text: '毛利率(%)',

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

@@ -14,9 +14,9 @@ Ext.define('saas.view.sale.report.SaleRec', {
     reportTitle: '销售收款报表',
     QueryWidth:0.25,
     searchItems: [{	
-        xtype: 'customerDbfindTrigger',
+        xtype: 'textfield',
         name: 'rb_custname',
-        fieldLabel: '客户',
+        emptyText:'请输入客户名称',
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
@@ -38,7 +38,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
         dataIndex: 'rb_custname',
         width: 200
     }, {
-        text: '日期',
+        text: '单据日期',
         dataIndex: 'rb_date',
         xtype: 'datecolumn'
     }, {
@@ -93,7 +93,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
     }, {
-        text: '回款比例%',
+        text: '回款比例(%)',
         dataIndex: 'rb_backrate',
         exportFormat: 'Number2',
         xtype: 'numbercolumn',
@@ -103,7 +103,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     }, {
         text: '收款人',
         dataIndex: 'rb_manname',
-        width: 150
+        width: 80
     }, {
         text: '备注',
         dataIndex: 'rb_remark',

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

@@ -320,6 +320,11 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 readOnly: true,
                 defaultValue: 'RMB'
             }, {
+                xtype: "textfield",
+                name: "sa_nettotal",
+                fieldLabel: "金额(元)",
+                readOnly: true
+            },{
                 xtype: "textfield",
                 name: "sa_total",
                 fieldLabel: "价税合计(元)",

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

@@ -14,17 +14,20 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         getCondition: function(value) {
            return  ' (sa_code like\'%' + value + '%\' or sa_custcode like \'%'+value+'%\' or sa_custname like \'%'+value+'%\') ';
         }
+    }, {
+        margin:'0 0 0 20',
+        xtype: 'textfield',
+        name: 'pr_detail',
+        showDetail: true,
+        emptyText:'输入物料编号或名称',
+        getCondition: function(value) {
+            return  ' (pr_detail like\'%' + value + '%\' or pr_code like \'%'+value+'%\' )';
+         }
     }, {
         xtype: 'condatefield',
         name: 'sa_date',
         fieldLabel: '日期',
         columnWidth: 0.5
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        showDetail: true,
-        emptyText:'输入物料编号或名称',
     }, {
         xtype: 'combobox',
         name: 'sa_statuscode',
@@ -134,7 +137,13 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
                 var format = '0,000.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
-        }, {
+        },{
+            text: '币别',
+            align: 'center',
+            dataIndex: "sa_currency",
+            defaultValue: 'RMB',
+            width:80
+        } ,{
             text: '审核状态',
             align: 'center',
             dataIndex: 'sa_status',
@@ -173,6 +182,12 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             dataIndex: 'sa_custname',
             width: 200
         }, {
+            text: '币别',
+            align: 'center',
+            dataIndex: "sa_currency",
+            defaultValue: 'RMB',
+            width:80
+        },{
             text: '审核状态',
             align: 'center',
             dataIndex: 'sa_status',

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

@@ -345,16 +345,39 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
                 },
             }
         ]
-    }, {
+    },{
+        xtype : "textfield", 
+        name : "pi_remark", 
+        fieldLabel : "备注", 
+        columnWidth : 0.75
+    },{
+        xtype: "textfield",
+        name: "pi_currency",
+        fieldLabel: "币别",
+        readOnly: true,
+        defaultValue: 'RMB'
+    },{
+        xtype: "textfield",
+        name: "pi_nettotal",
+        fieldLabel: "金额(元)",
+        readOnly: true
+    },{
         xtype : "textfield", 
         name : "pi_total", 
         fieldLabel : "价税合计(元)", 
         readOnly: true
+    },{
+        xtype: "employeeDbfindTrigger",
+        name: "pi_seller",
+        fieldLabel: "业务员"
+    },{
+        xtype: "hidden",
+        name: "pi_sellerid",
+        fieldLabel: "业务员ID"
     }, {
-        xtype : "textfield", 
-        name : "pi_remark", 
-        fieldLabel : "备注", 
-        columnWidth : 0.75
+        xtype: "hidden",
+        name: "pi_sellercode",
+        fieldLabel: "业务员编号",
     },{
         xtype : "hidden", 
         name : "creatorId", 

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

@@ -74,6 +74,23 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
 
                 }
             },
+            'dbfindtrigger[name=pi_seller]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pi_sellerid',
+                            ignore: true
+                        }, {
+                            from: 'em_code',
+                            to: 'pi_sellercode'
+                        }, {
+                            from: 'em_name',
+                            to: 'pi_seller'
+                        }],
+                    });
+                }
+            },
             'remotecombo[name=pi_address]':{
                 focus:function(f){
                     //获取客户ID

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

@@ -15,17 +15,20 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' ) ';
         }
     }, {
+        margin:'0 0 0 20',
+        xtype: 'textfield',
+        name: 'pr_detail',
+        showDetail: true,
+        emptyText:'输入物料编号或名称',
+        getCondition: function(value) {
+            return  ' (pr_detail like\'%' + value + '%\' or pr_code like \'%'+value+'%\' )';
+         }
+    },{
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText: '输入物料编号或名称',
-        showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -138,6 +141,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
                 var format = '0.' + xr.join('');
                 return Ext.util.Format.number(v, format);
             }
+        },{
+            text: '币别',
+            align: 'center',
+            dataIndex: "pi_currency",
+            defaultValue: 'RMB',
+            width:80
         }, {
             text: '审核状态',
             align: 'center',
@@ -176,6 +185,12 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_custname',
             width: 200
         }, {
+            text: '币别',
+            align: 'center',
+            dataIndex: "pi_currency",
+            defaultValue: 'RMB',
+            width:80
+        },{
             text: '审核状态',
             align: 'center',
             dataIndex: 'pi_status',

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

@@ -347,16 +347,39 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 xtype: "textfield"
             },
         }]
-    }, {
+    },  {
+        xtype: "textfield",
+        name: "pi_remark",
+        fieldLabel: "备注",
+        columnWidth: 0.75
+    },{
+        xtype: "textfield",
+        name: "pi_currency",
+        fieldLabel: "币别",
+        readOnly: true,
+        defaultValue: 'RMB'
+    },{
+        xtype: "textfield",
+        name: "pi_nettotal",
+        fieldLabel: "金额(元)",
+        readOnly: true
+    },{
         xtype: "textfield",
         name: "pi_total",
         fieldLabel: "价税合计(元)",
         readOnly: true
+    },{
+        xtype: "employeeDbfindTrigger",
+        name: "pi_seller",
+        fieldLabel: "业务员"
+    },{
+        xtype: "hidden",
+        name: "pi_sellerid",
+        fieldLabel: "业务员ID"
     }, {
-        xtype: "textfield",
-        name: "pi_remark",
-        fieldLabel: "备注",
-        columnWidth: 0.75
+        xtype: "hidden",
+        name: "pi_sellercode",
+        fieldLabel: "业务员编号",
     }, {
         xtype: "hidden",
         name: "creatorId",

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

@@ -66,6 +66,23 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
 
                 }
             },
+            'dbfindtrigger[name=pi_seller]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pi_sellerid',
+                            ignore: true
+                        }, {
+                            from: 'em_code',
+                            to: 'pi_sellercode'
+                        }, {
+                            from: 'em_name',
+                            to: 'pi_seller'
+                        }],
+                    });
+                }
+            },
             'remotecombo[name=pi_address]':{
                 focus:function(f){
                     //获取客户ID

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

@@ -14,19 +14,22 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         getCondition: function(value) {
             return  ' (pi_inoutno like\'%' + value + '%\' or pi_custcode like \'%'+value+'%\' or pi_custname like \'%'+value+'%\' ) ';
         }
+    },{
+        margin:'0 0 0 20',
+        xtype: 'textfield',
+        name: 'pr_detail',
+        showDetail: true,
+        emptyText:'输入物料编号或名称',
+        getCondition: function(value) {
+            return  ' (pr_detail like\'%' + value + '%\' or pr_code like \'%'+value+'%\' )';
+         }
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
         fieldLabel: '日期',
         allowBlank: true,
         columnWidth: 0.5
-    }, {
-        xtype: 'productDbfindTrigger',
-        name: 'pr_detail',
-        fieldLabel: '物料',
-        emptyText: '输入物料编号或名称',
-        showDetail: true
-    }, {
+    },  {
         xtype: 'combobox',
         name: 'pi_statuscode',
         fieldLabel: '单据状态',
@@ -126,6 +129,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'pi_total',
             xtype:'numbercolumn',
             width: 110
+        },{
+            text: '币别',
+            align: 'center',
+            dataIndex: "pi_currency",
+            defaultValue: 'RMB',
+            width:80
         }, {
             text: '审核状态',
             align: 'center',
@@ -163,6 +172,12 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             text: '客户名称',
             dataIndex: 'pi_custname',
             width: 200
+        },{
+            text: '币别',
+            align: 'center',
+            dataIndex: "pi_currency",
+            defaultValue: 'RMB',
+            width:80
         }, {
             text: '审核状态',
             align: 'center',