Merge remote-tracking branch 'origin/dev' 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;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -143,7 +143,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //判断更新与保存动作
         if (StringUtils.isEmpty(pi_id) || "0".equals(pi_id.toString())){
             prodInOut.setCompanyId(companyId);
-            setCreateInfo(prodInOut);
+            //setCreateInfo(prodInOut);
             //插入操作
             getMapper().insertSelective(prodInOut);
             pi_id = prodInOut.getId();
@@ -170,7 +170,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             messageLogService.save(baseDTO);
             return baseDTO;
         }else{
-            setUpdateInfo(prodInOut);
+            //setUpdateInfo(prodInOut);
         }
         //更新操作
         getMapper().updateByPrimaryKeySelective(prodInOut);
@@ -517,7 +517,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }
             prodInOut.setPi_statuscode(Status.CLOSE.name());
             prodInOut.setPi_status(Status.CLOSE.getDisplay());
-            setUpdateInfo(prodInOut);
+            //setUpdateInfo(prodInOut);
             getMapper().updateByPrimaryKeySelective(prodInOut);
             docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
             //日志
@@ -552,7 +552,7 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
             }
             prodInOut.setPi_statuscode(Status.OPEN.name());
             prodInOut.setPi_status(Status.OPEN.getDisplay());
-            setUpdateInfo(prodInOut);
+            //setUpdateInfo(prodInOut);
             getMapper().updateByPrimaryKeySelective(prodInOut);
             docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
             //日志

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -128,7 +128,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         if (StringUtils.isEmpty(pu_id) || "0".equals(pu_id.toString())) {
             //录入人
             purchase.setCompanyId(companyId);
-            setCreateInfo(purchase);
+           // setCreateInfo(purchase);
             //插入操作
             purchaseMapper.insertSelective(purchase);
             pu_id = purchase.getId();
@@ -159,7 +159,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
             messageLogService.save(baseDTO);
             return baseDTO;
         }else{
-            setUpdateInfo(purchase);
+           // setUpdateInfo(purchase);
         }
         //更新操作
         purchaseMapper.updateByPrimaryKeySelective(purchase);
@@ -518,7 +518,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
         purchase.setUpdater(BaseContextHolder.getUserName());
-        setUpdateInfo(purchase);
+       // setUpdateInfo(purchase);
         //更新存在字段
         purchaseMapper.updateByPrimaryKeySelective(purchase);
         //更新最新采购单价
@@ -540,7 +540,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setId(id);
         purchase.setPu_status(Status.UNAUDITED.getDisplay());
         purchase.setPu_statuscode(Status.UNAUDITED.name());
-        setUpdateInfo(purchase);
+        //setUpdateInfo(purchase);
         //更新存在字段
         purchaseMapper.updateByPrimaryKeySelective(purchase);
         DocBaseDTO docBaseDTO = getBaseDTOById(id);

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -41,7 +41,7 @@ import java.util.*;
  * @create: 2018-10-22 11:29
  **/
 @Service
-public class SaleServiceImpl extends CommonBaseServiceImpl<SaleMapper,Sale> implements SaleService{
+public class SaleServiceImpl implements SaleService{
 
     @Autowired
     private SaleListMapper saleListMapper;
@@ -101,7 +101,7 @@ public class SaleServiceImpl extends CommonBaseServiceImpl<SaleMapper,Sale> impl
         //人员Id
         Long userId = BaseContextHolder.getUserId();
         //获取主表信息
-         SaleDTO main = formdata.getMain();
+        SaleDTO main = formdata.getMain();
         List<SaleDetailDTO> items = formdata.getItems();
         //插入从表数据
         List<SaleDetail> insertDetails = new ArrayList<>();

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/RoleDTO.java

@@ -67,9 +67,9 @@ public class RoleDTO extends CommonBaseDTO implements Serializable{
                 ", description='" + description + '\'' +
                 ", id=" + id +
                 ", createTime=" + createTime +
-                ", creatorName='" + creator + '\'' +
+                ", creatorName='" + creatorName + '\'' +
                 ", updateTime=" + updateTime +
-                ", updaterName='" + updater + '\'' +
+                ", updaterName='" + updaterName + '\'' +
                 '}';
     }
 }

framework/core/src/main/java/com/usoftchina/saas/base/dto/CommonBaseDTO.java

@@ -9,28 +9,10 @@ import java.util.Date;
  */
 public abstract class CommonBaseDTO implements Serializable{
     protected Long id;
-
     protected Date createTime;
-    protected Long creatorId;
-    protected String creator;
-
+    protected String creatorName;
     protected Date updateTime;
-    protected Long updaterId;
-    protected String updater;
-
-    public String getCreator() {
-        return creator;
-    }
-
-    public void setCreator(String creator){
-        this.creator = creator;
-    }
-
-    public String getUpdater() { return updater; }
-
-    public void setUpdater(String updater){
-        this.updater = updater;
-    }
+    protected String updaterName;
 
     public Long getId() {
         return id;
@@ -48,12 +30,12 @@ public abstract class CommonBaseDTO implements Serializable{
         this.createTime = createTime;
     }
 
-    public Long getCreatorId() {
-        return creatorId;
+    public String getCreatorName() {
+        return creatorName;
     }
 
-    public void setCreatorId(Long creatorId) {
-        this.creatorId = creatorId;
+    public void setCreatorName(String creatorName) {
+        this.creatorName = creatorName;
     }
 
     public Date getUpdateTime() {
@@ -64,11 +46,11 @@ public abstract class CommonBaseDTO implements Serializable{
         this.updateTime = updateTime;
     }
 
-    public Long getUpdaterId() {
-        return updaterId;
+    public String getUpdaterName() {
+        return updaterName;
     }
 
-    public void setUpdaterId(Long updaterId) {
-        this.updaterId = updaterId;
+    public void setUpdaterName(String updaterName) {
+        this.updaterName = updaterName;
     }
 }

framework/core/src/main/java/com/usoftchina/saas/base/entity/BaseEntity.java

@@ -64,31 +64,4 @@ public abstract class BaseEntity<E extends Serializable> implements Serializable
      * @param companyId
      */
     public abstract void setCompanyId(long companyId);
-
-    /**
-     * get 创建人
-     *
-     * @return
-     */
-    public abstract String getCreator();
-
-    /**
-     * set 创建人
-     *
-     * @param creator
-     */
-    public abstract  void setCreator(String creator);
-
-    /**
-     * get 创建人
-     *
-     * @return
-     */
-    public abstract String getUpdater();
-    /**
-     * set 创建人
-     *
-     * @param updater
-     */
-    public abstract  void setUpdater(String updater);
 }

framework/core/src/main/java/com/usoftchina/saas/base/entity/CommonBaseEntity.java

@@ -12,15 +12,10 @@ public abstract class CommonBaseEntity extends BaseEntity<Long> {
      * company id
      */
     protected Long companyId;
-
-    protected Long creatorId;
-    protected String creator;
     protected Date createTime;
-
-    protected Long updaterId;
-    protected String updater;
+    protected Long creatorId;
     protected Date updateTime;
-
+    protected Long updaterId;
 
     @Override
     public Long getId() {
@@ -77,16 +72,4 @@ public abstract class CommonBaseEntity extends BaseEntity<Long> {
     public void setUpdaterId(long updaterId) {
         this.updaterId = updaterId;
     }
-
-    @Override
-    public String  getCreator(){return creator;};
-
-    @Override
-    public void setCreator(String creator){ this.creator = creator; };
-
-    @Override
-    public String getUpdater(){ return updater;};
-
-    @Override
-    public void setUpdater(String updater){ this.updater = updater; };
 }

framework/core/src/main/java/com/usoftchina/saas/base/service/BaseServiceImpl.java

@@ -81,14 +81,12 @@ public abstract class BaseServiceImpl<ID extends Serializable, T extends BaseEnt
      *
      * @param record
      */
-    protected void setCreateInfo(T record) {
+    private void setCreateInfo(T record) {
         Date nowDate = new Date();
         record.setCreateTime(nowDate);
         record.setCreatorId(BaseContextHolder.getUserId());
-        record.setCreator(BaseContextHolder.getUserName());
         record.setUpdateTime(nowDate);
         record.setUpdaterId(BaseContextHolder.getUserId());
-        record.setUpdater(BaseContextHolder.getUserName());
     }
 
     /**
@@ -96,9 +94,8 @@ public abstract class BaseServiceImpl<ID extends Serializable, T extends BaseEnt
      *
      * @param record
      */
-    protected void setUpdateInfo(T record) {
+    private void setUpdateInfo(T record) {
         record.setUpdateTime(new Date());
         record.setUpdaterId(BaseContextHolder.getUserId());
-        record.setUpdater(BaseContextHolder.getUserName());
     }
 }

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
         }, {