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

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -77,6 +77,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     RECALANCE_OUTNOWBALANCE(74003,"本次核销金额不能大于未核销金额"),
     BEFORE_UNAUDIT(74006, "单据:<u>%s</u>未审核,无法反审核"),
     BANK_AMOUNT_NOTENOUGH(74004, "资金账号不足"),
+    SUBLEDGER_NOT_EXIS(74005,"来源单据不存在"),
 
 
 

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

@@ -137,6 +137,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             Double namount = new Double(0);
             if(sourceId!=0){
                 Subledger subledger = subledgerMapper.selectByPrimaryKey(sourceId);
+                if (subledger == null){
+                    throw new BizException(500, BizExceptionCode.SUBLEDGER_NOT_EXIS.getMessage());
+                }
                 namount = subledger.getSl_namount();
             }
             //本次核销金额不能大于未核销金额

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

@@ -135,6 +135,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             Double namount = new Double(0);
             if(sourceId!=0){
                 Subledger subledger = subledgerMapper.selectByPrimaryKey(sourceId);
+                if (subledger == null){
+                    throw new BizException(500, BizExceptionCode.SUBLEDGER_NOT_EXIS.getMessage());
+                }
                 namount = subledger.getSl_namount()==null?new Double(0):subledger.getSl_namount();
             }
             //本次核销金额不能大于未核销金额

frontend/saas-web/app/view/document/product/FormModel.js

@@ -18,7 +18,8 @@ Ext.define('saas.view.document.product.FormModel', {
             get: function(v) {
                 var form = this.getView(),
                 detailGrid = form.down('detailGridField');
-                
+                //detailGrid.allowEmpty = !v;
+                //form.isValid();
                 form.getForm().findField('qcsz').resetOriginalValue();
                 detailGrid.setHidden(!v);
             }

frontend/saas-web/app/view/main/Main.js

@@ -74,25 +74,25 @@ Ext.define('saas.view.main.Main', {
                         cls:'x-main-menu',
                         items: [{
                             text: '新手导航',
-                            iconCls:'x-fa fa-comment-o',
+                            iconCls:'x-fa fa-comment-o sa-navicon',
                             handler:function(){
                                saas.util.BaseUtil.openTab('sys-guide-formpanel','新手导航', 'sys-guide-formpanel-nav');
                             }
                         },{
                             text: '用户手册',
-                            iconCls:'x-fa fa-comment-o',
+                            iconCls:'x-fa fa-address-book-o sa-navicon',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
                         },{
                             text: '常见问题',
-                            iconCls:'x-fa fa-question-circle-o',
+                            iconCls:'x-fa fa-question-circle-o sa-navicon',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
                         },{
                             text: '客服热线',
-                            iconCls:'x-fa fa-comment-o',
+                            iconCls:'x-fa fa-comment-o sa-navicon',
                             menu:{
                                 items:[{
                                     text:'<span onclick="javascript:window.open(\'http://www.usoftchina.com\');" style="text-decoration:underline;color:blue;">优软科技官网</span>'
@@ -130,13 +130,13 @@ Ext.define('saas.view.main.Main', {
                         cls:'x-main-menu2',
                         items: [ {  
                             text: '账户中心',
-                            iconCls:'x-fa x-fa fa-user-o',
+                            iconCls:'x-fa fa-user-o sa-navicon',
                             handler:function(){
                                 window.open('http://www.usoftchina.com','_blank');
                             }
                         },{  
                             text: '意见反馈',
-                            iconCls:'x-fa fa-comment-o',
+                            iconCls:'x-fa fa-comment-o sa-navicon',
                             handler:'feedbackMsg'
                         }, {
                             text: '退出',

frontend/saas-web/app/view/main/Main.scss

@@ -223,40 +223,49 @@ body > .x-mask {
 }
  .x-main-menu{
     background: #f8fbff;
-    border: 2px solid #34baf6;
+    border: 1px solid #34baf6;
+    margin-top: 10px;
  }
- .x-main-menu .x-menu-item-text-default{
-    font-family: PingFangSC-Regular;
+ .x-main-menu .x-menu-item-text-default {
+    //font-family: PingFangSC-Regular;
     //font-size: 14px;
     color: #34BAF6;
     letter-spacing: 0;
     text-align: center;
  }
+ .x-menu.x-main-menu .x-menu-bodyWrap{
+    margin-left: -0.5px;
+ }
+.x-main-menu .x-fa.sa-navicon{
+    color: #34BAF6;
+} 
+.x-main-menu .x-menu-item-text-default.x-menu-item.x-menu-item-default-focus,
+.x-main-menu .x-menu-item-text-default.x-menu-item.x-menu-item-active{
+    color: white;
+}
+.x-main-menu .x-fa.sa-navicon.x-menu-item-default-focus,
+.x-main-menu .x-fa.sa-navicon.x-menu-item-active{
+    color: #34BAF6;
+} 
 .x-main-menu::before{
     content: ' ';
     display: block;
     border-style: solid;
-    background-color: white;
+    background-color: #f8fbff;
     transform: rotate(45deg);
-    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(15, 136, 232, 0.6);
-    box-shadow: aliceblue;
-    border-width: 2px;
-    border-color: #34BAF6;
-    /* border-color: #cccccc #6e838e #9c9d9e #bdc3c5; */
+    border-color: #34baf6;
     position: fixed;
-    width: 14px;
-    height: 14px;
-    /* left: 100%; */
-    top: 25px;
-    -moz-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    /* -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%); */
-    -o-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    -ms-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    -khtml-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    clip-path: polygon(0% 0,100% 0%,0 100%);
-    margin-top: 17px;
-    margin-left: 7px;
-    z-index: 99;
+    width: 15px;
+    height: 15px;
+    clip-path: polygon(0% 0, 100% 0%, 0 100%);
+    -moz-clip-path: polygon(0% 0, 100% 0%, 0 100%);
+    -webkit-clip-path: polygon(0% 0, 100% 0%, 0 100%);
+    -o-clip-path: polygon(0% 0, 100% 0%, 0 100%);
+    -ms-clip-path: polygon(0% 0, 100% 0%, 0 100%);
+    -khtml-clip-path: polygon(0% 0, 100% 0%, 0 100%);
+    border-width: 1px 0px 0px 1px !important;
+    margin-top: -7.5px;
+    margin-left: 16px;
 }
 .x-main-menu2::before{
     content: ' ';

frontend/saas-web/app/view/main/MainController.js

@@ -127,7 +127,6 @@ Ext.define('saas.view.main.MainController', {
                 constrain: true,
                 closable: true,
                 layout: 'fit',
-
                 items: [{
                     xtype: 'sys-feedback-formpanel'
                 }]

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

@@ -32,7 +32,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'id',to:'ftd_inbankid',ignore:true
                         },{
-                            from:'bk_inthisamount',to:'bk_inthisamount'
+                            from:'bk_thisamount',to:'bk_inthisamount'
                         }],
                     }) ;   
 

frontend/saas-web/app/view/sys/feedback/FormPanel.js

@@ -31,12 +31,12 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
         name : "fb_name", 
         fieldLabel : "姓名",
         readOnly:true,
-        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().realname:null
+       defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().realname:null
     }, {
         xtype : "textfield", 
         name : "fb_mobile", 
         fieldLabel : "手机号",
-        defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().mobile:null
+       defaultVale:saas.util.BaseUtil.getCurrentUser() ? saas.util.BaseUtil.getCurrentUser().mobile:null
     }, {
         xtype : "textfield", 
         name : "fb_QQ", 
@@ -46,7 +46,7 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
         name : "fb_wechat", 
         fieldLabel : "微信"
     }, {
-        xtype : "html", 
+        xtype : "htmleditor", 
         name : "fb_msg", 
         fieldLabel : "反馈内容",
         flex: 1