【界面标准化】【物料资料、仓库资料、BOM资料、资金账户、供应商类型、采购地址、计量单位、收支类别、隐藏业务员编号、采购员编号】

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -59,7 +59,8 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
     }, {
         text: "业务员编号",
         dataIndex: "cu_sellercode",
-        width:150
+        width:150,
+        hidden:true
     }, {
         text: "业务员",
         dataIndex: "cu_sellername",

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -61,7 +61,8 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     }, {
         text: "采购员编号",
         dataIndex: "ve_buyercode",
-        width:150
+        width:150,
+        hidden:true
     }, {
         text: "采购员",
         dataIndex: "ve_buyername",

frontend/saas-web/app/view/document/address/DataList.js

@@ -77,7 +77,7 @@ Ext.define('saas.view.document.address.DataList', {
     },
     listeners:{
         afterrender:function(p){
-            p.getViewModel().setData({title:'采购地址'});
+            p.getViewModel().setData({title:'采购交货地址'});
         }
     }
 })

frontend/saas-web/app/view/document/address/Window.js

@@ -24,7 +24,7 @@ Ext.define('saas.view.document.address.Window', {
                 xtype:'textfield',
                 name:'ad_address',
                 allowBlank:false,
-                fieldLabel:'地址详情',
+                fieldLabel:'地址名称',
                 maxLength: 200
             }]
         }

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

@@ -96,6 +96,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
         {
             text : "产品状态", 
             dataIndex : "bo_status", 
+            align:'center',
             width : 90.0, 
         }, 
         {
@@ -104,9 +105,9 @@ Ext.define('saas.view.document.bom.BasePanel', {
             width : 0, 
         },
         {   
-            text : "产品版本号", 
+            text : "版本号", 
             dataIndex : "bo_version", 
-            width :80.0, 
+            width :100.0, 
         }]
     },
 

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

@@ -179,12 +179,14 @@ Ext.define('saas.view.document.bom.FormPanel', {
                 allowBlank:false,
                 text : "用量", 
                 width : 110, 
+                xtype : "numbercolumn",
                 dataIndex : "bd_baseqty",
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 3,
                     minValue:0,
                     maxLength: 10,
+                    align: 'end'
                 },
                 renderer : function(v) {
                     return saas.util.BaseUtil.numberFormat(v, 3, false);

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -119,7 +119,7 @@ Ext.define('saas.view.document.kind.ChildForm', {
                 xtype:'combo',
                 name:'ft_kind',
                 allowBlank:false,
-                fieldLabel:'收支类型',
+                fieldLabel:'收支类别',
                 hideTrigger : false, 
                 maxLength : 100.0, 
                 minValue : null, 

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

@@ -12,9 +12,9 @@ Ext.define('saas.view.document.product.BasePanel', {
         xtype : "textfield", 
         name : "pr_code", 
         width:300, 
-        emptyText:'输入物料编号、名称、型号、规格或品牌',
+        emptyText:'输入物料编号、名称、型号或品牌',
         getCondition: function (v) {
-            return "(upper(CONCAT(pr_code,'#',pr_detail,'#',ifnull(pr_spec,''),'#',ifnull(pr_orispeccode,''),'#',ifnull(pr_brand,''))) like '%" + v.toUpperCase() + "%' )";
+            return "(upper(CONCAT(pr_code,'#',pr_detail,'#',ifnull(pr_orispeccode,''),'#',ifnull(pr_brand,''))) like '%" + v.toUpperCase() + "%' )";
         },
     },{
         editable:true,
@@ -92,7 +92,7 @@ Ext.define('saas.view.document.product.BasePanel', {
             dataIndex : "pr_spec", 
             width : 200.0
         }, {
-            text : "类型", 
+            text : "物料类型", 
             dataIndex : "pr_kind", 
             width:100
         }, {
@@ -138,6 +138,7 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "状态", 
             dataIndex : "pr_status",
+            align:'center',
             width : 80.0
         }]
     },

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

@@ -81,7 +81,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype: 'textfield',
         name: 'pr_spec',
         fieldLabel: '规格',
-        allowBlank: false,
+        //allowBlank: false,
         group: '基础信息',
     },{
         editable:false,
@@ -122,7 +122,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             this.dialog = form.add({
                 xtype: 'document-productunit-window',
                 bind: {
-                    title: '新增物料单位'
+                    title: '新增计量单位'
                 },
                 dataKind:'productunit',
                 _parent:form,
@@ -176,7 +176,7 @@ Ext.define('saas.view.document.product.FormPanel', {
     }, {
         xtype : "warehouseDbfindTrigger", 
         name : "pr_whname", 
-        fieldLabel : "仓库名称", 
+        fieldLabel : "仓库", 
         columnWidth: 0.25,
         group: '管理信息',
     },{
@@ -197,6 +197,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 4,
+        thousandSeparator: ',',
         minValue:0,
         group: '管理信息',
     },{

frontend/saas-web/app/view/document/productunit/DataList.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.document.productunit.DataList', {
     },
     listeners:{
         afterrender:function(p){
-            p.getViewModel().setData({title:'物料单位'});
+            p.getViewModel().setData({title:'计量单位'});
         }
     }
 })

frontend/saas-web/app/view/document/warehouse/DataList.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.document.warehouse.DataList', {
                 dataIndex: 'wh_description',
                 width: 200
             },{
-                text: '类型',
+                text: '仓库类型',
                 dataIndex: 'wh_type',
                 width: 110
             },{  

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -248,7 +248,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "已核销金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "sl_yamount",
-            width:110,
+            width:120,
             ignore:true,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);
@@ -261,7 +261,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "未核销金额(元)",
             xtype: 'numbercolumn',
             dataIndex: "sl_namount",
-            width:110,
+            width:120,
             ignore:true,
             renderer : function(v) {
                 return saas.util.BaseUtil.numberFormat(v, 2, true);