Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/util/BaseUtil.js

@@ -11,7 +11,6 @@ Ext.define('saas.util.BaseUtil', {
             method = config.method || 'GET',
             timeout = config.timeout || 8000,
             defaultHeaders = {
-                'Authorization': ' ',
                 'Access-Control-Allow-Origin': '*',
                 "Content-Type": 'application/json;charset=UTF-8' 
             };

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -169,7 +169,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             },{
                 xtype:'textfield',
                 fieldLabel: '单据名称',
-                name: 'mn_caller',
+                name: 'mn_name',
                 allowBlank:false,
                 editable:false,
                 readOnly:true
@@ -235,7 +235,9 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         return Ext.apply(conf, me.etc[kind]);
     },
     onSave:function(){
+        var me = this;
         var belong = this.belong;
+        me.setLoading(true);
         var form=this.down('form');
         var combo = this._combo;
         var params = {};
@@ -258,6 +260,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             method: 'POST',
         })
         .then(function(localJson) {
+            me.setLoading(false);
             if(localJson.success){
                 showToast('保存成功');
                 var grid = form.ownerCt._parent.lookup('document-kind-Grid');
@@ -273,6 +276,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             }
         })
         .catch(function(res) {
+            me.setLoading(false);
             console.error(res);
             showToast('保存失败: ' + res.message);
         });

frontend/saas-web/app/view/document/kind/Kind.js

@@ -31,13 +31,13 @@ Ext.define('saas.view.document.kind.Kind', {
             value: 'vendorkind',
             typeText:'供应商类型'
         }, {
-            text: '商品',
+            text: '物料',
             value: 'productkind',
-            typeText:'商品类型'
+            typeText:'物料类型'
         }, {
             text: '收支',
             value: 'inoutkind',
-            typeText:'收支类型'
+            typeText:'收支类别'
         }],
         listeners: {
             toggle: 'onKindToggle'
@@ -130,11 +130,13 @@ Ext.define('saas.view.document.kind.Kind', {
                 dataIndex: 'bk_bankname',
                 flex: 1
             },{
+                hidden:true,
                 xtype:'datecolumn',
                 text: '日期',
                 dataIndex: 'bk_date',
                 flex: 1
             },{
+                hidden:true,
                 text: '账户类型',
                 dataIndex: 'bk_type',
                 flex: 1
@@ -153,7 +155,7 @@ Ext.define('saas.view.document.kind.Kind', {
         },
         inoutkind:{
             columns: [{
-                text: '收支类型',
+                text: '收支类别',
                 dataIndex: 'ft_name',
                 flex: 1
             }],

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

@@ -26,14 +26,15 @@ Ext.define('saas.view.document.product.FormController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
+                        defaultCondition: 've_statuscode="OPEN"',
                         //放大镜窗口字段
                         dbSearchFields:[{
-                            xtype : "textfield", 
-                            name : "ve_name", 
-                            conditionExpression:"ve_name like '{0}%'",//传入后台条件  替换占位符
-                            fieldLabel : "供应商名称", 
+                            xtype : "textfield",
+                            name: 'name',
+                            getCondition: function(v) {
+                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+                            },
+                            emptyText : "请输入供应商编号或名称", 
                             columnWidth : 0.25
                         }],
                         //放大镜窗口列表
@@ -93,11 +94,11 @@ Ext.define('saas.view.document.product.FormController', {
                         dbSearchFields:[{
                             emptyText:'输入仓库编号或仓库名称或仓库类型',
                             xtype : "textfield", 
-                            name : "wh_code", 
+                            name : "name", 
                             allowBlank : true, 
                             width:260,
                             getCondition:function(v){
-                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%' or wh_type like '%" + v + "%'";
+                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         //窗口列设置

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

@@ -31,20 +31,20 @@ Ext.define('saas.view.document.product.FormPanel', {
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'pr_detail',
-        fieldLabel: '物料名称',
+        name: 'pr_code',
+        fieldLabel: '物料编号',
         allowBlank: false,
         columnWidth: 0.25
     },{
         xtype: 'textfield',
-        name: 'pr_code',
-        fieldLabel: '物料编号',
+        name: 'pr_detail',
+        fieldLabel: '物料名称',
         allowBlank: false,
         columnWidth: 0.25
     },{
-        xtype: 'textfield',
+        xtype: 'hidden',
         name: 'pr_status',
-        fieldLabel: '可用状态',
+        fieldLabel: '状态',
         allowBlank: true,
         columnWidth: 0.25
     },{
@@ -53,6 +53,12 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel: '状态码',
         allowBlank: true,
         columnWidth: 0.25
+    },{
+        xtype: 'textfield',
+        name: 'pr_spec',
+        fieldLabel: '规格',
+        allowBlank: false,
+        columnWidth: 0.25
     },{
         editable:false,
         xtype : "remotecombo", 
@@ -79,6 +85,12 @@ Ext.define('saas.view.document.product.FormPanel', {
             this.dialog.show();
         }
     },{
+        xtype: 'textfield',
+        name: 'pr_orispeccode',
+        fieldLabel: '型号',
+        allowBlank: true,
+        columnWidth: 0.25
+    },{  
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/productunit/getCombo',
@@ -153,24 +165,48 @@ Ext.define('saas.view.document.product.FormPanel', {
     }, {
         xtype : "textfield", 
         name : "pr_whname", 
-        bind : "{pr_whname}", 
         fieldLabel : "仓库名称", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
+        ignore:true,
+        readOnly:true,
         xtype : "numberfield", 
         name : "pr_standardprice", 
-        bind : "{pr_standardprice}", 
         fieldLabel : "标准单价", 
         allowBlank : true, 
         columnWidth : 0.25
     },{
+        ignore:true,
+        readOnly:true,
+        xtype : "numberfield", 
+        name : "pr_purcprice", 
+        fieldLabel : "最新采购单价", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        ignore:true,
+        readOnly:true,
+        xtype : "numberfield", 
+        name : "pr_saleprice", 
+        fieldLabel : "最新出货单价", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{
+        xtype : "numberfield", 
+        name : "pr_zxbzs", 
+        fieldLabel : "最小包装数", 
+        allowBlank : true, 
+        columnWidth : 0.25
+    },{  
+        hidden:true,
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "创建时间", 
         allowBlank : true, 
         columnWidth : 0.25
     },{  
+        hidden:true,
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间", 

frontend/saas-web/app/view/money/fundtransfer/FormPanelController.js

@@ -22,6 +22,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
+                        dbSearchFields:[{
+                            xtype : "textfield",
+                            name: 'name',
+                            getCondition: function(v) {
+                                return "upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%'";
+                            },
+                            emptyText : "请输入账户编号或名称", 
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "账户ID",
                             "flex": 0,
@@ -80,6 +89,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             field:'bk_bankname',width:100
                         }],
+                        dbSearchFields:[{
+                            xtype : "textfield", 
+                            name: 'name',
+                            getCondition: function(v) {
+                                return "upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%'";
+                            },
+                            emptyText:'输入账户编号或名称',
+                            columnWidth : 0.25
+                        }],
                         dbColumns:[{
                             "text": "账户ID",
                             "flex": 0,

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -34,7 +34,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
-                                return "CONCAT(cu_code, cu_name) like '%" + v + "%'";
+                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank: true,
                             columnWidth: 0.25
@@ -133,7 +133,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             xtype: "textfield",
                             name: "search",
                             getCondition: function (v) {
-                                return "CONCAT(bk_bankcode, bk_bankname) like '%" + v + "%'";
+                                return "upper(bk_bankcode) like '%"+v.toUpperCase()+"%' or upper(bk_bankname) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank: true,
                             columnWidth: 0.25

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -28,11 +28,15 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         //联想查询条件
                         dbtplfield:"ve_name",
                         //放大镜窗口字段
-                        dbSearchFields:[{
-                            xtype : "textfield", 
-                            name : "ve_name", 
-                            fieldLabel : "供应商名称", 
-                            columnWidth : 0.25
+                        dbSearchFields: [{
+                            emptyText: '输入供应商编号或名称',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
                         }],
                         //放大镜窗口列表
                         dbColumns:[{

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -26,13 +26,14 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(cu_code, cu_name) like '{0}%'",
+                        defaultCondition: 'cu_statuscode="OPEN"',
                         //放大镜窗口字段
                         dbSearchFields:[{
-                            xtype : "textfield", 
+                            emptyText:'输入客户编号或名称',
                             name : "cu_name", 
-                            conditionExpression:"cu_name like '{0}%'",//传入后台条件  替换占位符
+                            getCondition: function(v) {
+                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                            },
                             fieldLabel : "客户名称", 
                             columnWidth : 0.25
                         }],
@@ -84,12 +85,14 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field:'cu_name',width:100
                         }],
                         //联想查询条件
-                        dbCondition:"CONCAT(cu_code, cu_name) like '{0}%'",
+                        defaultCondition: 'cu_statuscode="OPEN"',
                         //放大镜窗口字段
                         dbSearchFields:[{
-                            xtype : "textfield", 
+                            emptyText:'输入客户编号或名称',
                             name : "cu_name", 
-                            conditionExpression:"cu_name like '{0}%'",//传入后台条件  替换占位符
+                            getCondition: function(v) {
+                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
+                            },
                             fieldLabel : "客户名称", 
                             columnWidth : 0.25
                         }],

frontend/saas-web/app/view/purchase/purchase/FormPanelController.js

@@ -25,15 +25,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入供应商编号或名称',
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "CONCAT(ve_code, ve_name) like '%" + v + "%'";
+                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25
@@ -119,7 +117,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "CONCAT(pr_code, pr_detail) like '%"+v+"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/purchase/purchaseIn/FormPanelController.js

@@ -33,8 +33,6 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入供应商编号或名称',
@@ -43,7 +41,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "ve_name like '%" + v + "%' or ve_code like '%"+ v +"%'";
+                                return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -112,6 +110,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
+                        defaultCondition: 'pr_statuscode="OPEN"',
                         //窗口字段设置
                         dbSearchFields:[{
                             emptyText:'输入物料编号或物料名称',
@@ -120,7 +119,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "pr_code like '%" + v + "%' or pr_detail like '%"+ v +"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         //窗口列设置
@@ -260,7 +259,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         dbColumns:[{

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

@@ -32,8 +32,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入供应商编号或名称',
@@ -42,7 +40,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "ve_name like '%" + v + "%' or ve_code like '%"+ v +"%'";
+                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -111,6 +109,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                         },{
                             field:'pr_unit',width:100
                         }],
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
                             emptyText:'输入物料编号或物料名称',
@@ -119,7 +118,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "pr_code like '%" + v + "%' or pr_detail like '%"+ v +"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         //窗口列设置
@@ -259,7 +258,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         dbColumns:[{

frontend/saas-web/app/view/sale/sale/FormPanelController.js

@@ -32,7 +32,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "CONCAT(cu_code, cu_name) like '%" + v + "%'";
+                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

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

@@ -33,7 +33,7 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "CONCAT(cu_code, cu_name) like '%" + v + "%'";
+                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

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

@@ -34,7 +34,7 @@ Ext.define('saas.view.sale.saleout.FormPanelController', {
                             xtype : "textfield", 
                             name : "search", 
                             getCondition: function(v) {
-                                return "CONCAT(cu_code, cu_name) like '%" + v + "%'";
+                                return "upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%'";
                             },
                             allowBlank : true, 
                             columnWidth : 0.25

frontend/saas-web/app/view/stock/appropriationInOut/FormPanelController.js

@@ -32,8 +32,6 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入供应商编号或名称',
@@ -42,7 +40,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "ve_name like '%" + v + "%' or ve_code like '%"+ v +"%'";
+                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -101,8 +99,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'pi_custname',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"cu_name",
+                        defaultCondition:"cu_statuscode='OPEN'",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入客户编号或名称',
@@ -111,7 +108,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "cu_name like '%" + v + "%' or cu_code like '%"+ v +"%'";
+                                return "upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -199,6 +196,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
                             emptyText:'输入物料编号或物料名称',
@@ -207,7 +205,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "pr_code like '%" + v + "%' or pr_detail like '%"+ v +"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                         
                         dbColumns:[{
@@ -345,7 +343,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         allowBlank : true, 
                         columnWidth : 0.25,
                         getCondition:function(v){
-                            return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                            return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                         }
                     }],                    
                     dbColumns:[{
@@ -401,7 +399,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                     allowBlank : true, 
                     columnWidth : 0.25,
                     getCondition:function(v){
-                        return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                        return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                     }
                 }],                 
                  dbColumns:[{

frontend/saas-web/app/view/stock/make/FormPanelController.js

@@ -24,15 +24,17 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             //             },{
             //                 field:'ve_name',width:100
             //             }],
-            //             //联想查询条件
-            //             dbCondition:"CONCAT(ve_code, ve_name) like '{0}%'",
+            //             defaultCondition:"ve_statuscode='OPEN'",
             //             //放大镜窗口字段
             //             dbSearchFields:[{
+            //                 emptyText:'输入仓库编号或名称',
             //                 xtype : "textfield", 
-            //                 name : "ve_name", 
-            //                 conditionExpression:"ve_name like '{0}%'",//传入后台条件  替换占位符
-            //                 fieldLabel : "供应商名称", 
-            //                 columnWidth : 0.25
+            //                 name : "name", 
+            //                 allowBlank : true, 
+            //                 columnWidth : 0.25,
+            //                 getCondition:function(v){
+            //                     return "upper(ve_code) like '%"+v.toUpperCase()+"%' or upper(ve_name) like '%"+v.toUpperCase()+"%'";
+            //                 }
             //             }],
             //             //放大镜窗口列表
             //             dbColumns:[{
@@ -64,7 +66,6 @@ Ext.define('saas.view.stock.make.FormPanelController', {
             //                 "items": null
             //             }]
             //         }) ;   
-
             //     }
             // },
             //从表单选放大镜赋值关系 以及 tpl模板
@@ -81,22 +82,23 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                         },{
                             from:'pr_unit',to:'pd_unit'
                         }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
                         //联想设置
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入仓库编号或名称',
                             xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
+                            name : "name", 
                             allowBlank : true, 
-                            columnWidth : 0.25
+                            columnWidth : 0.25,
+                            getCondition:function(v){
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                            }
                         }],
                         //窗口列设置
                         dbColumns:[{
@@ -136,29 +138,32 @@ Ext.define('saas.view.stock.make.FormPanelController', {
                 beforerender:function(f){
                     Ext.apply(f,{
                         //数据接口
-                        dataUrl:'http://192.168.253.31:9480/product/getProductsByCondition',
+                        dataUrl:'/api/document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
                         //放大镜赋值设置
                         dbfinds:[{
                             from:'pr_code',to:'pd_prodcode'
                         },{
                             from:'pr_unit',to:'pd_unit'
                         }],
-                        //联想查询条件
-                        dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
                         //联想设置
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{
                             field:'pr_detail',width:100
                         }],
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
-                            emptyText:'输入物料编号或物料名称',
+                            emptyText:'输入仓库编号或名称',
                             xtype : "textfield", 
-                            name : "search", 
-                            conditionExpression:"CONCAT(pr_code, pr_detail) like '{0}%'",
+                            name : "name", 
                             allowBlank : true, 
-                            columnWidth : 0.25
+                            columnWidth : 0.25,
+                            getCondition:function(v){
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
+                            }
                         }],
                         //窗口列设置
                         dbColumns:[{

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

@@ -26,8 +26,6 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入供应商编号或名称',
@@ -36,7 +34,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "ve_name like '%" + v + "%' or ve_code like '%"+ v +"%'";
+                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -100,8 +98,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             field: 'pi_custname',
                             width: 100
                         }],
-                        //联想查询条件
-                        dbtplfield:"cu_name",
+                        defaultCondition:"cu_statuscode='OPEN'",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入客户编号或名称',
@@ -110,7 +107,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "cu_name like '%" + v + "%' or cu_code like '%"+ v +"%'";
+                                return "upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -205,6 +202,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             field: 'pr_spec',
                             width: 100
                         }],
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
                             emptyText:'输入物料编号或物料名称',
@@ -213,7 +211,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "pr_code like '%" + v + "%' or pr_detail like '%"+ v +"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                         
                         dbColumns:[{
@@ -356,7 +354,7 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         dbColumns: [{

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

@@ -26,8 +26,6 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"ve_name",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入供应商编号或名称',
@@ -36,7 +34,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "ve_name like '%" + v + "%' or ve_code like '%"+ v +"%'";
+                                return "upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         dbColumns:[{
@@ -95,8 +93,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'pi_custname',width:100
                         }],
-                        //联想查询条件
-                        dbtplfield:"cu_name",
+                        defaultCondition:"pi_statuscode='OPEN'",
                         //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入客户编号或名称',
@@ -105,7 +102,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "cu_name like '%" + v + "%' or cu_code like '%"+ v +"%'";
+                                return "upper(cu_name) like '%"+v.toUpperCase()+"%' or upper(cu_code) like '%"+v.toUpperCase()+"%'";
                             }
                         }],
                         dbColumns:[{
@@ -193,6 +190,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         },{
                             field:'pr_spec',width:100
                         }],
+                        defaultCondition:"pr_statuscode='OPEN'",
                         //窗口字段设置
                         dbSearchFields:[{
                             emptyText:'输入物料编号或物料名称',
@@ -201,7 +199,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "pr_code like '%" + v + "%' or pr_detail like '%"+ v +"%'";
+                                return "upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         dbColumns:[{
@@ -340,7 +338,7 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25,
                             getCondition:function(v){
-                                return "wh_code like '%" + v + "%' or wh_description like '%"+ v +"%'";
+                                return "upper(wh_code) like '%"+v.toUpperCase()+"%' or upper(wh_description) like '%"+v.toUpperCase()+"%'";
                             }
                         }],                        
                         dbColumns:[{

frontend/saas-web/app/view/sys/maxnumbers/DataList.js

@@ -17,7 +17,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
 
     tbar: [{
         width: 150,
-        name: 'mn_caller',
+        name: 'mn_name',
         xtype: 'textfield',
         emptyText : '单据名称'
     },{
@@ -81,7 +81,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     },{
         text : "单据名称", 
         width : 200.0, 
-        dataIndex : "mn_caller", 
+        dataIndex : "mn_name", 
         xtype : "", 
     }, 
     {

frontend/saas-web/overrides/data/Connection.js

@@ -12,7 +12,9 @@ Ext.define('saas.override.data.Connection', {
          * @cfg {Object} defaultServerHeaders
          * 与defaultHeaders有区别，只在调用server api的时候才添加的headers
          */
-        defaultServerHeaders: null
+        defaultServerHeaders: {
+            'Authorization': JSON.parse(localStorage.getItem('app-state-session')).token
+        }
     },
 
     privates: {
@@ -22,7 +24,7 @@ Ext.define('saas.override.data.Connection', {
               (!serverOptions.urlPattern || new RegExp(serverOptions.urlPattern).test(originUrl))) {
                 Ext.Object.merge(options, {
                     url: serverOptions.basePath + (originUrl.indexOf('/') == 0 ? '' : '/') + originUrl,
-                    headers: this.getDefaultServerHeaders()
+                    headers: Ext.apply(options.headers, this.getDefaultServerHeaders())
                 });
             }
         }