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/OthreceiptsServiceImpl.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.money.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.api.CommonService;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
 import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
@@ -46,6 +47,8 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
+//    @Autowired
+//    private CommonService commonService;
 
     @Override
     public DocBaseDTO insert(Othte othte) {
@@ -126,6 +129,9 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         }
 
         DocBaseDTO baseDTO = getBaseDTOById(id);
+//        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+//                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+//                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -47,8 +47,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
     private StatsinfoMapper statsinfoMapper;
     @Autowired
     private MessageLogService messageLogService;
-    @Autowired
-    private CommonService commonService;
+//    @Autowired
+//    private CommonService commonService;
 
 
     public DocBaseDTO insert(Pay pay) {
@@ -178,6 +178,8 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
         Long companyId = BaseContextHolder.getCompanyId();
         Paybalance paybalance = pay.getMain();
         paybalance.setCompanyId(companyId);
+        paybalance.setPb_status(Status.AUDITED.getDisplay());
+        paybalance.setPb_statuscode(Status.AUDITED.name());
         Subledger subledger = this.changSubledgerUntil(paybalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -264,9 +266,9 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
-        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
-                "pb_id='+baseDTO.getId()","pb_status","pb_statuscode",
-                "pb_auditdate","pb_auditman");
+//        commonService.commonAudit(BillCodeSeq.PAYBALANCE.getCaller(),
+//                "pb_id="+baseDTO.getId(),"pb_status","pb_statuscode",
+//                "pb_auditdate","pb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

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

@@ -213,6 +213,8 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
         Long companyId = BaseContextHolder.getCompanyId();
         Recbalance recbalance = rec.getMain();
         recbalance.setCompanyId(companyId);
+        recbalance.setRb_status(Status.AUDITED.getDisplay());
+        recbalance.setRb_statuscode(Status.AUDITED.name());
         Subledger subledger = this.changSubledgerUntil(recbalance);
         if (subledger.getSl_code() == null){
             subledgerMapper.insertSelective(subledger);
@@ -300,9 +302,9 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
             statsinfoMapper.update(statsinfo);
         }
         DocBaseDTO baseDTO = getBaseDTOById(id);
-        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
-                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
-                "rb_auditdate","rb_auditman");
+//        commonService.commonAudit(BillCodeSeq.RECBALANCE.getCaller(),
+//                "rb_id="+baseDTO.getId(),"rb_status","rb_statuscode",
+//                "rb_auditdate","rb_auditman");
         //日志记录
         messageLogService.save(baseDTO);
         return baseDTO;

base-servers/socket/socket-api/src/main/java/com/usoftchina/saas/socket/api/SocketMessageApi.java

@@ -19,7 +19,7 @@ public interface SocketMessageApi {
      * @return
      */
     @PostMapping("/clients/{clientId}")
-    Result sendToClient(@PathVariable String clientId, String message);
+    Result sendToClient(@PathVariable("clientId") String clientId, String message);
 
     /**
      * 广播信息

frontend/saas-portal-web/src/css/main.css

@@ -110,6 +110,19 @@ main > section {
     margin-top: -4px;
     margin-right: 10px;
 }
+.qiantao {
+    display: none;
+    position: fixed;
+    top: 55%;
+    left: 50%;
+    z-index: 10;
+    margin-left: -220px;
+    margin-top: -230px;
+    width: 440px;
+    height: 460px;
+    /* width: 100%;
+    height: 100%; */
+}
 .box,.box-zc{
     display:none;
     width: 378px;
@@ -474,7 +487,7 @@ main > section {
 /* 帮助 ........................................*/
 .bz-worp {
     background: white;
-    width: 80%;
+    width: 90%;
     margin: 0 auto;
     padding: 40px;
 }
@@ -554,6 +567,7 @@ main > section {
 }
 /* 底部 ...................................*/
 /*footer*/
+
 .footer{
     width: 100%;
     background: #383838;
@@ -565,7 +579,7 @@ main > section {
 .footer .container{
     margin: 0 auto;
     width: 80%;
-    height: 445px;
+    height: 260px;
     overflow: hidden;
     text-align: center;
 }
@@ -592,7 +606,7 @@ main > section {
 }
 .footer-section ul>li a{
     display: inline-block;
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     font-size: 12px;
     color: #fff;
     cursor: pointer;
@@ -656,30 +670,40 @@ main > section {
 .footer .footer-list{
     margin: 55px auto 22px;
 }
-.footer .friend-link{
+
+
+.friend-link{
     height: 100px;
-    padding: 28px 0 16px;
-    border-top: 1px solid rgba(255,255,255,.2);
-    border-bottom: 1px solid rgba(255,255,255,.2)
+    background: #000;
+    width: 100%;
+    line-height: 100px;
 }
-.footer .friend-link ul{
+.friend-link ul{
     overflow: hidden;
     list-style: none ;
+    width: 80%;
+    margin: 0 auto;
+    padding: 0 15px;
 }
-.footer .friend-link ul li{
+.friend-link ul li{
     float: left;
 }
-.footer .friend-link ul li span{
+.friend-link ul li span{
     font-size: 14px;
-    color: #8b8b8b;
+    color: #FFFFFF;
 }
-.footer .friend-link ul li a{
+.friend-link ul li a{
     display: inline-block;
     margin-right: 20px;
     font-size: 14px;
-    color: #8b8b8b;
+    color: #FFFFFF;
+}
+.friend-link ul li a:hover{
+    text-decoration: underline ;
+    color: #e41f2b;
 }
 
+
 /* Sweep To Right */
 .btn-effect {
 	vertical-align: middle;

frontend/saas-portal-web/src/css/slit-slider.css

@@ -148,7 +148,7 @@
 	-ms-animation: fadeOut 1s ease-in-out both;
 	animation: fadeOut 1s ease-in-out both;
 }
-.sl-trans-back-elems .caption-content span,,
+.sl-trans-back-elems .caption-content span,
 .sl-trans-back-elems .caption-content a {
 	-webkit-animation: fadeOut 1s linear both;
 	-moz-animation: fadeOut 1s linear both;

frontend/saas-portal-web/src/index.html

@@ -99,9 +99,13 @@
 		
 		<main class="site-content" role="main">
 			<!-- 遮罩 -->
-			<div class="zhezhao"></div>
+			<div class="zhezhao"></div> 
+		<!-- 登录嵌套 -->
+			<iframe id="box" class="qiantao" src="http://10.1.51.91:3001/sassLogin?appId=sp&returnURL=https://www.usoftchina.com"></iframe>
+		<!-- 注册嵌套 -->
+			<iframe id="box-zc" class="qiantao"src="http://10.1.51.91:3001/sassLogin/register?appId=sp&returnURL=https://www.usoftchina.com "></iframe>
 			<!-- 注册 -->
-			<div id="box-zc" class="box-zc">
+			<div id="box-zc1" class="box-zc">
 				<div class="tc-login" id="zhuce">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
 					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
@@ -153,8 +157,8 @@
 				</div>
 			</div>
 			<!-- 登录窗 -->
-			<div id="box" class="box">
-		<!-- 账号登录 -->
+			<div id="box1" class="box">
+			<!-- 账号登录 -->
 				<div class="tc-login" id="zhanghao">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
 					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
@@ -198,8 +202,7 @@
 						</div>
 					</div> -->
 				</div>
-		<!-- 短信登录 -->
-
+			<!-- 短信登录 -->
 				<div class="tc-login" id="duanxin" style="display:none">
 					<div class="tc-out"><img class="tc-on" src="./img/assets/chahao.png" alt=""></div>
 					<div><img class="tc-logoimg" src="./img/assets/dalogo@3x.png" alt=""></div>
@@ -293,7 +296,7 @@
 							<p class="ts-text">云端部署 &nbsp;&nbsp; 轻量应用</p>
 						</div>
 						<div class="ts-box">
-							<div class="left" style="margin:50px 0;">
+							<div style="margin:50px 0;">
 								<img  class="ts-img" src="img/features.jpg" alt="">
 							</div>
 							<div class="right right-text">
@@ -319,7 +322,7 @@
 							</div>
 						</div>
 						<div class="ts-box">
-							<div class="left" style="margin:50px 0;">
+							<div style="margin:50px 0;">
 								<img  class="ts-img" src="img/features.jpg" alt="">
 							</div>
 							<div class="right right-text">
@@ -580,7 +583,7 @@
 						</ul>
 					</div>
 					
-					<div class="qr">
+					<div class="qr" style="float:right">
 						<div class="qr-top">
 							<div class="qr-tech qr-code">
 								<img src="./img/qr-tech.png" alt="">
@@ -600,16 +603,17 @@
 						</div> -->
 					</div>
 				</div>
-				<div class="friend-link" style="margin-top: 100px;">
-					<ul style="margin-left: -40px;">
-						<li><span>常用链接：</span></li>
-						<li><a href="#">uas官网</a></li>
-						<li><a href="#">u软云</a></li>
-						<li><a href="#">英唐官网</a></li>
-					</ul>
-				</div>
+				
 			</div>
 		</div>
+		<div class="friend-link">
+			<ul>
+				<li><span>常用链接：</span></li>
+				<li><a href="#">uas官网</a></li>
+				<li><a href="#">u软云</a></li>
+				<li><a href="#">英唐官网</a></li>
+			</ul>
+		</div>
 		<!--footer end-->
 		
 		<!-- Essential jQuery Plugins

frontend/saas-web/app/view/home/charts/MonthSale.js

@@ -32,6 +32,22 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     '#53A8E2',
                     '#76DDFB',
                     '#DBECF8',
+                    '#426AB3',
+                    '#228FBD',
+                    '#2A5CAA',
+                    '#7BBFEA',
+                    '#2A8FBD',
+                    '#4C556E',
+                    '#9999FF',
+                    '#CCCCFF',
+                    '#06B9D1',
+                    '#005A78',
+                    '#00466B',
+                    '#005687',
+                    '#05173B',
+                    '#1A4FA3',
+                    '#1E90FF',
+                    '#B0E0E6'
                 ],
                 width: '100%',
                 innerPadding: 20,

frontend/saas-web/app/view/home/charts/PurchaseTrend.js

@@ -28,10 +28,10 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     store: '{purchase_trend}',
                 },
                 axes: [{
-                    title: {
-                        text: '月',
-                        fontSize: 14,
-                    },
+                    // title: {
+                    //     text: '月',
+                    //     fontSize: 14,
+                    // },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
@@ -39,6 +39,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                         fill: '#E7EBEF',
                         strokeStyle: 'transparent'
                     },
+                    renderer: me.categoryRender
                 },{
                     type: 'numeric',
                     fields: ['y'],
@@ -80,4 +81,8 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
         tooltip.setHtml(record.get('x') + ': ' + record.get('y') + '万元');
     },
 
+    categoryRender: function(axis, label, layoutContext, lastLabel) {
+        return label + '月';
+    }
+
 });

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -34,10 +34,10 @@ Ext.define('saas.view.home.charts.SaleTrend', {
 
                 // },
                 axes: [{
-                    title: {
-                        text: '月',
-                        fontSize: 14,
-                    },
+                    // title: {
+                    //     text: '月',
+                    //     fontSize: 14,
+                    // },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
@@ -45,6 +45,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                         fill: '#E7EBEF',
                         strokeStyle: 'transparent'
                     },
+                    renderer: me.categoryRender
                 },{
                     type: 'numeric',
                     fields: ['sale', 'saleback'],
@@ -94,4 +95,8 @@ Ext.define('saas.view.home.charts.SaleTrend', {
         tooltip.setHtml(record.get('x') + title + record.get(item.series.getYField()) + '万元');
     },
 
+    categoryRender: function(axis, label, layoutContext, lastLabel) {
+        return label + '月';
+    }
+
 });

frontend/saas-web/app/view/home/charts/StockAmount.js

@@ -28,10 +28,10 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     store: '{stock_amount}',
                 },
                 axes: [{
-                    title: {
-                        text: '月',
-                        fontSize: 14,
-                    },
+                    // title: {
+                    //     text: '月',
+                    //     fontSize: 14,
+                    // },
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
@@ -39,6 +39,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                         fill: '#E7EBEF',
                         strokeStyle: 'transparent'
                     },
+                    renderer: me.categoryRender
                 },{
                     type: 'numeric',
                     fields: ['y'],
@@ -80,4 +81,8 @@ Ext.define('saas.view.home.charts.StockAmount', {
         tooltip.setHtml(record.get('x') + ': ' + record.get('y') + '万元');
     },
 
+    categoryRender: function(axis, label, layoutContext, lastLabel) {
+        return label + '月';
+    }
+
 });

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

@@ -10,7 +10,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     queryFormItems: [{
         xtype : "textfield",
         name : "ft_code",
-        fieldLabel : "单号",
+        fieldLabel : "单据编号",
         columnWidth: 0.3
     },{
         xtype : "condatefield",

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
    }, {
         xtype: 'textfield',
         name: 'or_code',
-        fieldLabel: '单号',
+        fieldLabel: '单据编号',
         columnWidth: 0.3
     }, {
         xtype: 'hidden',

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

@@ -20,7 +20,7 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
    }, {
         xtype : 'textfield',
         name : 'os_code',
-        fieldLabel : '单号',
+        fieldLabel : '单据编号',
         columnWidth: 0.3,
     }, {
         xtype: 'hidden',

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

@@ -59,7 +59,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             xtype: 'numbercolumn',
             hidden:true
         }, {
-            text: '单号',
+            text: '单据编号',
             dataIndex: 'pb_code',
             width: 200
         }, {