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

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

@@ -411,8 +411,15 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         validProductOperation(id, BizExceptionCode.BIZ_RELDELETE_DELETEPROD);
         //校验是否存在关联单据
         validEnableDel(id);
-
         String code = getMapper().getCodeById(id);
+
+        //找到原始单据,反过账并删除
+        String inoutCode = getMapper().selectProdIOCode(code, BaseContextHolder.getCompanyId(), "库存初始化");
+        if (!StringUtils.isEmpty(inoutCode)) {
+            post(inoutCode, "反过账");
+            getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
+            getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
+        }
         productDetailMapper.deleteByProdId(id);
         getMapper().deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = generateMsgObj(id, code);

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/BasePanel.js

@@ -82,7 +82,8 @@ Ext.define('saas.view.document.customer.BasePanel', {
         },{
             text : "客户简称", 
             width : 150.0, 
-            dataIndex : "cu_shortname"
+            dataIndex : "cu_shortname",
+            hidden: true
         }, 
         {
             text : "客户名称", 

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

@@ -44,7 +44,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype: 'textfield',
         name: 'cu_shortname',
         fieldLabel: '客户简称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        hidden: true
     },{
         editable:false,
         xtype : "remotecombo", 
@@ -231,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", 
@@ -265,7 +266,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "cc_tel", 
-                width:110 
+                width:200 
             },
             {
                 allowBlank:true,
@@ -296,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", 
@@ -339,7 +340,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
                     hideTrigger:true,
                 },
                 dataIndex : "ca_phone", 
-                width:110  
+                width:200  
             },
             {
                 text : "默认地址", 

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

@@ -76,7 +76,8 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         },{
             text : "供应商简称", 
             width : 150.0, 
-            dataIndex : "ve_shortname" 
+            dataIndex : "ve_shortname",
+            hidden: true
         }, {
             text : "供应商名称", 
             dataIndex : "ve_name", 

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

@@ -44,7 +44,8 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype: 'textfield',
         name: 've_shortname',
         fieldLabel: '供应商简称',
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        hidden: true
     },{
         xtype: 'hidden',
         name: 've_status',
@@ -259,7 +260,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                     xtype : "textfield"
                 },
                 dataIndex : "vc_tel", 
-                width:110 
+                width:200 
             },
             {
                 allowBlank:true,

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

@@ -48,7 +48,7 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     angleField: 'y',
                     donut: 55,
                     label: {
-                        field: 'z',
+                        field: 'x',
                         display: 'inside',
                         renderer: me.onLabelRender,
                         color: '#fff',

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/home/charts/ProfitDetail.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                 },
                 axes: [{
                     type: 'category',
-                    fields: ['z'],
+                    fields: ['x'],
                     position: 'bottom',
                     label: {
                         fontSize: '12px',
@@ -60,7 +60,7 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
                 }],
                 series: [{
                     type: 'bar',
-                    xField: 'z',
+                    xField: 'x',
                     yField: ['y'],
                     bind: {
                         style: {
@@ -81,7 +81,10 @@ Ext.define('saas.view.home.charts.ProfitDetail', {
     },
 
     onCategoryLabelRender: function(axis, label, layoutContent, lastLabel) {
-        return label;
+        var cWidth = this.gridSurface.el.dom.clientWidth,
+        dataCount = layoutContent.data.length,
+        maxLength = Math.ceil((cWidth/dataCount)/20);
+        return label.length > maxLength ? label.substring(0, maxLength) + '...' : label;
     },
 
     onBarTipRender: function (tooltip, record, item) {

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: '账户中心',

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

@@ -144,7 +144,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '录入人',
             dataIndex: 'creatorName',
-            hidden :true
+            width :110
         }, {
             text: '审核人',
             dataIndex: 'sa_auditman',

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

@@ -146,6 +146,10 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'sa_seller',
             width: 90,
             hidden :true
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width :110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',

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

@@ -140,6 +140,10 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             dataIndex: 'sa_seller',
             width: 90,
             hidden :true
+        }, {
+            text: '录入人',
+            dataIndex: 'creatorName',
+            width :110
         },{
             text: '审核人',
             dataIndex: 'pi_auditman',

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -85,7 +85,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -97,7 +97,7 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanelController.js

@@ -41,24 +41,20 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -45,7 +45,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
         bind: '{form.wh_description}',
-        fieldLabel: '仓库',
+        emptyText: '仓库',
         dbfinds:[{
             from:'wh_description',to:'wh_description'
         }],
@@ -56,7 +56,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind",
         bind: '{form.pr_kind}',
-        fieldLabel : "类型",
+        emptyText : "类型",
         hiddenBtn:true,
         //width:150
     },{

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -80,7 +80,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -92,7 +92,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'ma_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

frontend/saas-web/app/view/stock/make/QueryPanelController.js

@@ -17,24 +17,20 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=ma_auditman]':{
+            },'accountDbfindTrigger[name=ma_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'ma_auditman'
+                            from:'realname',to:'ma_auditman'
                         }],
                     }) ;   
 

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

@@ -67,7 +67,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         showDetail: true,
         emptyText:'请输入仓库编号或名称'
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -79,7 +79,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'

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

@@ -39,24 +39,20 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

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

@@ -68,7 +68,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         showDetail: true
     }, {
         xtype: 'employeeDbfindTrigger',
-        name: 'creatorName',
+        name: 'accountDbfindTrigger',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
         getCondition: function(value) {
@@ -80,7 +80,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         }
     }, {
         xtype: 'employeeDbfindTrigger',
-        name: 'pi_auditman',
+        name: 'accountDbfindTrigger',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'
     }],

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

@@ -39,24 +39,20 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                            from:'realname',to:'pi_auditman',
                         }],
                     }) ;