Merge remote-tracking branch 'origin/dev'

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -91,7 +91,7 @@
             <if test="companyId != null">
                 and   sale.companyId = #{companyId}
             </if>
-        </where>  order by sa_date desc
+        </where>  order by sa_id desc,sd_id
     </select>
 
     <select id="selectSaleByCondition" resultMap="BaseResultMap">

frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -125,7 +125,9 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
     },
     onTriggerClick:function(f){
         var me = this;
-        this.fireEvent('beforetriggerclick', this);
+        if(!this.fireEvent('beforetriggerclick', this)) {
+            return;
+        };
         f.blur(f);
         //判断dbfindtrigger归属
         f.judge(f);//form

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

@@ -227,7 +227,6 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         detnoColumn: 'vc_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/vendor/deleteContact',
-        height:145,
         columns : [
             {
                 text : "ID", 

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

@@ -95,6 +95,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
                 }
             },
+
+            // 来源单号
             'oriOrderMutiDbfindTrigger[name=pbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
@@ -126,8 +128,28 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         defaultCondition: "sl_vendid<>0 and ((sl_kind in ('采购验收单','采购验退单')) or (sl_kind='期初余额' and sl_ym="+
                                   "'(select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid))) and sl_namount<>0'"
                     });
+                },
+                beforequery: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        return false;
+                    }
+                },
+                beforetriggerclick: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        return false;
+                    }
                 }
             },
+
+            // 资金账户
             'dbfindtrigger[name=pd_bankname]':{
                 beforerender: function (f) {
                     Ext.apply(f, {
@@ -143,6 +165,24 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         }],
                     });
 
+                },
+                beforequery: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        return false;
+                    }
+                },
+                beforetriggerclick: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
+                        return false;
+                    }
                 }
             }
         });

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

@@ -5,6 +5,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
+            // 客户名称
             'dbfindtrigger[name=rb_custname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
@@ -91,9 +92,10 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             from:'cu_leftamount', to:'cu_leftamount'
                         }],
                     }) ;   
-
                 }
             },
+
+            // 资金账户
             'dbfindtrigger[name=rd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
@@ -107,8 +109,28 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         }],
                     }) ;   
 
+                },
+                beforequery: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        return false;
+                    }
+                },
+                beforetriggerclick: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        return false;
+                    }
                 }
             },
+
+            // 来源单号
             'oriOrderMutiDbfindTrigger[name=rbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
@@ -140,35 +162,28 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         defaultCondition: "sl_custid<>0 and ((sl_kind in ('出货单','销售退货单')) or (sl_kind='期初余额' and sl_ym="+
                         "'(select min(pd_detno) from periodsdetail  where pd_status=0 and periodsdetail.companyid=subledger.companyid))) and sl_namount<>0'"
                     });
-
+                },
+                beforequery: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        return false;
+                    }
+                },
+                beforetriggerclick: function(f) {
+                    var me = this,
+                    viewModel = me.getViewModel(),
+                    rb_custname = viewModel.get('rb_custname');
+                    if(!rb_custname) {
+                        saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">客户名称</span>】');
+                        return false;
+                    }
                 }
             },
         });
     },
-    addCombo:function(){
-        var combo=this.ownerCmp;
-        Ext.create('Ext.window.Window',{
-            layout:'vbox',
-            bodyPadding: 15,
-            width:500,
-            items:[{
-                fieldLabel:'实际值',
-                xtype:'textfield'
-            },{
-                fieldLabel:'显示值',
-                xtype:'textfield'
-            }],
-            buttons:[{
-                text:'确认',
-                handler:function(b){
-                    combo.setValue('ok');
-                    b.up('window').close();
-                }
-            }],
-            renderTo:this.ownerCmp.ownerCt.getEl()
-        }).show();
-
-    },
 
     turnIn: function() {
         var me = this,

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

@@ -115,13 +115,6 @@ Ext.define('saas.view.sale.report.Sale', {
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
             var format = '0.' + xr.join('');
             return Ext.util.Format.number(v, format);
-        },
-        summaryType: 'sum',
-        summaryRenderer: function(v) {
-            var arr = (v + '.').split('.');
-            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
-            var format = '0.' + xr.join('');
-            return Ext.util.Format.number(v, format);
         }
     }, {
         text: '单价(元)',
@@ -139,6 +132,7 @@ Ext.define('saas.view.sale.report.Sale', {
         dataIndex: 'sd_netprice',
         exportFormat: 'Price',
         xtype: 'numbercolumn',
+        width: 150,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
@@ -172,10 +166,11 @@ Ext.define('saas.view.sale.report.Sale', {
             var format = '0,000.' + xr.join('');
             return Ext.util.Format.number(v, format);
         }
-    }, {//∑不含税金额
+    }, {
         text: '不含税金额(元)',
         xtype: 'numbercolumn',
         exportFormat: 'Amount',
+        width: 150,
         dataIndex: 'sd_nettotal',
         renderer : function(v) {
             var arr = (v + '.').split('.');

frontend/saas-web/ext/packages/ux/src/feature/MySummary.js

@@ -169,9 +169,8 @@ Ext.define('Ext.ux.feature.MySummary', {
     initSummarys: function() {
         var me = this,
         summarys = [],
-        view = me.view,
         grid = me.grid,
-        columns = view.headerCt.getGridColumns();
+        columns = grid.columns;
 
         var typeLabels = {
             sum: '合计',