【界面标准化】【调拨单列表、制造单

列表主表、其它入库列表主表、其它出货、盘点单】【单位成本加(元)，期初金额加(元)】【前端处理】

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

@@ -32,12 +32,12 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
     tbar: [{
         xtype: 'textfield',
         name: 'pr_detail',
-        emptyText:'输入物料编号或名称',
+        emptyText:'输入物料编号、名称或品牌',
         width:200,
         bind: '{form.pr_detail}',
         getCondition: function(v) {
             if(v) {
-                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                return "(upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%' or upper(pr_barnd) like '%"+v.toUpperCase()+"%')";
             }else {
                 return '1 = 1';
             }
@@ -81,7 +81,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         }
     },{
         xtype:'button',
-        text:'导出系统库存',
+        text:'导出库存',
         listeners: {
             click:function(b){
                 var me = this.ownerCt.ownerCt;
@@ -145,7 +145,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         dataIndex : "st_prodorispeccode", 
         width : 200.0
     }, {
-        text : "系统库存", 
+        text : "库存", 
         dataIndex : "st_batchqty", 
         width : 110.0, 
         xtype : "numbercolumn",

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -79,7 +79,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     },{
         xtype : "textfield", 
         name : "pi_total", 
-        fieldLabel : "总额", 
+        fieldLabel : "金额(元)", 
         allowBlank : true,
         readOnly: true,
         columnWidth : 0.25

frontend/saas-web/app/view/stock/otherIn/QueryPanel.js

@@ -106,10 +106,6 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        }, {
-            text: '供应商名称',
-            dataIndex: 'pi_vendname',
-            width: 200
         }, {
             text: '金额(元)',
             xtype: 'numbercolumn',
@@ -123,6 +119,10 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_status',
             width: 80
+        }, {
+            text: '供应商名称',
+            dataIndex: 'pi_vendname',
+            width: 200
         },{
             text: '备注',
             dataIndex: 'pi_remark',

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -64,7 +64,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     }, {
         xtype: "textfield",
         name: "pi_total",
-        fieldLabel: "总额",
+        fieldLabel: "金额(元)",
         allowBlank: true,
         readOnly: true,
         columnWidth: 0.25

frontend/saas-web/app/view/stock/otherOut/QueryPanel.js

@@ -106,10 +106,6 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             dataIndex: 'pi_date',
             xtype:'datecolumn',
             width: 110
-        }, {
-            text: '客户名称',
-            dataIndex: 'pi_custname',
-            width: 200
         }, {
             text: '金额(元)',
             xtype: 'numbercolumn',
@@ -123,6 +119,10 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             align: 'center',
             dataIndex: 'pi_status',
             width: 80
+        }, {
+            text: '客户名称',
+            dataIndex: 'pi_custname',
+            width: 200
         }, {
             text: '备注',
             dataIndex: 'pi_remark',