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

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

@@ -222,6 +222,13 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         vendor.setVe_payamount(payamount-amountTotal2);
         vendor.setVe_leftamount(beginapamount-beginprepayamount+payamount-amountTotal2-preamount-amountTotal);
         paybalanceMapper.updateVendorByPrimaryKeySelective(vendor);
+
+        for (Paybalancedetail detail:paybalancedetail) {
+            Subledger subledger1 = new Subledger();
+            subledger1.setId(Long.valueOf(String.valueOf(detail.getPbd_slid())));
+            subledger1.setSl_yamount(detail.getPbd_nowbalance()+detail.getPbd_amount());
+            subledgerMapper.updateByPrimaryKeySelective(subledger1);
+        }
     }
 
     @Override

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

@@ -254,8 +254,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             Subledger subledger1 = new Subledger();
             subledger1.setId(Long.valueOf(String.valueOf(detail.getRbd_slid())));
             subledger1.setSl_yamount(detail.getRbd_nowbalance() - detail.getRbd_amount());
-            subledger1.setCompanyId(detail.getCompanyId());
-            subledgerMapper.updateByPrimaryKey(subledger1);
+            subledgerMapper.updateByPrimaryKeySelective(subledger1);
         }
     }
 

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

@@ -50,11 +50,9 @@ Ext.define('saas.view.core.form.FormPanel', {
     buttons:[{
         text:'操作日志',
         handler:function(btn){
-            console.log("btn:",btn);
             var form = btn.up('form'),
             mlKeyvalue = form.viewModel.get(form._idField)||0,
             win = Ext.getCmp(form.xtype+mlKeyvalue);
-            console.log("mlKeyvalue:",mlKeyvalue);
             if (!win) {
                 win = Ext.create('Ext.window.Window', {
                     modal: true,

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

@@ -21,9 +21,9 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _unAuditUrl: '/api/money/paybalance/unAudit/',
     _deleteUrl: '/api/money/paybalance/delete/',
 
-    // _readUrl: 'http://192.168.253.129:8940/money/paybalance/read/',
+    _readUrl: 'http://192.168.253.35:8880/paybalance/read/',
     // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
-    // _auditUrl: 'http://192.168.253.35:8880/paybalance/audit/',
+    _auditUrl: 'http://192.168.253.35:8880/paybalance/audit/',
     // _unAuditUrl: 'http://192.168.253.35Pb_pdamount:8880/paybalance/unAudit/',
     // _deleteUrl: 'http://192.168.253.129:8940/money/paybalance/delete/',
     
@@ -244,7 +244,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "已核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "pb_havebalance",
+            dataIndex: "pbd_havebalance",
             // editor : {
             //     xtype : "numberfield",
             //     decimalPrecision: 2
@@ -265,7 +265,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         }, {
             text: "未核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "pb_pbdamount",
+            dataIndex: "pbd_pbdamount",
             // editor : {
             //     xtype : "numberfield",
             //     decimalPrecision: 2

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

@@ -249,7 +249,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "已核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "rbd_nowbalance",
+            dataIndex: "rbd_havebalance",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');
@@ -266,7 +266,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         }, {
             text: "未核销金额",
             xtype: 'numbercolumn',
-            dataIndex: "rbd_nowbalance",
+            dataIndex: "rbd_pbdamount",
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length)).fill('0');