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

@@ -150,7 +150,13 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         //更新本次预付款金额
         Paybalance updatePay = new Paybalance();
         updatePay.setId(paybalance.getId());
-        updatePay.setPb_preamount(amountTotal+paybalance.getPb_discounts()-nowbalanceTotal);
+
+        //折扣
+        Double discounts = paybalance.getPb_discounts();
+        if(discounts == null){
+            discounts = 0.0;
+        }
+        updatePay.setPb_preamount(amountTotal + discounts - nowbalanceTotal);
         paybalanceMapper.updateByPrimaryKeySelective(updatePay);
     }
 

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

@@ -96,7 +96,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
 
     /**
      * 校验数据
-     * @param Rec
+     * @param rec
      */
     private void checkRecbalance(Rec rec){
         Recbalance recbalance = rec.getMain();
@@ -147,7 +147,13 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         //更新本次预付款金额
         Recbalance updatePay = new Recbalance();
         updatePay.setId(recbalance.getId());
-        updatePay.setRb_preamount(amountTotal+recbalance.getRb_discounts()-nowbalanceTotal);
+
+        //折扣
+        Double discount = recbalance.getRb_discounts();
+        if (discount == null){
+            discount = 0.0;
+        }
+        updatePay.setRb_preamount(amountTotal + discount - nowbalanceTotal);
         recbalanceMapper.updateByPrimaryKeySelective(updatePay);
     }
 

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -13,7 +13,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
 
     layout: 'vbox',
     autoScroll: true,
-    border: 1,
+    bodyBorder:false,
     bodyPadding: 5,
 
     groupField: null, // 分组字段
@@ -49,7 +49,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                         style: {
                             float: 'right'
                         },
-                        text: '导出为...',
+                        text: '导出',
                         menu: {
                             defaults: {
                                 handler: 'exportTo'
@@ -112,7 +112,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 width: '100%',
                 cls: 'x-report-grid',
                 flex: 1,
-                border: 1,
+                border: 0,
                 sortableColumns: false,
                 enableColumnHide: false,
                 rowLines: false,

frontend/saas-web/app/view/core/report/ReportPanel.scss

@@ -34,6 +34,12 @@
                 border-color: #999 !important;
                 border-width: 1px !important;
             }
+            .x-panel-default-outer-border-rl {
+                border-right-color: #999 !important;
+                border-right-width: 1px !important;
+                border-left-color:  #999 !important;
+                border-left-width: 1px !important;
+            }
         }
     }
 }

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

@@ -65,9 +65,9 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         name: "pb_date",
         fieldLabel: "日期"
     },{
-        xtype: 'hidden',
+        xtype: 'textfield',
         name: 'pb_manname',
-        fieldLabel: '收款人'
+        fieldLabel: '付款人'
     }, {
         xtype: 'hidden',
         name: 'pb_pdamount',
@@ -79,7 +79,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     }, {
         xtype: "numberfield",
         name: "pb_preamount",
-        fieldLabel: "本次预付款"
+        fieldLabel: "本次预付款",
+        readOnly: true
     }, {
         xtype: 'numberfield',
         name: 'pb_discounts',

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

@@ -10,7 +10,23 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
     queryFormItems: [{
         xtype: 'textfield',
         name: 'pb_code',
-        fieldLabel: '单据编号'
+        fieldLabel: '单据编号',
+        columnWidth: 0.2
+    },{
+        xtype: 'condatefield',
+        name: 'pb_date',
+        fieldLabel: '日期',
+        columnWidth: 0.5,
+        operation: 'between'
+    },{
+        xtype: 'multicombo',
+        name: 'pb_status',
+        fieldLabel: '审核状态',
+        columnWidth: 0.2,
+        datas: [
+            ["已审核", "已审核"],
+            ["未审核", "未审核"]
+        ]
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -19,8 +35,8 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         addTitle: '付款单',
         addXtype: 'money-paybalance-formpanel',
         defaultCondition:'1=1',
-        // baseVastUrl: '/api/money/paybalance/',
-        baseVastUrl: 'http://192.168.253.129:8881/paybalance/',
+        baseVastUrl: '/api/money/paybalance/',
+        // baseVastUrl: 'http://192.168.253.129:8881/paybalance/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',

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

@@ -64,7 +64,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: "rb_date",
         fieldLabel: "日期"
     }, {
-        xtype: "hidden",
+        xtype: "textfield",
         name: "rb_manname",
         fieldLabel: "收款人"
     }, {
@@ -73,13 +73,14 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         fieldLabel: '备注',
         columnWidth: 1
     }, {
-        xtype: "hidden",
+        xtype: "numberfield",
         name: "rb_discounts",
         fieldLabel: "整单折扣"
     }, {
-        xtype: 'hidden',
+        xtype: 'numberfield',
         name: 'rb_preamount',
-        fieldLabel : '本次预收款'
+        fieldLabel : '本次预收款',
+        readOnly: true
     }, {
         xtype: 'hidden',
         name: 'rb_havebalance',

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

@@ -25,6 +25,15 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         fieldLabel: '日期',
         columnWidth: 0.5,
         operation: 'between'
+    },{
+        xtype: 'multicombo',
+        name: 'rb_status',
+        fieldLabel: '审核状态',
+        columnWidth: 0.2,
+        datas: [
+            ["已审核", "已审核"],
+            ["未审核", "未审核"]
+        ]
     }],
     moreQueryFormItems: [],
     queryGridConfig: {