Merge remote-tracking branch 'origin/dev' into dev

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

@@ -91,7 +91,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pd_detno',
-        allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail1/',
         columns: [{
             text: 'ID',

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

@@ -45,6 +45,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "dbfindtrigger",
         name: "rb_custname",
         fieldLabel: "客户名称",
+        allowBlank : false
     }, {
         xtype: "numberfield",
         name: "rb_rdamount",
@@ -171,6 +172,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance2',
         detnoColumn: 'rbd_detno',
+        allowEmpty: true,
         deleteDetailUrl: '/api/money/recbalance/deleteDetail2/',
         columns: [{
             text: 'ID',

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

@@ -186,7 +186,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field: 'sl_code',
                             width: 100
                         }],
-                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0",
+                        defaultCondition: "sl_custid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0",
                         dbSearchFields:[{
                             emptyText:'输入源单编号',
                             xtype : "textfield",