采购验退，验收关联单号，账户放大镜

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

@@ -0,0 +1,62 @@
+/**
+ * 账户资料放大镜
+ */
+Ext.define('saas.view.core.dbfind.types.AccountDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.DbfindTrigger',
+    xtype: 'accountDbfindTrigger',
+
+    //数据接口
+    dataUrl:'/api/account/account/accountRole/list',
+    addXtype: 'sys-account-datalist',
+    addTitle: '账户资料',
+    //联想设置
+    dbtpls:[{
+        field:'username',width:150
+    },{
+        field:'realname',width:110
+    }],
+    defaultCondition: "d.status=1",
+    dbSearchFields:[{
+        emptyText:'输入账户名称或真实姓名',
+        xtype : "textfield", 
+        name : "search", 
+        getCondition: function(v) {
+            return "(upper(username) like '%"+v.toUpperCase()+"%' or upper(realname) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true, 
+        width:300
+    }],
+    //放大镜窗口列表
+    dbColumns:[{
+        text: "账户ID",
+        hidden: true,
+        dataIndex: "id",
+        hidden:true,
+        xtype: "numbercolumn"
+    },{
+        text: "账号名称",
+        dataIndex: "username",
+        width: 150
+    }, {
+        text: "姓名",
+        dataIndex: "realname",
+        width: 110
+    }, {
+        text: "联系电话",
+        dataIndex: "mobile",
+        width: 110,
+    }, {
+        text: "邮箱",
+        dataIndex: "email",
+        width: 110,
+    }, {
+        text: "岗位角色",
+        dataIndex: "roleNames",
+        width: 180
+    }, {
+        text: "岗位角色",
+        dataIndex: "roleNames",
+        width: 180
+    }]
+
+});

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

@@ -38,7 +38,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         xtype: 'textfield',
         name: 'cu_shortname',
         fieldLabel: '客户简称',
-        allowBlank: true,
+        allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
@@ -185,7 +185,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        xtype:'textfield',
+        xtype:'hidden',
         name : "cu_uu", 
         fieldLabel : "客户UU", 
         allowBlank : true, 

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

@@ -38,7 +38,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         xtype: 'textfield',
         name: 've_shortname',
         fieldLabel: '供应商简称',
-        allowBlank: true,
+        allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
@@ -165,7 +165,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        xtype:'textfield',
+        xtype:'hidden',
         name : "ve_uu", 
         fieldLabel : "供应商UU", 
         allowBlank : true, 

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

@@ -25,7 +25,15 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         name: 'pr_detail',
         fieldLabel: '物料',
         emptyText:'输入物料编号或名称',
-        showDetail: true
+        showDetail: true,
+        getCondition: function(value) {
+            console.log('物料：'+value);
+            if(!value) {
+                return '1=1';
+            }else {
+                return ' upper(IFNULL(product.pr_detail,\' \')#IFNULL(product.pr_code,\' \')) like \'%' + value.toUpperCase() + '%\' ';
+            }
+        }
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
@@ -66,14 +74,21 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         name: 'pd_whname',
         fieldLabel: '仓库',
         emptyText:'请输入仓库编号或名称',
-        showDetail: true
+        showDetail: true,
+        getCondition: function(value) {
+            if(!value) {
+                return '1=1';
+            }else {
+                return 'prodiodetail.pd_whname like\'%' + value + '%\'';
+            }
+        }
     }, {
         xtype: 'textfield',
         name: 'pi_iocode',
         fieldLabel: '关联验收单号',
         emptyText: '输入单号',
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'creatorName',
         fieldLabel: '录入人',
         emptyText:'请输入人员编号或名称',
@@ -85,7 +100,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             }
         }
     }, {
-        xtype: 'employeeDbfindTrigger',
+        xtype: 'accountDbfindTrigger',
         name: 'pi_auditman',
         fieldLabel: '审核人',
         emptyText:'请输入人员编号或名称'
@@ -177,7 +192,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             },{
                 text: '供应商名称',
                 dataIndex: 'pi_vendname',
-                width: 150
+                width: 250
             },{
                 text: '审核状态',
                 align: 'center',
@@ -186,15 +201,25 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
             },{
                 text: '序号',
                 dataIndex: 'pd_pdno',
-                width: 80
+                width: 80, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
+                }
             },{
-                text: '相关单号',
-                dataIndex: 'pd_ordercode',
+                text: '关联验收单号',
+                dataIndex: 'pi_iocode',
+                width: 150
+            },{
+                text: '关联验收序号号',
+                dataIndex: 'iodetno',
                 width: 150
             },{
                 text: '物料编号',
                 dataIndex: 'pd_prodcode',
-                width: 150
+                width: 150, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
+                }
             },{
                 text: '物料名称',
                 dataIndex: 'pr_detail',

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

@@ -28,24 +28,19 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=creatorName]':{
+            },'accountDbfindTrigger[name=creatorName]':{
                 beforerender:function(f){
                     Ext.apply(f,{
                         dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'creatorName'
+                            from:'realname',to:'creatorName'
                         }],
                     }) ;   
 
                 }
-            },'employeeDbfindTrigger[name=pi_auditman]':{
+            },'accountDbfindTrigger[name=pi_auditman]':{
                 beforerender:function(f){
                     Ext.apply(f,{
-                        dbfinds:[{
-                            from:'em_code',to:'em_code'
-                        },{
-                            from:'em_name',to:'pi_auditman',
+                        dbfinds:[{ from:'realname',to:'pi_auditman',
                         }],
                     }) ;   
 

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -65,6 +65,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         name: 'pd_whname',
         fieldLabel: '仓库',
         emptyText: '输入仓库编号或名称',
+        showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pi_iocode',

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -64,7 +64,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         xtype: 'warehouseDbfindTrigger',
         name: 'pd_whname',
         emptyText:'请输入物料编号或名称',
-        fieldLabel: '仓库'
+        fieldLabel: '仓库',
+        showDetail: true
     }, {
         xtype: 'textfield',
         name: 'pi_sacode',