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

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/SaleList.java

@@ -49,7 +49,7 @@ public class SaleList implements Serializable {
 
     private Integer updaterId;
 
-    private Date updatetime;
+    private Date updateTime;
 
     private String sa_text1;
 
@@ -61,7 +61,7 @@ public class SaleList implements Serializable {
 
     private String sa_text5;
 
-    private String creatorname;
+    private String creatorName;
 
     private String sa_auditman;
 

applications/sale/sale-server/src/main/resources/mapper/SaleListMapper.xml

@@ -17,11 +17,11 @@
         <result column="sa_sendstatus" property="sa_sendstatus" jdbcType="VARCHAR" />
         <result column="sa_printstatus" property="sa_printstatus" jdbcType="VARCHAR" />
         <result column="sa_printstatuscode" property="sa_printstatuscode" jdbcType="VARCHAR" />
-        <result column="creatorname" property="creatorname" jdbcType="VARCHAR" />
+        <result column="creatorName" property="creatorName" jdbcType="VARCHAR" />
         <result column="sa_auditman" property="sa_auditman" jdbcType="VARCHAR" />
         <result column="companyid" property="companyid" jdbcType="INTEGER" />
         <result column="updaterId" property="updaterId" jdbcType="INTEGER" />
-        <result column="updatetime" property="updatetime" jdbcType="TIMESTAMP" />
+        <result column="updatetime" property="updateTime" jdbcType="TIMESTAMP" />
         <result column="sa_date" property="sa_date" jdbcType="TIMESTAMP" />
         <result column="sa_text1" property="sa_text1" jdbcType="VARCHAR" />
         <result column="sa_text2" property="sa_text2" jdbcType="VARCHAR" />

frontend/saas-portal-web/src/components/conenter/addenterprise.vue

@@ -204,6 +204,7 @@ import { setTimeout } from 'timers';
             },
             //保存
             Preservation(){
+                this.listLoading = true
                 let qyname = this.$refs.qyname.value.replace(/\s+/g, "");//公司名字
                 let qyindustry = this.$refs.qyindustry.value;//所属行业
                 let address = this.province+this.city+this.area+this.$refs.address.value.replace(/\s+/g, "");//公司详细地址
@@ -287,6 +288,7 @@ import { setTimeout } from 'timers';
                         break;
                     }
                 }
+                this.listLoading = false
             },
             remotxt(){
                 setTimeout(()=>{

frontend/saas-web/app/view/core/dbfind/AddMultiDbfindGridPanel.js

@@ -191,7 +191,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                     store: me.store,
                     items:[{
                         xtype:'checkbox',
-                        id:'showSelectRecord',
+                        name:'showSelectRecord',
                         boxLabel:'已选中数据',
                         handler:function(b){
                             var grid = me;
@@ -227,7 +227,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         }
                     }],
                     moveFirst: function() {
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (this.fireEvent('beforechange', this, 1) !== false) {
                                 this.store.loadPage(1);
                                 this.ownerCt.selModel.noChange = true;
@@ -243,7 +243,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             prev = store.currentPage - 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (prev > 0) {
                                 if (me.fireEvent('beforechange', me, prev) !== false) {
                                     store.previousPage();
@@ -262,7 +262,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                             store = me.store,
                             total = me.getPageData().pageCount,
                             next = store.currentPage + 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (next <= total) {
                                 if (me.fireEvent('beforechange', me, next) !== false) {
                                     store.nextPage();
@@ -279,7 +279,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                     moveLast: function() {
                         var me = this,
                             last = me.getPageData().pageCount;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, last) !== false) {
                                 me.store.loadPage(last);
                                 this.ownerCt.selModel.noChange = true;
@@ -295,7 +295,7 @@ Ext.define('saas.view.core.dbfind.AddMultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             current = store.currentPage;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, current) !== false) {
                                 store.loadPage(current);
                                 this.ownerCt.selModel.noChange = true;

frontend/saas-web/app/view/core/dbfind/MultiDbfindGridPanel.js

@@ -201,7 +201,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                     store: me.store,
                     items:[{
                         xtype:'checkbox',
-                        id:'showSelectRecord',
+                        name:'showSelectRecord',
                         boxLabel:'已选中数据',
                         handler:function(b){
                             var grid = me;
@@ -237,7 +237,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         }
                     }],
                     moveFirst: function() {
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (this.fireEvent('beforechange', this, 1) !== false) {
                                 this.store.loadPage(1);
                                 this.ownerCt.selModel.noChange = true;
@@ -253,7 +253,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             prev = store.currentPage - 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (prev > 0) {
                                 if (me.fireEvent('beforechange', me, prev) !== false) {
                                     store.previousPage();
@@ -272,7 +272,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                             store = me.store,
                             total = me.getPageData().pageCount,
                             next = store.currentPage + 1;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (next <= total) {
                                 if (me.fireEvent('beforechange', me, next) !== false) {
                                     store.nextPage();
@@ -289,7 +289,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                     moveLast: function() {
                         var me = this,
                             last = me.getPageData().pageCount;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, last) !== false) {
                                 me.store.loadPage(last);
                                 this.ownerCt.selModel.noChange = true;
@@ -305,7 +305,7 @@ Ext.define('saas.view.core.dbfind.MultiDbfindGridPanel', {
                         var me = this,
                             store = me.store,
                             current = store.currentPage;
-                        if(Ext.getCmp('showSelectRecord').checked==false){
+                        if(me.down('[name=showSelectRecord]').checked==false){
                             if (me.fireEvent('beforechange', me, current) !== false) {
                                 store.loadPage(current);
                                 this.ownerCt.selModel.noChange = true;

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

@@ -232,8 +232,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         detnoColumn: 'cc_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deletecontact',
-        height:145,
-        emptyRows: 3,
+        // height:145,
+        // emptyRows: 3,
         columns : [
             {
                 text : "ID", 
@@ -297,8 +297,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         detnoColumn: 'ca_detno',
         showCount: false,
         deleteDetailUrl:'/api/document/customer/deleteaddress',
-        height:145,
-        emptyRows: 3,
+        // height:145,
+        // emptyRows: 3,
         columns : [
             {
                 text : "ID", 

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

@@ -11,6 +11,7 @@
                 font-size: 12px;
                 border: none !important;
                 outline: none !important;
+                padding-right: 0;
                 text-align: left;
 
                 .x-legend-item-marker {

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

@@ -75,6 +75,7 @@ Ext.define('saas.view.main.Main', {
                     height:45,
                     menu: {
                         cls:'x-main-menu sa-nav-menu',
+                        height: 66,
                         items: [{
                             text: '新手导航',
                             iconCls:'x-fa sa-navicon fa-comment-o',
@@ -132,6 +133,7 @@ Ext.define('saas.view.main.Main', {
                         html:'<img class="x-img x-box-item x-toolbar-item x-img-header" style="height:35px;width:35px;margin-top: 6px;margin-left: 14px;" src="{avatarUrl}" alt="">'
                     }, 
                     menu: {
+                        height: 98,
                         cls:'x-main-menu2 sa-nav-menu', 
                         items: [ {  
                             text: '账户中心',