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

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -272,7 +272,7 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             Subledger subledger1 = new Subledger();
             Subledger nowSubledger = subledgerMapper.selectByPrimaryKey(detail.getPbd_slid());
             subledger1.setId(Long.valueOf(String.valueOf(detail.getPbd_slid())));
-            subledger1.setSl_yamount(nowSubledger.getSl_namount()-detail.getPbd_nowbalance());//已核销
+            subledger1.setSl_yamount(nowSubledger.getSl_yamount()-detail.getPbd_nowbalance());//已核销
             subledger1.setSl_namount(nowSubledger.getSl_namount()+detail.getPbd_nowbalance());//未核销
             subledgerMapper.updateByPrimaryKeySelective(subledger1);
         }

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

@@ -57,6 +57,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "numberfield",
         name: "cu_leftamount",
         fieldLabel: "总欠款",
+        ignore: true,
         readOnly: true
     }, {
         xtype: 'hidden',
@@ -253,6 +254,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "已核销金额",
             xtype: 'numbercolumn',
             dataIndex: "sl_yamount",
+            ignore:true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');
@@ -270,6 +272,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "未核销金额",
             xtype: 'numbercolumn',
             dataIndex: "sl_namount",
+            ignore:true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length<=4?arr[1].length:4)).fill('0');