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

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

@@ -6,6 +6,7 @@ Ext.define('saas.view.core.form.MultiCombo', {
     alias: 'widget.multicombo',
     editable : false,
     matchFieldWidth: true,
+    triggerCls:'x-form-trigger',
     value: [],
     cachedConfig: {
         menuAlign: 'tl-bl?',

frontend/saas-web/app/view/document/bom/FormPanel.js

@@ -22,32 +22,41 @@ Ext.define('saas.view.document.bom.FormPanel', {
     _deleteMsg: '删除的BOM资料将不能恢复，请确认是否删除？',
     codeInHeader: false,
 
+    defaultButtons:[{
+        cls: 'x-formpanel-btn-blue',
+        xtype: 'button',
+        text: '新增',
+        bind: {
+            hidden: '{!id}'
+        },
+        handler: 'add'
+    }, {
+        xtype: 'button',
+        text: '保存',
+        handler: 'onSave'
+    }, {
+        xtype: 'button',
+        text: '删除',
+        handler: 'delete'
+    }, {
+        xtype: 'button',
+        bind: {
+            text: '{auditBtnText}'
+        },
+        handler: "auditBtnClick",
+    }],
+
+    auditTexts: {
+        auditCode: 'BANNED',
+        auditText: '已禁用',
+        unAuditCode: 'ENABLE',
+        unAuditText: '已启用',
+        auditBtnText: '禁用',
+        unAuditBtnText: '启用',
+    },
+
     initComponent: function () {
         Ext.applyIf(this, {
-            defaultButtons:[{
-                cls: 'x-formpanel-btn-blue',
-                xtype: 'button',
-                text: '新增',
-                bind: {
-                    hidden: '{!id}'
-                },
-                handler: 'add'
-            }, {
-                xtype: 'button',
-                text: '保存',
-                handler: 'onSave'
-            }, {
-                xtype: 'button',
-                text: '删除',
-                handler: 'delete'
-            }, {
-                xtype: 'button',
-                bind: {
-                    text: '{auditBtnText}'
-                },
-                handler: "auditBtnClick",
-            }],
-        
             defaultItems: [{
                 xtype: 'hidden',
                 name: 'id',
@@ -245,15 +254,6 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 name : "createTime", 
                 fieldLabel : "录入时间"
             }],
-        
-            auditTexts: {
-                auditCode: 'BANNED',
-                auditText: '已禁用',
-                unAuditCode: 'ENABLE',
-                unAuditText: '已启用',
-                auditBtnText: '禁用',
-                unAuditBtnText: '启用',
-            }
         });
         this.callParent(arguments);
     },

frontend/saas-web/app/view/document/customer/FormPanel.js

@@ -22,6 +22,38 @@ Ext.define('saas.view.document.customer.FormPanel', {
 
     codeInHeader: false,
 
+    defaultButtons:[{
+        cls: 'x-formpanel-btn-blue',
+        xtype: 'button',
+        text: '新增',
+        bind: {
+            hidden: '{!id}'
+        },
+        handler: 'add'
+    }, {
+        xtype: 'button',
+        text: '保存',
+        handler: 'onSave',
+    }, {
+        xtype: 'button',
+        text: '删除',
+        handler: 'delete'
+    }, {
+        xtype: 'button',
+        bind: {
+            text: '{auditBtnText}'
+        },
+        handler: "auditBtnClick",
+    }],
+    auditTexts: {
+        auditCode: 'BANNED',
+        auditText: '已禁用',
+        unAuditCode: 'ENABLE',
+        unAuditText: '已启用',
+        auditBtnText: '禁用',
+        unAuditBtnText: '启用',
+    },
+
     initComponent: function () {
         Ext.applyIf(this, {
             defaultItems: [{
@@ -359,37 +391,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
                         xtype:'yncolumn'
                     }]
             }],
-            defaultButtons:[{
-                cls: 'x-formpanel-btn-blue',
-                xtype: 'button',
-                text: '新增',
-                bind: {
-                    hidden: '{!id}'
-                },
-                handler: 'add'
-            }, {
-                xtype: 'button',
-                text: '保存',
-                handler: 'onSave',
-            }, {
-                xtype: 'button',
-                text: '删除',
-                handler: 'delete'
-            }, {
-                xtype: 'button',
-                bind: {
-                    text: '{auditBtnText}'
-                },
-                handler: "auditBtnClick",
-            }],
-            auditTexts: {
-                auditCode: 'BANNED',
-                auditText: '已禁用',
-                unAuditCode: 'ENABLE',
-                unAuditText: '已启用',
-                auditBtnText: '禁用',
-                unAuditBtnText: '启用',
-            }
         });
         this.callParent(arguments);
     },

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -22,6 +22,38 @@ Ext.define('saas.view.document.product.FormPanel', {
 
     codeInHeader: false,
 
+    defaultButtons:[{
+        cls: 'x-formpanel-btn-blue',
+        xtype: 'button',
+        text: '新增',
+        bind: {
+            hidden: '{!id}'
+        },
+        handler: 'add'
+    }, {
+        xtype: 'button',
+        text: '保存',
+        handler: 'onSave',
+    }, {
+        xtype: 'button',
+        text: '删除',
+        handler: 'delete'
+    }, {
+        xtype: 'button',
+        bind: {
+            text: '{auditBtnText}'
+        },
+        handler: "auditBtnClick",
+    }],
+    auditTexts: {
+        auditCode: 'BANNED',
+        auditText: '已禁用',
+        unAuditCode: 'ENABLE',
+        unAuditText: '已启用',
+        auditBtnText: '禁用',
+        unAuditBtnText: '启用',
+    },
+
     initComponent: function () {
         Ext.applyIf(this, {
             defaultItems: [{
@@ -348,37 +380,6 @@ Ext.define('saas.view.document.product.FormPanel', {
                 }]
             }],
         
-            defaultButtons:[{
-                cls: 'x-formpanel-btn-blue',
-                xtype: 'button',
-                text: '新增',
-                bind: {
-                    hidden: '{!id}'
-                },
-                handler: 'add'
-            }, {
-                xtype: 'button',
-                text: '保存',
-                handler: 'onSave',
-            }, {
-                xtype: 'button',
-                text: '删除',
-                handler: 'delete'
-            }, {
-                xtype: 'button',
-                bind: {
-                    text: '{auditBtnText}'
-                },
-                handler: "auditBtnClick",
-            }],
-            auditTexts: {
-                auditCode: 'BANNED',
-                auditText: '已禁用',
-                unAuditCode: 'ENABLE',
-                unAuditText: '已启用',
-                auditBtnText: '禁用',
-                unAuditBtnText: '启用',
-            },
             listeners: {
                 load: function(form, data) {
                     var viewModel = form.getViewModel();

frontend/saas-web/app/view/document/vendor/FormPanel.js

@@ -22,6 +22,38 @@ Ext.define('saas.view.document.vendor.FormPanel', {
 
     codeInHeader: false,
 
+    defaultButtons:[{
+        cls: 'x-formpanel-btn-blue',
+        xtype: 'button',
+        text: '新增',
+        bind: {
+            hidden: '{!id}'
+        },
+        handler: 'add'
+    }, {
+        xtype: 'button',
+        text: '保存',
+        handler: 'onSave',
+    }, {
+        xtype: 'button',
+        text: '删除',
+        handler: 'delete'
+    }, {
+        xtype: 'button',
+        bind: {
+            text: '{auditBtnText}'
+        },
+        handler: "auditBtnClick",
+    }],
+    auditTexts: {
+        auditCode: 'BANNED',
+        auditText: '已禁用',
+        unAuditCode: 'ENABLE',
+        unAuditText: '已启用',
+        auditBtnText: '禁用',
+        unAuditBtnText: '启用',
+    },
+
     initComponent: function() {
         Ext.apply(this, {
             defaultItems: [{
@@ -292,38 +324,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     }]
                 }
             ],
-        
-            defaultButtons:[{
-                cls: 'x-formpanel-btn-blue',
-                xtype: 'button',
-                text: '新增',
-                bind: {
-                    hidden: '{!id}'
-                },
-                handler: 'add'
-            }, {
-                xtype: 'button',
-                text: '保存',
-                handler: 'onSave',
-            }, {
-                xtype: 'button',
-                text: '删除',
-                handler: 'delete'
-            }, {
-                xtype: 'button',
-                bind: {
-                    text: '{auditBtnText}'
-                },
-                handler: "auditBtnClick",
-            }],
-            auditTexts: {
-                auditCode: 'BANNED',
-                auditText: '已禁用',
-                unAuditCode: 'ENABLE',
-                unAuditText: '已启用',
-                auditBtnText: '禁用',
-                unAuditBtnText: '启用',
-            }
         });
         this.callParent(arguments);
     },

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
     }, {
         text: '账户编号',
         dataIndex: 'bankcode',
-        width: 80
+        width: 150
     }, {
         text: '账户名称',
         dataIndex: 'bankname',

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

@@ -16,13 +16,14 @@ Ext.define('saas.view.money.report.AccountDetails', {
     searchItems: [{
         name: 'sl_code',
         xtype: 'textfield',
-        emptyText: '单号',
+        emptyText: '请输入单号',
         columnWidth: 0.1
     }, {
         xtype: 'multicombo',
         name: 'sl_kind',
-        emptyText: '单据类型',
+        emptyText: '请选择业务类型',
         columnWidth: 0.1,
+        triggerCls:'x-form-trigger',
         datas: [
             ["采购验收单", "采购验收单"],
             ["采购验退单", "采购验退单"],
@@ -42,12 +43,12 @@ Ext.define('saas.view.money.report.AccountDetails', {
     // }, {
         xtype: "customerDbfindTrigger",
         name: "cu_name",
-        emptyText: '客户编号/名称',
+        emptyText: '请输入客户名称',
         columnWidth: 0.15
     }, {
         xtype: 'vendorDbfindTrigger',
         name: 've_name',
-        emptyText: '供应商编号/名称',
+        emptyText: '请输入供应商名称',
         columnWidth: 0.15
     }],
 

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
     searchItems: [{
         xtype: 'bandinfoDbfindTrigger',
         name: 'bl_bankname',
-        emptyText: '资金账户',
+        emptyText: '请输入资金账户',
         columnWidth: 0.15,
         dbfinds:[
             {
@@ -37,7 +37,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
         queryMode: 'local',
         displayField: 'display',
         valueField: 'value',
-        emptyText : '收支类别',
+        emptyText : '请选择收支类别',
         editable:false,
         columnWidth: 0.15,
         store: Ext.create('Ext.data.ArrayStore', {
@@ -88,6 +88,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',
+        summaryLabel: '收入',
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }
@@ -100,6 +101,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',
+        summaryLabel: '支出',
         summaryRenderer: function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.money.report.RecDetail', {
     searchItems: [{
         xtype: 'customerDbfindTrigger',
         name: 'rd_custname',
-        fieldLabel: '客户名称',
+        emptyText: '请输入客户名称',
         columnWidth: 0.25
     }, {
         xtype: 'conmonthfield',

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

@@ -18,13 +18,10 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
     allowPaging: false,
 
     searchItems: [{
-        xtype: 'textfield',
-        name: 'vm_vendcode',
-        emptyText: '供应商编号/名称',
-        columnWidth: 0.25,
-        getCondition: function (v) {
-            return "(upper(vm_vendcode) like '%" + v.toUpperCase() + "%' or upper(vm_vendname) like '%" + v.toUpperCase() + "%')";
-        },
+        xtype: 'vendorDbfindTrigger',
+        name: 'vm_vendname',
+        emptyText: '请输入供应商名称',
+        columnWidth: 0.25
     }, {
         xtype: 'conmonthfield',
         fieldLabel: '期间',
@@ -132,6 +129,7 @@ Ext.define('saas.view.money.report.TotalPayDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',
+        summaryLabel: '应付余额',
         summaryRenderer: function (v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }

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

@@ -1,4 +1,21 @@
 Ext.define('saas.view.money.report.TotalPayDetailController', {
     extend: 'saas.view.core.report.ReportPanelController',
     alias: 'controller.money-report-totalpaydetail',
+    init: function (form) {
+        this.control({
+            // 供应商编号
+            'dbfindtrigger[name=vm_vendname]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dbfinds:[{
+                            from:'ve_code',to:'vm_vendcode'
+                        },{
+                            from:'ve_name',to:'vm_vendname'
+                        }],
+                    }) ;
+
+                }
+            }
+        });
+    },
 });

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

@@ -12,20 +12,16 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
 
     groupField: null,
     listUrl: '/api/money/report/custormonthdetails',
-    // listUrl: 'http://192.168.253.139:8560/api/money/report/custormonthdetails',
     defaultCondition: null,
     reportTitle: '应收总账',
     QueryWidth: 0.35,
     allowPaging: false,
 
     searchItems: [{
-        xtype: 'textfield',
+        xtype: 'customerDbfindTrigger',
         name: 'cm_custcode',
-        emptyText: '客户编号/名称',
-        columnWidth: 0.25,
-        getCondition: function (v) {
-            return "(upper(cm_custcode) like '%" + v.toUpperCase() + "%' or upper(cm_custname) like '%" + v.toUpperCase() + "%')";
-        },
+        emptyText: '请输入客户名称',
+        columnWidth: 0.25
     }, {
         xtype: 'conmonthfield',
         fieldLabel: '期间',
@@ -133,6 +129,7 @@ Ext.define('saas.view.money.report.TotalRecDetail', {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
         summaryType: 'sum',
+        summaryLabel: '应收余额',
         summaryRenderer: function (v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         }

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

@@ -4,11 +4,13 @@ Ext.define('saas.view.money.report.TotalRecDetailController', {
     init: function (form) {
         this.control({
             // 供应商编号
-            'dbfindtrigger[name=pi_vendname]':{
+            'dbfindtrigger[name=cm_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'ve_name',to:'pi_vendname'
+                            from:'cu_code',to:'cm_custcode'
+                        },{
+                            from:'cu_name',to:'cm_custname'
                         }],
                     }) ;
 

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

@@ -296,7 +296,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     },
                 }]
             }, {
-                xtype: "numberfield",
+                xtype: "textfield",
                 name: "pu_remark",
                 fieldLabel: "备注",
                 columnWidth: 1