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/auth/CompanyPicker.scss

@@ -18,6 +18,7 @@
         overflow: hidden;
         border-top: 1px solid transparent;
         cursor: pointer;
+        border-radius: 4px;
 
         img {
             margin-bottom: 10px;

frontend/saas-web/app/view/auth/LoginController.js

@@ -65,7 +65,8 @@ Ext.define('saas.view.auth.LoginController', {
             })
             .then(function() {
                 view.isMasked() && view.unmask();
+                view.close();
                 view.ownerCt.destroy();
-            });        
+            });
     }
 });

frontend/saas-web/app/view/core/base/BasePanel.js

@@ -28,7 +28,8 @@ Ext.define('saas.view.core.base.BasePanel', {
     searchField:[],
     gridColumns: [],
 
-    _deleteMsg: '是否删除所选单据？',
+    deleteMoreMsg: '确认删除所选单据？',
+    deleteOneMsg: '确认删除该单据？',
 
     initComponent: function() {
 
@@ -38,7 +39,8 @@ Ext.define('saas.view.core.base.BasePanel', {
         gridIdField = gridConfig.idField,
         gridCodeField = gridConfig.codeField,
         gridStatusCodeField = gridConfig.statusCodeField,
-        gridColumns = gridConfig.columns;
+        gridColumns = gridConfig.columns,
+        deleteMsg = gridConfig.deleteMsg;
 
         Ext.apply(me, {
             dockedItems: [{
@@ -65,7 +67,8 @@ Ext.define('saas.view.core.base.BasePanel', {
                 idField: gridIdField,
                 codeField: gridCodeField,
                 columns: gridColumns,
-                statusCodeField : gridStatusCodeField
+                statusCodeField : gridStatusCodeField,
+                deleteMsg: deleteMsg
             }]
         });
         me.callParent(arguments);

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -123,11 +123,17 @@ Ext.define('saas.view.core.base.GridPanel', {
                         text: '删除',
                         handler: function(){
                             var form = this.ownerCt.ownerCt.ownerCt;
-                            saas.util.BaseUtil.deleteWarn(form._deleteMsg,function(btn){
-                                if(btn == 'yes'){
-                                    me.onVastDeal(form._batchDeleteUrl);
-                                }
-                            });
+
+                            var data = me.getGridSelected(form._batchDeleteUrl);
+                            if(data && data.length > 0) {
+                                saas.util.BaseUtil.deleteWarn(form.deleteMoreMsg,function(btn){
+                                    if(btn == 'yes'){
+                                        me.onVastDeal(form._batchDeleteUrl);
+                                    }
+                                });
+                            }else {
+                                saas.util.BaseUtil.showToast('请至少选择一条明细');
+                            }
                         }
                     }, {
                         text: '刷新',
@@ -199,20 +205,25 @@ Ext.define('saas.view.core.base.GridPanel', {
                 //删除
                 var id = record.get('id');
                 if(id){
-                    saas.util.BaseUtil.request({
-                        url: form._deleteUrl+id,
-                        method: 'POST',
-                    })
-                    .then(function(localJson) {
-                        if(localJson.success){
-                            //解析参数
-                            saas.util.BaseUtil.showToast('删除成功');
-                            view.ownerCt.store.load();
+                    saas.util.BaseUtil.showConfirm('警告', form.deleteOneMsg)
+                    .then(function(yes) {
+                        if(yes == 'yes') {
+                            saas.util.BaseUtil.request({
+                                url: form._deleteUrl+id,
+                                method: 'POST',
+                            })
+                            .then(function(localJson) {
+                                if(localJson.success){
+                                    //解析参数
+                                    saas.util.BaseUtil.showToast('删除成功');
+                                    view.ownerCt.store.load();
+                                }
+                            })
+                            .catch(function(res) {
+                                console.error(res);
+                                saas.util.BaseUtil.showToast('删除失败: ' + res.message);
+                            });
                         }
-                    })
-                    .catch(function(res) {
-                        console.error(res);
-                        saas.util.BaseUtil.showToast('删除失败: ' + res.message);
                     });
                 }
             }

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

@@ -123,9 +123,10 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     setValue: function(items) {
         var me = this, rawV = '',
         datas = me.datas,
-        menu = me.menu;
+        menu = me.menu,
+        items = items==null?[]:items;
         if(!Ext.isArray(items)) {
-            if(items.indexOf(',')>0){
+            if(items&&items.indexOf(',')>0){
                 items = items.split(',')
             }else{
                 items = [items]
@@ -183,8 +184,10 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
     hideMenu: function(b) {
         if (this.hasVisibleMenu()) {
             var target=b.parentEvent.relatedTarget;
-            if(!((target.className && target.className.indexOf('x-menu')!=-1) || (target.name && target.name.indexOf(this.name)!=-1))){
-                this.menu.hide();
+            if(target){
+                if(!((target.className && target.className.indexOf('x-menu')!=-1) || (target.name && target.name.indexOf(this.name)!=-1))){
+                    this.menu.hide();
+                }
             }
         }
         return this;

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

@@ -100,7 +100,7 @@ Ext.define('saas.view.core.form.FormPanel', {
             text:'打印',
             hidden: true,
             bind: {
-                // hidden: '{!id}'
+                hidden: '{!showPrintBtn || !id}'
             },
             handler:"onPrint"
         }, {

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

@@ -368,6 +368,35 @@ Ext.define('saas.view.core.form.FormPanelController', {
     },
 
     onPrint: function() {
-        console.log('print');
+        var me = this,
+        form = me.getView(),
+        viewModel = me.getViewModel(),
+        caller = form.caller,
+        id = viewModel.get(form._idField);
+
+        saas.util.BaseUtil.request({
+            url: '/api/commons/jasperReport/printByDefault',
+            // url: 'http://192.168.253.58:8920/jasperReport/printByDefault',
+            method: 'POST',
+            headers: {
+                "Content-Type": 'application/x-www-form-urlencoded;charset=UTF-8'
+            },
+            params: {
+                caller: caller,
+                id: id
+            }
+        }).then(function(res) {
+            var data = res.data,
+            printurl = data.printurl,
+            printtype = data.printtype,
+            reportName = data.reportName,
+            title = data.title,
+            whereCondition = data.whereCondition,
+            companyId = saas.util.BaseUtil.getCurrentUser().companyId;
+
+            var url = printurl + '?' + 'reportName=' + reportName + '&' + 'companyId=' + companyId + '&whereCondition=' + whereCondition
+
+            window.open(url);
+        });
     },
 });

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

@@ -11,6 +11,7 @@ Ext.define('saas.view.core.form.FormPanelModel', {
             codeEditable: false, // 单据编号是否可编辑
         },
         auditBtnText: '审核', // 审核按钮默认text
+        showPrintBtn: false, // 显示打印按钮
         showAuditBtn: true, // 显示审核、反审核按钮
         detailBindeFields: [], // 从表绑定列
         detailStore: null, // 从表store

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -5,6 +5,9 @@ Ext.define('saas.view.document.customer.BasePanel', {
     controller: 'document-customer-basepanel',
     viewModel: 'document-customer-basepanel',
 
+    deleteMoreMsg: '删除的客户资料将不能恢复，请确认是否删除？',
+    deleteOneMsg: '删除的客户资料将不能恢复，请确认是否删除？',
+
     searchField:[{
         xtype:'customerDbfindTrigger',
         name : "cu_code", 

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -229,8 +229,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 dataUrl:'/api/account/role/list',
                 fieldLabel: '关联角色',
                 name: 'roleNames',
-                allowBlank:false,
-                maxLength: 20
+                allowBlank:true,
+                maxLength: 20,
+                beforeLabelTextTpl: "",
             },{
                 xtype:'textfield',
                 fieldLabel: '联系电话',
@@ -464,6 +465,10 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         });
         o = o.substring(0,o.length-1);
 
+        if(o==""){
+            saas.util.BaseUtil.showToast('关联角色未选择，无法保存！')
+        }
+
         var _params = {
             accountId:Number(params['accountId']),
             roleIds:o,

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/document/product/FormPanel.js

@@ -372,6 +372,8 @@ Ext.define('saas.view.document.product.FormPanel', {
             trueData = detailGrid.getTrueData();
 
             viewModel.set('qcsz', trueData.length > 0);
+            viewModel.notify();
+            form.getForm().findField('qcsz').resetOriginalValue();
         }
     }
 });

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/money/othreceipts/FormPanelModel.js

@@ -2,4 +2,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.money-othreceipts-formpanel',
 
+    data: {
+        showPrintBtn: true
+    }
 });

frontend/saas-web/app/view/money/othspendings/FormPanelModel.js

@@ -2,4 +2,7 @@ Ext.define('saas.view.money.othspendings.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.money-othspendings-formpanel',
 
+    data: {
+        showPrintBtn: true
+    }
 });

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

@@ -2,6 +2,10 @@ Ext.define('saas.view.money.payBalance.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.money-paybalance-formpanel',
 
+    data: {
+        showPrintBtn: true
+    },
+    
     formulas: {
         pb_vendname_change: {
             bind: '{pb_vendid}',

frontend/saas-web/app/view/purchase/purchase/FormPanelModel.js

@@ -2,6 +2,9 @@ Ext.define('saas.view.purchase.purchase.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-purchase-formpanel',
 
+    data: {
+        showPrintBtn: true
+    },
 
     formulas:{
         turnHidden:{

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelModel.js

@@ -1,15 +1,17 @@
 Ext.define('saas.view.purchase.purchaseIn.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-purchasein-formpanel',
-    
+
     data: {
-        pi_class: '采购验收单'
-     },
-     formulas:{
-        turnHidden:{
-            bind:'{pi_statuscode}',
-            get:function(value){
-                return value!='AUDITED';
+        pi_class: '采购验收单',
+        showPrintBtn: true
+    },
+
+    formulas: {
+        turnHidden: {
+            bind: '{pi_statuscode}',
+            get: function (value) {
+                return value != 'AUDITED';
             }
         }
     }

frontend/saas-web/app/view/purchase/purchaseOut/FormPanelModel.js

@@ -1,8 +1,9 @@
 Ext.define('saas.view.purchase.purchaseOut.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.purchase-purchaseout-formpanel',
-    
+
     data: {
-        pi_class: '采购验退单'
-     }
+        pi_class: '采购验退单',
+        showPrintBtn: true
+    }
 });

frontend/saas-web/app/view/sale/sale/FormPanelModel.js

@@ -1,4 +1,8 @@
 Ext.define('saas.view.sale.sale.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.sale-sale-formpanel',
+
+    data: {
+        showPrintBtn: true
+    }
 });

frontend/saas-web/app/view/sale/saleIn/FormPanelModel.js

@@ -1,4 +1,8 @@
 Ext.define('saas.view.sale.saleIn.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.sale-salein-formpanel',
+
+    data: {
+        showPrintBtn: true
+    }
 });

frontend/saas-web/app/view/sale/saleOut/FormPanelModel.js

@@ -2,4 +2,8 @@ Ext.define('saas.view.sale.saleout.FormPanelModel', {
     extend: 'saas.view.core.form.FormPanelModel',
     alias: 'viewmodel.sale-saleout-formpanel',
 
+    data: {
+        showPrintBtn: true
+    }
+
 });

frontend/saas-web/app/view/stock/otherIn/FormPanelModel.js

@@ -3,6 +3,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelModel', {
     alias: 'viewmodel.stock-otherin-formpanel',
     
     data: {
-        pi_class: '其它入库单'
-     }
+        pi_class: '其它入库单',
+        showPrintBtn: true
+    }
 });

frontend/saas-web/app/view/stock/otherOut/FormPanelModel.js

@@ -3,6 +3,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelModel', {
     alias: 'viewmodel.stock-otherout-formpanel',
     
     data: {
-        pi_class: '其它出库单'
-     }
+        pi_class: '其它出库单',
+        showPrintBtn: true
+    }
 });

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

frontend/saas-web/app/view/viewport/ViewportController.js

@@ -168,6 +168,7 @@ Ext.define('saas.view.viewport.ViewportController', {
                 })
                 .then(function() {
                     view.isMasked() && view.unmask();
+                    window.location.reload();
                 }); 
         }        
     }