Browse Source

【界面标准化】【物料资料、物料资料列表】【 最新定价(元)、最新售价(元)。明细期初总价改成期初金额,统一加上元】【前端处理】

rainco 7 years ago
parent
commit
6081fb4014

+ 2 - 2
frontend/saas-web/app/view/core/dbfind/types/ProductAddMultiDbfindTrigger.js

@@ -61,11 +61,11 @@ Ext.define('saas.view.core.dbfind.types.ProductAddMultiDbfindTrigger', {
     },{
         text: "类型",
         dataIndex: "pr_kind",
-        width: 110
+        width: 100
     },{
         text: "库存",
         dataIndex: "po_onhand",
-        width: 110,
+        width: 100,
         xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');

+ 2 - 2
frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -56,11 +56,11 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     },{
         text: "类型",
         dataIndex: "pr_kind",
-        width: 110
+        width: 100
     },{
         text: "库存",
         dataIndex: "po_onhand",
-        width: 110,
+        width: 100,
         xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');

+ 2 - 2
frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -63,11 +63,11 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     },{
         text: "类型",
         dataIndex: "pr_kind",
-        width: 110
+        width: 100
     },{
         text: "库存",
         dataIndex: "po_onhand",
-        width: 110,
+        width: 100,
         xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');

+ 20 - 19
frontend/saas-web/app/view/document/product/BasePanel.js

@@ -33,6 +33,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         fieldLabel : '状态',
         emptyText: '全部',
         editable:false,
+        defaultValue:'ENABLE',
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['pr_statuscode', 'pr_status'],
         data: [
@@ -77,32 +78,28 @@ Ext.define('saas.view.document.product.BasePanel', {
         },{
             text : "品牌", 
             dataIndex : "pr_brand", 
-            width : 150.0
+            width : 100.0
         }, {
-            text : "名称", 
+            text : "物料名称", 
             dataIndex : "pr_detail", 
-            width : 200.0
+            width : 150.0
         }, {
             text : "型号", 
             dataIndex : "pr_orispeccode", 
-            width : 150.0
+            width : 200.0
         }, {
             text : "规格", 
             dataIndex : "pr_spec", 
-            width : 150.0
-        },{
-            text : "单位", 
-            dataIndex : "pr_unit", 
-            width : 80.0 
+            width : 200.0
         }, {
             text : "类型", 
             dataIndex : "pr_kind", 
-            width : 110.0
-        },{
+            width:100
+        }, {
             text : "库存", 
             dataIndex : "po_onhand",
             xtype: 'numbercolumn',
-            width : 120.0,
+            width : 100.0,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -110,26 +107,30 @@ Ext.define('saas.view.document.product.BasePanel', {
                 return Ext.util.Format.number(v, format);
             }
         }, {
-            text : "标准单价(元)", 
+            text : "单位", 
+            dataIndex : "pr_unit", 
+            width : 65.0 
+        }, {
+            text : "标准定价(元)", 
             dataIndex : "pr_standardprice",
             xtype: 'numbercolumn',
-            width : 120.0,
+            width : 110.0,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
         },  {
-            text : "最新购价(元)", 
+            text : "最新购价(元)", 
             dataIndex : "pr_purcprice",
             xtype: 'numbercolumn',
-            width : 120.0,
+            width : 110.0,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
         }, {
-            text : "最新出货单价(元)", 
+            text : "最新价(元)", 
             dataIndex : "pr_saleprice",
             xtype: 'numbercolumn',
-            width : 130.0,
+            width : 110.0,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 4, true);
             }
@@ -140,7 +141,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "状态", 
             dataIndex : "pr_status",
-            width : 90.0
+            width : 80.0
         }]
     },
 

+ 3 - 3
frontend/saas-web/app/view/document/product/FormPanel.js

@@ -125,7 +125,7 @@ Ext.define('saas.view.document.product.FormPanel', {
     },{
         xtype : "numberfield", 
         name : "pr_standardprice", 
-        fieldLabel : "标准价(元)", 
+        fieldLabel : "标准价(元)", 
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 4,
@@ -177,7 +177,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         readOnly:true,
         xtype : "numberfield", 
         name : "pr_purcprice", 
-        fieldLabel : "最新价(元)", 
+        fieldLabel : "最新购价(元)", 
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 4,
@@ -193,7 +193,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         readOnly:true,
         xtype : "numberfield", 
         name : "pr_saleprice", 
-        fieldLabel : "最新出货单价(元)", 
+        fieldLabel : "最新价(元)", 
         decimalPrecision: 4,
         minValue:0,
         renderer: function (v) {