基础资料界面标准化

frontend/saas-web/app/view/core/dbfind/DbfindGridPanel.js

@@ -99,6 +99,7 @@ Ext.define('saas.view.core.dbfind.DbfindGridPanel', {
                         var mainGrid = me.dbfindtrigger.column.ownerCt.ownerCt;
                         var rec = mainGrid.selModel.getLastSelected();
                         if(rec){
+                            console.log("rec:",rec);
                             var nowRec = me.dbfindtrigger.column.ownerCt.ownerCt.store.getData().getByKey(rec.id);
                             nowRec.set(item.to,record.get(item.from));
                             //me.column.getEditor().setValue(record.get(item.from));

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

@@ -6,6 +6,16 @@ Ext.define('saas.view.document.customer.BasePanel', {
     viewModel: 'document-customer-basepanel',
 
     searchField:[{
+        xtype : "textfield", 
+        name : "cu_code", 
+        emptyText : "客户编号", 
+        columnWidth : 0.25,
+    },{
+        xtype : "textfield", 
+        name : "cu_name", 
+        emptyText : "客户名称", 
+        columnWidth : 0.25
+    },{
         editable:false,
         hiddenBtn:true,
         xtype : "remotecombo", 
@@ -15,19 +25,62 @@ Ext.define('saas.view.document.customer.BasePanel', {
         columnWidth : 0.25
     },{
         xtype : "textfield", 
-        name : "cu_name", 
-        emptyText : "客户名称", 
+        name : "cu_sellername", 
+        emptyText : "业务员", 
         columnWidth : 0.25,
     },{
         xtype : "textfield", 
-        name : "cu_code", 
-        emptyText : "客户编号", 
+        name : "cu_promisedays", 
+        emptyText : "承付天数", 
+        columnWidth : 0.25,
+        getCondition: function(value) {
+            if(value.indexOf("=")>=0||value.indexOf("<")>=0||value.indexOf(">")>=0){
+                return ' cu_promisedays ' + value;
+            }else if(value){
+                return ' cu_promisedays = ' + value;
+            }else{
+                return '1=1';
+            }
+        }
+    },{
+        xtype : "textfield", 
+        name : "cu_credit", 
+        emptyText : "额度", 
         columnWidth : 0.25,
+        dataIndex : "cu_credit",
+        getCondition: function(value) {
+            if(value.indexOf("=")>=0||value.indexOf("<")>=0||value.indexOf(">")>=0){
+                return ' cu_credit ' + value;
+            }else if(value){
+                return ' cu_credit = ' + value;
+            }else{
+                return '1=1';
+            }
+        }
     },{
-        labelAlign:'left',
-        fieldLabel : "显示不启用", 
-        xtype:"checkbox",
-        name:"cu_statuscode"
+        xtype: 'combobox',
+        name: 'cu_statuscode',
+        fieldLabel: '状态',
+        queryMode: 'local',
+        displayField: 'cu_status',
+        valueField: 'cu_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['cu_statuscode', 'cu_status'],
+        data: [
+            ["ALL", "全部"],
+            ["OPEN", "已开启"],
+            ["CLOSE", "已关闭"]
+        ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL'||value==null) {
+                return '1=1';
+            }else {
+                return 'cu_statuscode=\'' + value + '\'';
+            }
+        }
     }],
 
     //字段属性
@@ -44,7 +97,9 @@ Ext.define('saas.view.document.customer.BasePanel', {
         codeField: 'cu_code',
         statusCodeField:'cu_statuscode',
         dataUrl: '/api/document/customer/list',
-        columns : [{
+        //dataUrl: 'http://192.168.253.31:8560/api/document/customer/list',
+        columns : [
+        {
             text : "客户id", 
             width : 0, 
             dataIndex : "id", 
@@ -56,38 +111,71 @@ Ext.define('saas.view.document.customer.BasePanel', {
         }, 
         {
             text : "客户名称", 
-            dataIndex : "cu_name", 
-            width : 120.0, 
+            dataIndex : "cu_name"
         }, 
         {
-            text : "客户状态", 
-            dataIndex : "cu_status", 
-            width : 120.0, 
+            text : "客户UU", 
+            dataIndex : "cu_uu"
         }, 
         {
-            text : "客户状态码", 
-            dataIndex : "cu_statuscode", 
-            width : 0, 
+            text : "类型", 
+            dataIndex : "cu_type" 
         }, 
         {
-            text : "客户UU", 
-            dataIndex : "cu_uu", 
-            width : 120.0, 
+            text : "业务员编号", 
+            dataIndex : "cu_sellercode"
+        }, 
+        {
+            text : "业务员", 
+            dataIndex : "cu_sellername"
+        },{
+            text : "税率", 
+            dataIndex : "cu_taxrate", 
+            xtype: 'numbercolumn'
+        },{
+            text : "承付天数", 
+            xtype: 'numbercolumn',
+            dataIndex : "cu_promisedays", 
+            renderer : function(v) {
+                return Ext.util.Format.number(v, '0');
+            }
         }, 
         {
-            text : "客户类型", 
-            dataIndex : "cu_type", 
-            width : 120.0, 
+            text : "额度", 
+            xtype: 'numbercolumn',
+            dataIndex : "cu_credit", 
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                return Ext.util.Format.number(v, format);
+            }
+        }, 
+        {
+            text : "开户银行", 
+            dataIndex : "cu_bankaccount"
+        },{
+            text : "银行账户", 
+            dataIndex : "cu_bankcode"
+        },{
+            text : "客户状态", 
+            dataIndex : "cu_status", 
+            flex : 1.0
+        }, 
+        {
+            text : "客户状态码", 
+            dataIndex : "cu_statuscode", 
+            width : 0 
         }, 
         {
             text : "默认客户地址", 
             dataIndex : "ca_address", 
-            width : 120.0, 
+            width : 0 
         }, 
         {
             text : "默认客户联系人", 
             dataIndex : "cc_name", 
-            flex : 1.0, 
+            width : 0
         }]
     },
 

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

@@ -20,6 +20,11 @@ Ext.define('saas.view.document.employee.BasePanel', {
         name : "em_class", 
         emptyText : "类型",    
         width:100
+    },{
+        xtype : "textfield", 
+        name : "name", 
+        emptyText : "角色",    
+        width:100
     }],
 
     //字段属性

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

@@ -257,7 +257,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
             },{
                 readOnly:true,
                 xtype:'textfield',
-                fieldLabel: '仓库状态',
+                fieldLabel: '状态',
                 name: 'wh_status',   
                 value:'已开启',
                 maxLength: 20

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

@@ -127,30 +127,46 @@ Ext.define('saas.view.document.kind.Kind', {
         },
         bankinformation:{
             columns: [{
-                text: '账户编号',
+                text: '账户',
                 dataIndex: 'bk_bankcode',
                 flex: 1
             },{
-                text: '账户名称',
+                text: '名称',
                 dataIndex: 'bk_bankname',
                 flex: 1
-            },{
-                xtype:'datecolumn',
-                text: '建账日期',
-                format:'Y-m-d',
-                dataIndex: 'bk_date',
-                flex: 1
             },{
                 text: '账户类别',
                 dataIndex: 'bk_type',
                 flex: 1,
             },{
-                text: '账户期初金额',
+                text: '期初金额',
                 dataIndex: 'bk_beginamount',
+                xtype: 'numbercolumn',
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    console.log("format:",format);
+                    return Ext.util.Format.number(v, format);
+                },
                 flex: 1
             },{
-                text: '账户期末余额',
+                text: '当前余额',
                 dataIndex: 'bk_thisamount',
+                xtype: 'numbercolumn',
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    console.log("format:",format);
+                    return Ext.util.Format.number(v, format);
+                },
+                flex: 1
+            },{
+                xtype:'datecolumn',
+                text: '建账日期',
+                format:'Y-m-d',
+                dataIndex: 'bk_date',
                 flex: 1
             }, {
                 text: '备注',
@@ -237,7 +253,7 @@ Ext.define('saas.view.document.kind.Kind', {
         },
         warehouse:{
             columns: [{
-                text: '仓库编号',
+                text: '编号',
                 dataIndex: 'wh_code',
                 width: 200
             },{
@@ -245,7 +261,7 @@ Ext.define('saas.view.document.kind.Kind', {
                 dataIndex: 'wh_description',
                 width: 200
             },{
-                text: '仓库类型',
+                text: '类型',
                 dataIndex: 'wh_type',
                 width: 200
             },{  

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

@@ -6,12 +6,9 @@ Ext.define('saas.view.document.product.BasePanel', {
     viewModel: 'document-product-basepanel',
 
     searchField:[{
-        editable:false,
-        hiddenBtn:true,
-        xtype : "remotecombo", 
-        storeUrl: '/api/document/producttype/getCombo',
-        name : "pr_kind", 
-        emptyText : "物料类型",
+        xtype : "dbfindtrigger", 
+        name : "pr_code", 
+        emptyText : "物料编号", 
         width:120
     },{ 
         xtype : "textfield", 
@@ -20,14 +17,17 @@ Ext.define('saas.view.document.product.BasePanel', {
         width:120
     },{
         xtype : "textfield", 
-        name : "pr_code", 
-        emptyText : "物料编号", 
-        width:120
-    },{
-        xtype : "textfield", 
-        name : "pr_unit", 
-        emptyText : "单位",    
+        name : "pr_spec", 
+        emptyText : "规格",    
         width:100
+    },{
+        editable:false,
+        hiddenBtn:true,
+        xtype : "remotecombo", 
+        storeUrl: '/api/document/producttype/getCombo',
+        name : "pr_kind", 
+        emptyText : "物料类型",
+        width:120
     },{
         xtype : "textfield", 
         name : "pr_brand", 
@@ -38,6 +38,30 @@ Ext.define('saas.view.document.product.BasePanel', {
         name : "pr_orispeccode", 
         emptyText : "型号", 
         width:100
+    }, {
+        xtype: 'combobox',
+        name: 'pr_statuscode',
+        fieldLabel: '状态',
+        queryMode: 'local',
+        displayField: 'pr_status',
+        valueField: 'pr_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['pr_statuscode', 'pr_status'],
+        data: [
+            ["ALL", "全部"],
+            ["OPEN", "已开启"],
+            ["CLOSE", "已关闭"]
+        ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pr_statuscode=\'' + value + '\'';
+            }
+        }
     }],
 
     //字段属性
@@ -86,17 +110,22 @@ Ext.define('saas.view.document.product.BasePanel', {
         }, {
             text : "最新采购单价", 
             dataIndex : "pr_purcprice",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn', 
+            width : 200.0, 
         }, {
             text : "最新出库单价", 
             dataIndex : "pr_saleprice",
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn', 
+            width : 200.0, 
         }, {
             text : "型号", 
             dataIndex : "pr_orispeccode"
         }, {
             text : "品牌", 
             dataIndex : "pr_brand"
+        }, {
+            text : "供应商", 
+            dataIndex : "pr_vendname"
         }, {
             text : "最小包装", 
             dataIndex : "pr_zxbzs",

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

@@ -5,6 +5,115 @@ Ext.define('saas.view.document.product.BasePanelController', {
     init: function (form) {
         var me = this;
         this.control({
+            //放大镜赋值关系 以及 tpl模板
+            'dbfindtrigger[name=pr_code]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        dataUrl:'/api/document/product/list',
+                        addXtype: 'document-product-formpanel',
+                        addTitle: '物料资料',
+                        dbfinds:[
+                        {
+                            from:'pr_code',to:'pr_code'
+                        },{
+                            from:'pr_detail',to:'pr_detail'
+                        }, {
+                            from:'pr_spec',to:'pr_spec'
+                        }, {
+                            from:'pr_brand',to:'pr_brand'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
+                        }, {
+                            from:'pr_orispeccode',to:'pr_orispeccode'
+                        }, {
+                            from:'id',to:'id',ignore:true
+                        }],
+                        dbtpls:[{
+                            field:'pr_code',width:100
+                        },{
+                            field:'pr_detail',width:100
+                        }],
+                        defaultCondition: "pr_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入物料编号、名称或规格',
+                            xtype : "textfield", 
+                            name : "search", 
+                            width: 200,
+                            getCondition: function(v) {
+                                return "(upper(pr_spec) like '%" + v.toUpperCase()+"%' or upper(pr_code) like '%"+v.toUpperCase()+"%' or upper(pr_detail) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "物料ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                        }, {
+                            "text": "物料编号",       
+                            "dataIndex": "pr_code",
+                            "width": 200,
+                        }, {
+                            "text": "物料名称",
+                            "width": 200,
+                            "dataIndex": "pr_detail",
+                        }, {
+                            "text": "规格",
+                            "dataIndex": "pr_spec",
+                            "width": 100,
+                        }, {
+                            "text": "单位",
+                            "dataIndex": "pr_unit",
+                            "width": 100,
+                        },{
+                            "text": "仓库id",
+                            "dataIndex": "pr_whid",
+                            "hidden": true,
+                        },{
+                            "text": "仓库编号",
+                            "dataIndex": "pr_whcode",
+                            "hidden": true,
+                        },{
+                            "text": "仓库",
+                            "dataIndex": "pr_whname",
+                            "width": 200,
+                        },{
+                            "text": "总库存数",
+                            "dataIndex": "po_onhand",
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align:'end'
+                        },{
+                            "text": "类型",
+                            "dataIndex": "pr_kind",
+                            "width": 100,
+                        },{
+                            "text": "型号",
+                            "dataIndex": "pr_orispeccode",
+                            "width": 100,
+                        },{
+                            "text": "品牌",
+                            "dataIndex": "pr_brand",
+                            "width": 100,
+                        },{
+                            "text": "供应商",
+                            "dataIndex": "pr_vendname",
+                            "width": 100,
+                        },{
+                            "text": "最小包装",
+                            "dataIndex": "pr_zxbzs",
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            align:'end'
+                        },{
+                            "text": "L/T",
+                            "dataIndex": "pr_leadtime",
+                            "width": 100,
+                        }]
+                    }) ;   
+
+                }
+            }
         });
     }
 });

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

@@ -135,7 +135,7 @@ Ext.define('saas.view.document.product.FormController', {
                 }
             },
             //放大镜赋值关系 以及 tpl模板
-            'dbfindtrigger[name=pd_whname]': {
+            'dbfindtrigger[name=pd_whcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
                         dataUrl: '/api/document/warehouse/list',
@@ -143,20 +143,17 @@ Ext.define('saas.view.document.product.FormController', {
                         addTitle: '仓库资料',
                         defaultCondition:"wh_statuscode='OPEN'",
                         dbfinds: [{
-                            from: 'id',
-                            to: 'pd_whid',ignore:true
+                            from: 'id', to: 'pd_whid',ignore:true
                         }, {
-                            from: 'wh_code',
-                            to: 'pd_whcode'
+                            from: 'wh_code', to: 'pd_whcode'
                         }, {
-                            from: 'wh_description',
-                            to: 'pd_whname'
+                            from: 'wh_description', to: 'pd_whname'
                         }],
                         dbtpls: [{
-                            field: 'pd_whcode',
+                            field: 'wh_code',
                             width: 100
                         }, {
-                            field: 'pd_whname',
+                            field: 'wh_description',
                             width: 100
                         }],
                         dbSearchFields:[{
@@ -202,7 +199,6 @@ Ext.define('saas.view.document.product.FormController', {
         });
 
     },
-
     auditBtnClick: function() {
         var me = this,
         form = me.getView(),
@@ -211,7 +207,6 @@ Ext.define('saas.view.document.product.FormController', {
         status = viewModel.data[statusCodeField];
         status == 'OPEN' ? me.unAudit() : me.audit();
     },
-
     audit: function(){
         var me = this,
         form = this.getView(),
@@ -257,5 +252,16 @@ Ext.define('saas.view.document.product.FormController', {
             console.error(res);
             showToast('禁用失败: ' + res.message);
         });
+    },
+    amount_change:function() {
+        var me = this,
+        viewModel = me.getViewModel(),
+        store = viewModel.get('detail0').detailStore,
+        items  = store.getData().items;
+        Ext.Array.each(items, function(item, i) {
+           var pd_num = item.get('pd_num') || 0 ;
+           var pd_price = item.get('pd_price') || 0 ;
+           item.set('pd_amount', pd_num*pd_price);               
+        });
     }
 });

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

@@ -12,6 +12,21 @@ Ext.define('saas.view.document.product.FormModel', {
             get:function(value){
                 return value;
             }
-        }
+        }/* ,
+        pd_num_change: {
+            bind: '{pd_num}',
+            get: function(v) {
+                var viewModel = this.getView().getViewModel(),
+                store = viewModel.get('detail0').detailStore,
+                items  = store.getData().items,
+                oneuseqty=0;
+                Ext.Array.each(items, function(item, i) {
+                   var pd_num = item.get('pd_num') || 0 ;
+                   var pd_price = item.get('pd_price') || 0 ;
+                   item.set('pd_amount', pd_num*pd_price);               
+                });
+                return v;
+            }
+        } */
     }
 });

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

@@ -13,11 +13,12 @@ Ext.define('saas.view.document.product.FormPanel', {
     _codeField: 'pr_code',
     _statusField: 'pr_status',
     _statusCodeField: 'pr_statuscode',
-    _readUrl:'/api/document/product/read/',
-    _saveUrl:'/api/document/product/save',
-    _openUrl:'/api/document/product/open',
-    _closeUrl:'/api/document/product/close',
-    _deleteUrl:'/api/document/product/delete/',
+    _readUrl:'http://192.168.253.31:8560/api/document/product/read/',
+    //_saveUrl:'/api/document/product/save',
+    _saveUrl:'http://192.168.253.31:8560/api/document/product/save',
+    _openUrl:'http://192.168.253.31:8560/api/document/product/open',
+    _closeUrl:'http://192.168.253.31:8560/api/document/product/close',
+    _deleteUrl:'http://192.168.253.31:8560/api/document/product/delete/',
     _deleteMsg:'删除的物料将不能恢复，请确认是否删除？',
     initId:0,
 
@@ -202,6 +203,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         storeModel:'saas.model.document.ProductDetail',
         detnoColumn: 'pd_detno',
         showCount: false,
+        allowEmpty:true,
         deleteDetailUrl:'/api/document/customer/delete/',
         columns : [{
             text : "ID", 
@@ -218,6 +220,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         {
             allowBlank:false,
             text : "仓库编号", 
+            dataIndex : "pd_whcode", 
             editor : {
                 displayField : "display", 
                 editable : true, 
@@ -231,7 +234,6 @@ Ext.define('saas.view.document.product.FormPanel', {
                 valueField : "value", 
                 xtype : "dbfindtrigger"
             },
-            dataIndex : "pd_whcode", 
             xtype : "", 
             items : null
         },
@@ -247,7 +249,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             hidden:true,
             text : "仓库ID", 
             dataIndex : "pd_whid", 
-            xtype : "numberfield", 
+            xtype : "numbercolumn", 
         },
         {
             allowBlank:true,
@@ -261,16 +263,19 @@ Ext.define('saas.view.document.product.FormPanel', {
                 decimalPrecision: 0,
                 minValue:0
             },
+            listeners:{
+                edit:'amount_change'
+            },
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
@@ -287,16 +292,19 @@ Ext.define('saas.view.document.product.FormPanel', {
                 decimalPrecision: 8,
                 minValue:0
             },
+            listeners:{
+                edit:'amount_change'
+            },
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
                 var format = '0.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
@@ -309,15 +317,15 @@ Ext.define('saas.view.document.product.FormPanel', {
             allowBlank : true,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             },
             summaryType: 'sum',
             summaryRenderer: function(v) {
                 var arr = (v + '.').split('.');
-                var xr = (new Array(arr[1].length)).fill('0');
-                var format = '0.' + xr.join();
+                var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
                 return Ext.util.Format.number(v, format);
             }
         }]

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

@@ -5,6 +5,16 @@ Ext.define('saas.view.document.vendor.BasePanel', {
     viewModel: 'document-vendor-basepanel',
 
     searchField:[{
+        xtype : "dbfindtrigger", 
+        name : "ve_code", 
+        emptyText : "供应商编号", 
+        columnWidth : 0.25,
+    },{
+        xtype : "textfield", 
+        name : "ve_name", 
+        emptyText : "供应商名称", 
+        columnWidth : 0.25,
+    },{
         xtype : "remotecombo", 
         storeUrl:'/api/document/vendorkind/getCombo',
         name : "ve_type", 
@@ -13,14 +23,42 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         hiddenBtn:true
     },{
         xtype : "textfield", 
-        name : "ve_name", 
-        emptyText : "供应商名称", 
+        name : "ve_promisedays", 
+        emptyText : "承付天数", 
         columnWidth : 0.25,
+        getCondition: function(value) {
+            if(value.indexOf("=")>=0||value.indexOf("<")>=0||value.indexOf(">")>=0){
+                return ' ve_promisedays '+value;
+            }else if(value){
+                return ' ve_promisedays = '+value;
+            }else{
+                return '1=1';
+            }
+        } 
     },{
-        xtype : "textfield", 
-        name : "ve_code", 
-        emptyText : "供应商编号", 
-        columnWidth : 0.25,
+        xtype: 'combobox',
+        name: 've_statuscode',
+        fieldLabel: '状态',
+        queryMode: 'local',
+        displayField: 've_status',
+        valueField: 've_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['ve_statuscode', 've_status'],
+        data: [
+            ["ALL", "全部"],
+            ["OPEN", "已开启"],
+            ["CLOSE", "已关闭"]
+        ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL'||value == null) {
+                return '1=1';
+            }else {
+                return 've_statuscode=\'' + value + '\'';
+            }
+        }
     }],
 
     //字段属性
@@ -37,6 +75,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
         codeField: 've_code',
         statusCodeField:'ve_statuscode',
         dataUrl: '/api/document/vendor/list',
+        //dataUrl: 'http://192.168.253.31:8560/api/document/vendor/list',
         columns : [{
             text : "供应商id", 
             width : 0, 
@@ -55,7 +94,7 @@ Ext.define('saas.view.document.vendor.BasePanel', {
             xtype : "", 
         }, 
         {
-            text : "供应商类型", 
+            text : "类型", 
             dataIndex : "ve_type", 
             width : 120.0, 
             xtype : "", 

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

@@ -5,6 +5,98 @@ Ext.define('saas.view.document.vendor.BasePanelController', {
     init: function (form) {
         var me = this;
         this.control({
+            // 主表-供应商名称
+            'dbfindtrigger[name=ve_code]':{
+                beforerender:function(f){
+                    Ext.apply(f,{
+                        //数据接口
+                        dataUrl:'/api/document/vendor/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        defaultCondition:"ve_statuscode='OPEN'",
+                        //赋值 
+                        dbfinds:[{
+                            from:'id',to:'id',ignore:true
+                        },{
+                            from:'ve_code',to:'ve_code'
+                        },{
+                            from:'ve_name',to:'ve_name'
+                        },{
+                            from:'ve_type',to:'ve_type'
+                        },{
+                            from:'ve_promisedays',to:'ve_promisedays'
+                        },{
+                            from:'ve_statuscode',to:'ve_statuscode'
+                        },{
+                            from:'ve_name',to:'ve_name'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'ve_code',width:100
+                        },{
+                            field:'ve_name',width:100
+                        }],
+                        defaultCondition: "ve_statuscode='OPEN'",
+                        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:[{
+                            "text": "供应商ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "供应商编号",
+                            "dataIndex": "ve_code",
+                            "width": 200
+                        }, {
+                            "text": "供应商名称",
+                            "dataIndex": "ve_name",
+                            "width": 200
+                        }, {
+                            "text": "供应商类型",
+                            "dataIndex": "ve_type",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "税率",
+                            "dataIndex": "ve_taxrate",
+                            "width": 100,
+                            xtype: 'numbercolumn'
+                        }, {
+                            "text": "承付天数",
+                            "dataIndex": "ve_promisedays",
+                            "width": 100,
+                            xtype: 'numbercolumn',
+                            renderer : function(v) {
+                                return Ext.util.Format.number(v, '0');
+                            }
+                        }, {
+                            "text": "纳税人识别号",
+                            "dataIndex": "ve_bankaccount",
+                            "width": 150
+                        }, {
+                            "text": "开户银行",
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
+                        }]
+                    }) ;   
+
+                }
+            }
         });
     }
 });

frontend/saas-web/app/view/main/Main.js

@@ -69,20 +69,6 @@ Ext.define('saas.view.main.Main', {
                     arrowVisible: false,
                     tooltip: '帮助',
                     width:50, 
-                    listeners:{
-                        'mouseover':function(){
-                            this.showMenu(); 
-                        },
-                        'mouseout':function(btn,e){
-                            var cx = e.browserEvent.clientX, cy = e.browserEvent.clientY;
-                            var btnLayout = btn.el.dom.getBoundingClientRect();
-                            if(cx <= btnLayout.left || cx >= btnLayout.left+btnLayout.width || cy <= btnLayout.top) {
-                                btn.hideMenu();
-                            }
-                        },'mouseleave':function(enu){
-                            this.hide();
-                        }
-                    },
                     menu: {
                         cls:'x-main-menu',
                         items: [{
@@ -115,15 +101,7 @@ Ext.define('saas.view.main.Main', {
                                 },{	
                                     text:'<span>邮箱:info@usoftchina.com</span>'
                                 }]
-                            }/* ,listeners: {
-                                'mouseover': function() {
-                                    this.over = true;
-                                },
-                                'mouseleave': function() {
-                                    this.over = false;
-                                    this.hide();
-                                }
-                            } */
+                            }
                         }]
                     }
                 },

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

@@ -188,44 +188,44 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 }
             },
             {
-                text : "已转数", 
-                dataIndex : "pd_yqty", 
+                text : "单价", 
                 xtype: 'numbercolumn',
+                dataIndex : "pd_price", 
                 width : 120.0,
-                hidden:true,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
-                    editable : false
+                    minValue:0
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0.' + xr.join();
-                    return Ext.util.Format.number(v, format);
-                },
-                summaryType: 'sum',
-                summaryRenderer: function(v) {
-                    var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0.' + xr.join();
+                    var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
             },
             {
-                text : "单价", 
+                text : "已转数", 
+                dataIndex : "pd_yqty", 
                 xtype: 'numbercolumn',
-                dataIndex : "pd_price", 
-                width : 120.0,
+                width : 0,
+                hidden:true,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 8,
-                    minValue:0
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length)).fill('0');
-                    var format = '0,000.' + xr.join();
+                    var format = '0.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                },
+                summaryType: 'sum',
+                summaryRenderer: function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
             }, 
@@ -240,6 +240,16 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     minValue: 0,
                     maxValue: 100
                 }
+            },{
+                text : "需求日期", 
+                dataIndex : "pd_delivery", 
+                xtype:'datecolumn',
+                width : 120.0, 
+                editor : {
+                    xtype : "datefield",
+                    editable : false, 
+                    hideTrigger : false
+                }
             },
             {
                 text : "含税金额", 
@@ -288,16 +298,6 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },{
-                text : "需求日期", 
-                dataIndex : "pd_delivery", 
-                xtype:'datecolumn',
-                width : 120.0, 
-                editor : {
-                    xtype : "datefield",
-                    editable : false, 
-                    hideTrigger : false
-                }
             },
             {
                 text : "关联销售单号", 
@@ -305,18 +305,37 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0
             }
         ]
+    }, {
+        xtype : "datefield", 
+        name : "pu_date", 
+        fieldLabel : "单据日期", 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pu_total", 
         fieldLabel : "单据金额",
         readOnly:true,
         columnWidth : 0.25,
+    },{
+        xtype : "dbfindtrigger", 
+        name : "pu_buyercode", 
+        fieldLabel : "采购员编号",
+    },{
+        xtype : "textfield", 
+        name : "pu_buyername", 
+        fieldLabel : "采购员",
+        columnWidth : 0.25,
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "pu_buyerid", 
+        fieldLabel : "采购员ID"
     },
     {
         xtype : "textfield", 
         name : "pu_remark", 
         fieldLabel : "备注", 
-        columnWidth : 0.75
+        columnWidth : 1
     },
     {
         xtype : "textfield", 
@@ -325,7 +344,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createTime", 
+        name : "pu_indate", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()

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

@@ -80,11 +80,11 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         }, {
                             "text": "开户银行",
                             "dataIndex": "ve_bankaccount",
-                            "width": 100
+                            "width": 150
                         }, {
                             "text": "银行账户",
                             "dataIndex": "ve_bankcode",
-                            "width": 100
+                            flex:1
                         }]
                     }) ;   
 
@@ -94,8 +94,68 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
             'dbfindtrigger[name=pu_buyername]':{
                 beforerender:function(f){
                     Ext.apply(f,{
+                        //数据接口
+                        dataUrl:'/api/document/employee/list',
+                        addXtype: 'document-vendor-formpanel',
+                        addTitle: '供应商资料',
+                        defaultCondition:"ve_statuscode='OPEN'",
+                        //赋值 
+                        dbfinds:[{
+                            from:'id',to:'pu_buyerid',ignore:true
+                        },{
+                            from:'em_code',to:'pu_buyercode'
+                        },{
+                            from:'em_name',to:'pu_buyername'
+                        }],
+                        //联想设置
+                        dbtpls:[{
+                            field:'em_code',width:100
+                        },{
+                            field:'em_name',width:100
+                        }],
+                        defaultCondition: "em_class='正式'",
+                        dbSearchFields:[{
+                            emptyText:'输入人员编号或名称',
+                            xtype : "textfield", 
+                            name : "search", 
+                            getCondition: function(v) {
+                                return "(upper(em_code) like '%"+v.toUpperCase()+"%' or upper(em_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true, 
+                            columnWidth : 0.25
+                        }],
+                        //放大镜窗口列表
+                        dbColumns:[{
+                            "text": "人员ID",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 0,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "人员编号",
+                            "dataIndex": "em_code",
+                            "width": 200
+                        }, {
+                            "text": "人员名称",
+                            "dataIndex": "em_name",
+                            "width": 200
+                        }, {
+                            "text": "类型",
+                            "dataIndex": "em_class",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "手机",
+                            "dataIndex": "em_mobile",
+                            "width": 180,
+                            "items": null
+                        }, {
+                            "text": "邮箱",
+                            "dataIndex": "em_email",
+                            "width": 180,
+                            "items": null
+                        }]
                     }) ;   
-
                 }
             },
             //从表多选放大镜赋值关系 以及 tpl模板
@@ -214,7 +274,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                     }) ;   
 
                 }
-            }
+            },
         });
     },
 

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

@@ -54,6 +54,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         queryMode: 'local',
         displayField: 'pu_status',
         valueField: 'pu_statuscode',
+        emptyText :'全部',
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['pu_statuscode', 'pu_status'],

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

@@ -10,28 +10,24 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        bind: '{pi_date}',
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
     }, {
         xtype: 'textfield',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
@@ -39,7 +35,6 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
         allowBlank: true,
@@ -47,25 +42,22 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
         hidden:true,
         showDetail: true
     }, {
         xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',
         showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
+        emptyText :'全部',
         editable:false,
-        columnWidth: 0.25,
         queryMode: 'local',
         displayField: 'pi_status',
         valueField: 'pi_statuscode',

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

@@ -10,28 +10,24 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        bind: '{pi_date}',
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
     }, {
         xtype: 'textfield',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
@@ -39,7 +35,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     },{
         xtype: 'textfield',
         name: 'pi_vendcode',
-        bind: '{pi_vendcode}',
         fieldLabel: '供应商编号',
         allowBlank: true,
         hidden:true,
@@ -47,7 +42,6 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     }, {
         xtype: 'dbfindtrigger',
         name: 'pi_vendname',
-        bind: '{pi_vendname}',
         fieldLabel: '供应商名称',
         emptyText:'输入供应商编号或名称',
         allowBlank: true,
@@ -55,23 +49,21 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
     }, {
         xtype: 'dbfindtrigger',
         name: 'pd_prodcode',
-        bind: '{pd_prodcode}',
         fieldLabel: '物料编号',
         hidden:true,
         showDetail: true
     }, {
         xtype: 'dbfindtrigger',
         name: 'pr_detail',
-        bind: '{pr_detail}',
         fieldLabel: '物料名称',
         emptyText:'输入物料编号或名称',
         showDetail: true
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
+        emptyText :'全部',
         editable:false,
         columnWidth: 0.25,
         queryMode: 'local',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -135,13 +135,21 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '收货数量',
         dataIndex: 'pd_acceptqty',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        summaryType: 'sum',
+        summaryRenderer: function(v) {
+            var arr = (v + '.').split('.');
+            var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
+            var format = '0.' + xr.join();
+            return Ext.util.Format.number(v, format);
+        }
     }, {
         text: '收货金额',
         dataIndex: 'pd_accepttotal',
         xtype: 'numbercolumn'
     }, {
-        text: '备注'
+        text: '备注',
+        dataIndex: 'pd_remark'
     }]
 
 });

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

@@ -51,12 +51,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         name : "sa_custname", 
         fieldLabel : "客户名称",
         allowBlank : false
-    }, {
-        xtype : "datefield", 
-        name : "sa_date", 
-        fieldLabel : "单据日期", 
-        allowBlank : false, 
-        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_toplace", 
@@ -261,6 +255,12 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
             }
         ]
+    }, {
+        xtype : "datefield", 
+        name : "sa_date", 
+        fieldLabel : "单据日期", 
+        allowBlank : false, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_total", 
@@ -270,7 +270,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         xtype : "textfield", 
         name : "sa_remark", 
         fieldLabel : "备注", 
-        columnWidth : 0.75
+        columnWidth : 1
     }, {
         xtype : 'textfield', 
         name : 'sa_sendstatus', 

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

@@ -46,6 +46,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         queryMode: 'local',
         displayField: 'sa_status',
         valueField: 'sa_statuscode',
+        emptyText :'全部',
         editable:false,
         store: Ext.create('Ext.data.ArrayStore', {
         fields: ['sa_statuscode', 'sa_status'],
@@ -117,7 +118,13 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
             text: '金额',
             dataIndex: 'sa_total',
             xtype: 'numbercolumn',
-            width: 120
+            renderer : function(v) {
+                var arr = (v + '.').split('.');
+                var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
+                var format = '0,000.' + xr.join();
+                console.log("format:",format);
+                return Ext.util.Format.number(v, format);
+            }
         }, {
             text: '制单人',
             dataIndex: 'sa_recorder',

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

@@ -42,11 +42,10 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         xtype: 'combobox',
         name: 'pi_statuscode',
         fieldLabel: '审核状态',
-        allowBlank: true,
-        columnWidth: 0.25,
         queryMode: 'local',
-        displayField: 'pi_status',
+        emptyText :'全部',
         editable:false,
+        displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {
             fields: ['pi_statuscode', 'pi_status'],

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

@@ -45,6 +45,8 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         name: 'pi_statuscode',
         fieldLabel: '审核状态',
         queryMode: 'local',
+        emptyText :'全部',
+        editable:false,
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {

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

@@ -69,6 +69,8 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
         editable:false,
         columnWidth: 0.25,
         queryMode: 'local',
+        emptyText :'全部',
+        editable:false,
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {

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

@@ -55,12 +55,13 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         editable:false,
         columnWidth: 0.25,
         queryMode: 'local',
+        emptyText :'全部',
+        editable:false,
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {

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

@@ -10,21 +10,18 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     queryFormItems: [{
         xtype: 'hidden',
         name: 'id',
-        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
         name: 'pi_inoutno',
-        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
         name: 'pi_date',
-        bind: '{pi_date}',
         fieldLabel: '单据日期',
         allowBlank: true,
         columnWidth: 0.5
@@ -55,12 +52,13 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
     }, {
         xtype: 'combobox',
         name: 'pi_statuscode',
-        bind: '{pi_statuscode}',
         fieldLabel: '审核状态',
         allowBlank: true,
         editable:false,
         columnWidth: 0.25,
         queryMode: 'local',
+        emptyText :'全部',
+        editable:false,
         displayField: 'pi_status',
         valueField: 'pi_statuscode',
         store: Ext.create('Ext.data.ArrayStore', {

frontend/saas-web/app/view/sys/guide/FormPanel.js

@@ -157,7 +157,6 @@ Ext.define('saas.view.sys.guide.FormPanel', {
     },
 
     refresh:function(){
-        debugger
         this.ownerCt.setTitle('新手指引');
         this.view.store.load();
         //刷新store数据