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

README.md

@@ -107,7 +107,7 @@
 
 > 构建
 
-* [jenkins](http://192.168.253.3:8080/job/saas) **账号** admin **密码** select123***
+* [jenkins](http://192.168.0.181:8080/job/saas) **账号** admin **密码** select123***
 
 > 日志
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -261,6 +261,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
      * @param id
      */
     @Override
+    @Transactional
     public void deleteById(Long id) {
         if(id != null && id > 0){
             String code = getMapper().getCodeById(id, new Long(1));
@@ -272,6 +273,7 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
             map.put("v_res","");
             vendorMapper.check(map);
             Object result =  map.get("v_res");
+            System.out.println("result:" + result);
             if(!StringUtils.isEmpty(result)){
                 throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
             }else{

applications/document/document-server/src/main/resources/application.yml

@@ -20,6 +20,9 @@ spring:
       connection-timeout: 30000
   messages:
     basename: i18n/messages
+  redis:
+    host: 192.168.253.12
+    port: 6379
   rabbitmq:
     host: 192.168.0.176
     port: 5672

applications/money/money-server/src/main/resources/application.yml

@@ -18,6 +18,9 @@ spring:
       connection-timeout: 30000
   messages:
     basename: i18n/messages
+  redis:
+    host: 192.168.253.12
+    port: 6379
   rabbitmq:
     host: 192.168.0.176
     port: 5672

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                 bind: {
                     captions: {
                         title: {
-                            text: '本月收入（万元）：{month_in}\n本月支出（万元）：{month_out}',
+                            text: '本月收入支出额（万元）\n收入：{month_in}\t支出：{month_out}',
                             style: {
                                 'font-size': '14px',
                                 'color': '#485465',

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                 bind: {
                     captions: {
                         title: {
-                            text: '采购金额（万元）',
+                            text: '近六月采购趋势图',
                             style: {
                                 'font-size': '14px',
                                 'color': '#485465',
@@ -72,6 +72,12 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                         trackMouse: true,
                         renderer: me.onBarTipRender
                     },
+                    // label: {
+                    //     field: 'y',
+                    //     display: 'insideEnd',
+                    //     fontSize: '12px',
+                    //     strokeStyle: '#fff',
+                    // },
                     style: {
                         lineWidth: 0,
                         strokeStyle: 'transparent',
@@ -85,7 +91,7 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
     },
 
     onBarTipRender: function (tooltip, record, item) {
-        tooltip.setHtml(record.get('x') + ': ' + record.get('y') + '万元');
+        tooltip.setHtml(record.get('x') + '月: ' + record.get('y') + '万元');
     },
 
     categoryRender: function(axis, label, layoutContext, lastLabel) {

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
                 bind: {
                     captions: {
                         title: {
-                            text: '库存金额（万元）',
+                            text: '近六月库存金额图',
                             style: {
                                 'font-size': '14px',
                                 'color': '#485465',
@@ -85,7 +85,7 @@ Ext.define('saas.view.home.charts.StockAmount', {
     },
 
     onBarTipRender: function (tooltip, record, item) {
-        tooltip.setHtml(record.get('x') + ': ' + record.get('y') + '万元');
+        tooltip.setHtml(record.get('x') + '月: ' + record.get('y') + '万元');
     },
 
     categoryRender: function(axis, label, layoutContext, lastLabel) {