Browse Source

【界面标准化】【盘点单、客户资料、采购明细表、物料收发汇总表调整】

rainco 7 years ago
parent
commit
0b3c078833

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             },{
                 xtype: 'textfield',
                 name: 'pr_detail',
-                fieldLabel: '名称',
+                fieldLabel: '物料名称',
                 allowBlank: false,
                 group: '基础信息',
             },{
@@ -188,6 +188,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                 allowBlank : true, 
                 columnWidth : 0.25,
                 decimalPrecision: 4,
+                thousandSeparator: ',',
                 minValue:0,
                 group: '管理信息',
             },{
@@ -209,6 +210,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                 name : "pr_saleprice", 
                 fieldLabel : "最新售价(元)", 
                 decimalPrecision: 4,
+                thousandSeparator: ',',
                 minValue:0,
                 group: '管理信息',
             },{  

+ 11 - 0
frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -52,6 +52,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '业务状态',
         dataIndex: 'pu_acceptstatus',
+        align: 'center',
         width: 80
     }, {
         text: '采购员',
@@ -62,6 +63,16 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'datecolumn',
         dataIndex: 'pu_date',
         width: 110
+    }, {
+        text: '序号',
+        xtype: 'numbercolumn',
+        dataIndex: 'pd_detno',
+        align: 'center',
+        exportFormat: 'Integer',
+        width: 65,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 0, true);
+        }
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode',

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

@@ -46,7 +46,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
         bind: '{form.wh_description}',
-        emptyText: '仓库',
+        emptyText: '请输入仓库名称',
         dbfinds:[{
             from:'wh_description',to:'wh_description'
         }],
@@ -57,7 +57,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind",
         bind: '{form.pr_kind}',
-        emptyText : "类型",
+        emptyText : "物料类型",
         hiddenBtn:true,
         //width:150
     },{
@@ -184,7 +184,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         text : "盘盈盘亏", 
         dataIndex : "st_num", 
         width : 110.0, 
-        aligin: 'right',
+        align: 'right',
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 3, true);
         }  

+ 1 - 2
frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -14,8 +14,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     searchItems: [{		
         xtype: 'textfield',
         name: 'wh_description',
-        fieldLabel: '仓库',
-        emptyText:'输入仓库编号或名称',
+        emptyText:'输入仓库编号',
         columnWidth: 0.2,
         getCondition: function(value) {
            return  ' (wh_description like\'%' + value + '%\' or wh_code like \'%'+value+'%\') ';