名称描述

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

@@ -23,12 +23,15 @@ Ext.define('saas.view.document.product.BasePanel', {
         storeUrl: '/api/document/producttype/getCombo',
         name : "pr_kind", 
         emptyText : "物料类型",
-        width:120
+        width:130
     }, {
-        xtype : "textfield", 
+        editable:true,
+        hiddenBtn:true,
+        xtype : "remotecombo", 
+        storeUrl:'/api/document/productbrand/getCombo',
         name : "pr_brand", 
         emptyText : "品牌", 
-        width:110
+        width:120
     }, {
         xtype: 'combobox',
         name: 'pr_statuscode',

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -65,7 +65,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: '本次收款',
+        text: '收款金额',
         xtype: 'numbercolumn',
         dataIndex: 'rbd_nowbalance',
         renderer : function(v) {