Browse Source

供应商、客户去除简称/首页毛利润分析名称长度只适应逻辑/盘点单字段长度调整

zhuth 7 years ago
parent
commit
194a36f3c5

+ 2 - 1
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 : "客户名称", 

+ 2 - 1
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", 

+ 2 - 1
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", 

+ 2 - 1
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',

+ 1 - 1
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',

+ 6 - 3
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) {

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