采购验退列表，关联验收单、关联验收单序号。供应商新增地址。采购验退列表，录入人，审核人放大镜取账户资料

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

@@ -11,9 +11,7 @@ Ext.define('saas.view.core.dbfind.types.AccountDbfindTrigger', {
     addTitle: '账户资料',
     //联想设置
     dbtpls:[{
-        field:'username',width:150
-    },{
-        field:'realname',width:110
+        field:'realname',width:150
     }],
     defaultCondition: "d.status=1",
     dbSearchFields:[{
@@ -36,7 +34,7 @@ Ext.define('saas.view.core.dbfind.types.AccountDbfindTrigger', {
     },{
         text: "账号名称",
         dataIndex: "username",
-        width: 150
+        hidden:true
     }, {
         text: "姓名",
         dataIndex: "realname",
@@ -48,15 +46,11 @@ Ext.define('saas.view.core.dbfind.types.AccountDbfindTrigger', {
     }, {
         text: "邮箱",
         dataIndex: "email",
-        width: 110,
-    }, {
-        text: "岗位角色",
-        dataIndex: "roleNames",
-        width: 180
+        width: 250,
     }, {
         text: "岗位角色",
         dataIndex: "roleNames",
-        width: 180
+        width: 200
     }]
 
 });

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

@@ -210,6 +210,12 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         name : "ve_buyerid", 
         fieldLabel : "采购员ID",
         defaultValue:saas.util.BaseUtil.getCurrentUser().id
+    },{
+        xtype : "textfield", 
+        name : "ve_address", 
+        fieldLabel : "地址", 
+        allowBlank : true, 
+        columnWidth : 1
     },{
         fieldLabel : "备注", 
         xtype:'textfield',

frontend/saas-web/app/view/purchase/purchaseOut/QueryPanel.js

@@ -27,11 +27,10 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         emptyText:'输入物料编号或名称',
         showDetail: true,
         getCondition: function(value) {
-            console.log('物料：'+value);
             if(!value) {
                 return '1=1';
             }else {
-                return ' upper(concat(IFNULL(product.pr_detail,\' \'),\'#\',IFNULL(product.pr_code,\' \')) like \'%' + value.toUpperCase() + '%\' ';
+                return ' pr_detail = \'' + value + '\' ';
             }
         }
     }, {

frontend/saas-web/app/view/stock/report/DataList.js

@@ -91,7 +91,6 @@ Ext.define('saas.view.stock.report.DataList', {
         text: "单价",
         xtype: 'numbercolumn',
         exportFormat: 'Price',
-        hidden: true,
         toggle: true,
         align: 'end',
         dataIndex: "rc_price",
@@ -107,6 +106,7 @@ Ext.define('saas.view.stock.report.DataList', {
         xtype: 'numbercolumn',
         dataIndex: "rc_amount",
         exportFormat: 'Amount',
+        toggle: true,
         width: 120,
         renderer: function (v) {
             var arr = (v + '.').split('.');

frontend/saas-web/app/view/stock/report/DataListController.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.stock.report.DataListController', {
         
         form.updateLayout();
         toggleColumns.map(function(c) {
-            c.setHidden(!newValue);
+            c.setHidden(c.isVisible);
         });
         store.load();
     }