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

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/config/WebConfig.java

@@ -8,7 +8,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@ import java.util.List;
  **/
 
 @Configuration
-public class WebConfig extends WebMvcConfigurationSupport{
+public class WebConfig implements WebMvcConfigurer {
     @Bean
     public HttpMessageConverter<String> responseBodyConverter() {
         StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
@@ -40,7 +40,6 @@ public class WebConfig extends WebMvcConfigurationSupport{
 
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
         converters.add(responseBodyConverter());
         converters.add(MappingJacksonHttpMessageConverter());
     }
@@ -49,5 +48,4 @@ public class WebConfig extends WebMvcConfigurationSupport{
     public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
         configurer.favorPathExtension(false);
     }
-
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/config/WebConfig.java

@@ -8,7 +8,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@ import java.util.List;
  **/
 
 @Configuration
-public class WebConfig extends WebMvcConfigurationSupport{
+public class WebConfig implements WebMvcConfigurer {
     @Bean
     public HttpMessageConverter<String> responseBodyConverter() {
         StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
@@ -40,7 +40,6 @@ public class WebConfig extends WebMvcConfigurationSupport{
 
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
         converters.add(responseBodyConverter());
         converters.add(MappingJacksonHttpMessageConverter());
     }
@@ -49,6 +48,6 @@ public class WebConfig extends WebMvcConfigurationSupport{
     public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
         configurer.favorPathExtension(false);
     }
-
 }
 
+

applications/money/money-server/src/main/java/com/usoftchina/saas/money/config/WebConfig.java

@@ -8,7 +8,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@ import java.util.List;
  **/
 
 @Configuration
-public class WebConfig extends WebMvcConfigurationSupport{
+public class WebConfig implements WebMvcConfigurer {
     @Bean
     public HttpMessageConverter<String> responseBodyConverter() {
         StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
@@ -40,7 +40,6 @@ public class WebConfig extends WebMvcConfigurationSupport{
 
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
         converters.add(responseBodyConverter());
         converters.add(MappingJacksonHttpMessageConverter());
     }
@@ -49,6 +48,5 @@ public class WebConfig extends WebMvcConfigurationSupport{
     public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
         configurer.favorPathExtension(false);
     }
-
 }
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/config/WebConfig.java

@@ -8,7 +8,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
@@ -21,7 +21,7 @@ import java.util.List;
  **/
 
 @Configuration
-public class WebConfig extends WebMvcConfigurationSupport{
+public class WebConfig implements WebMvcConfigurer {
     @Bean
     public HttpMessageConverter<String> responseBodyConverter() {
         StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
@@ -40,7 +40,6 @@ public class WebConfig extends WebMvcConfigurationSupport{
 
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
         converters.add(responseBodyConverter());
         converters.add(MappingJacksonHttpMessageConverter());
     }
@@ -50,5 +49,4 @@ public class WebConfig extends WebMvcConfigurationSupport{
         configurer.favorPathExtension(false);
     }
 
-}
-
+}

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/config/WebConfig.java

@@ -8,7 +8,7 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
@@ -20,8 +20,9 @@ import java.util.List;
  * @create: 2018-10-30 11:20
  **/
 
+
 @Configuration
-public class WebConfig extends WebMvcConfigurationSupport{
+public class WebConfig implements WebMvcConfigurer {
     @Bean
     public HttpMessageConverter<String> responseBodyConverter() {
         StringHttpMessageConverter converter = new StringHttpMessageConverter(Charset.forName("UTF-8"));
@@ -40,7 +41,6 @@ public class WebConfig extends WebMvcConfigurationSupport{
 
     @Override
     public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-        super.configureMessageConverters(converters);
         converters.add(responseBodyConverter());
         converters.add(MappingJacksonHttpMessageConverter());
     }
@@ -49,6 +49,5 @@ public class WebConfig extends WebMvcConfigurationSupport{
     public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
         configurer.favorPathExtension(false);
     }
-
 }
 

frontend/saas-web/app/model/sale/Saledetail.js

@@ -5,8 +5,8 @@ Ext.define('saas.model.sale.Saledetail', {
         { name: 'sd_detno', type: 'int' },
         { name: 'id', type: 'int' },
         { name: 'sd_prodcode', type: 'string' },
-        { name: 'sd_qty', type: 'int' },
-        { name: 'sd_yqty', type: 'int' },
+        { name: 'sd_qty', type: 'float' },
+        { name: 'sd_yqty', type: 'float' },
         { name: 'sd_price', type: 'float' },
         { name: 'sd_taxrate', type: 'float' },
         { name: 'sd_total', type: 'float' },

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

@@ -221,7 +221,7 @@ Ext.define('saas.util.FormUtil', {
                             var detnoColumn = grid.detnoColumn;
                             var datas = [];
                             
-                            Ext.Array.each(new Array(3), function() {
+                            Ext.Array.each(new Array(10), function() {
                                 detno += 1;
                                 var data = {};
                                 data[detnoColumn] = detno;

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

@@ -42,7 +42,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                             if(i==0){
                                 span=span+'<span style="width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';//display:block;
                             }else{
-                                span=span+'<span style="width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';
+                                span=span+'<span style="padding:0 0 0 20px;width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';
                             }
                             if(dbtpls[i].dbField=="true"){
                                 me.searchFieldArray=dbtpls[i].field;
@@ -68,11 +68,19 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                 }
                 //加载数据
                 var data,dbCondition=[];
-                if(me.dbtplcondition){
-                    dbCondition = [{
-                        type: 'condition',
-                        value:me.dbtplcondition,
-                    }];
+                if(me.dbfinds){
+                    var dbtplcondition = "";
+                    for (let index = 0; index < dbfinds.length; index++) {
+                        var item = dbfinds[index].from;
+                        dbtplcondition+= "upper("+item+") like '%"+queryString.toUpperCase()+"%' or ";
+                    }
+                    dbtplcondition = "(" + dbtplcondition.substring(0,dbtplcondition.length-4) + ")";
+                    if(dbtplcondition.length>0){
+                        dbCondition = [{
+                            type: 'condition',
+                            value:dbtplcondition
+                        }];
+                    }
                 }
                 //添加默认条件
                 if(me.defaultCondition) {

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

@@ -86,7 +86,7 @@ Ext.define('saas.view.document.product.FormController', {
                         defaultCondition:"wh_statuscode='OPEN'",
                         //联想设置
                         dbtpls:[{
-                            field:'wh_code',width:100
+                            field:'wh_code',width:180
                         },{
                             field:'wh_description',width:100
                         }],

frontend/saas-web/app/view/money/othspendings/QueryPanelController.js

@@ -6,22 +6,27 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
         this.control({
             //放大镜赋值关系 以及 tpl模板
             'dbfindtrigger[name=os_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
-                        dbfinds:[{
-                            from:'id',to:'os_vendid'
-                        },{
-                            from:'ve_code',to:'os_vendcode'
-                        },{
-                            from:'ve_name',to:'os_vendname'
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'os_vendid'
+                        }, {
+                            from: 've_code',
+                            to: 'os_vendcode'
+                        }, {
+                            from: 've_name',
+                            to: 'os_vendname'
                         }],
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
+                        dbtpls: [{
+                            field: 've_code',
+                            width: 100
+                        }, {
+                            field: 've_name',
+                            width: 100
                         }],
                         defaultCondition: "ve_statuscode='OPEN'",
                         dbSearchFields:[{
@@ -82,7 +87,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                             "dataIndex": "ve_bankcode",
                             "width": 100
                         }]
-                    }) ;   
+                    });
 
                 }
             },

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

@@ -7,23 +7,24 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         this.control({
             // 供应商名称
             'dbfindtrigger[name=pb_vendname]':{
-                beforerender:function(f){
-                    Ext.apply(f,{
-                        dataUrl:'/api/document/vendor/list',
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/document/vendor/list',
                         addXtype: 'document-vendor-formpanel',
                         addTitle: '供应商资料',
-                        defaultCondition:"ve_statuscode='OPEN'",
-                        //赋值 
-                        dbfinds:[{
-                            from:'ve_code',to:'pd_vendcode'
-                        },{
-                            from:'ve_name',to:'pb_vendname'
+                        dbfinds: [{
+                            from: 've_code',
+                            to: 'pd_vendcode'
+                        }, {
+                            from: 've_name',
+                            to: 'pb_vendname'
                         }],
-                        //联想设置
-                        dbtpls:[{
-                            field:'ve_code',width:100
-                        },{
-                            field:'ve_name',width:100
+                        dbtpls: [{
+                            field: 've_code',
+                            width: 100
+                        }, {
+                            field: 've_name',
+                            width: 100
                         }],
                         defaultCondition: "ve_statuscode='OPEN'",
                         dbSearchFields:[{
@@ -36,71 +37,55 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             allowBlank : true, 
                             columnWidth : 0.25
                         }],
-                        //放大镜窗口列表
                         dbColumns:[{
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
-                            "width": 50,
-                            "xtype": "",
+                            "width": 200,
                             "items": null
-                        },{
+                        }, {
                             "text": "税率",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "ve_taxrate",
-                            "width": 50,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "承付天数",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "ve_promisedays",
-                            "width": 50,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "纳税人识别号",
-                            "flex": 0,
-                            "dataIndex": "ve_nsrzh",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
                             "text": "开户银行",
-                            "flex": 0,
-                            "dataIndex": "ve_bankcode",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        },{
-                            "text": "银行账户",
-                            "flex": 0,
+                            "flex": 1,
                             "dataIndex": "ve_bankaccount",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
-                    }) ;   
+                    });
 
                 }
             },

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -27,37 +27,49 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             field:'cu_name',width:100
                         }],
                         defaultCondition: 'cu_statuscode="OPEN"',
-                        //放大镜窗口字段
                         dbSearchFields:[{
                             emptyText:'输入客户编号或名称',
-                            name : "cu_name", 
+                            xtype : "textfield", 
+                            name : "search", 
                             getCondition: function(v) {
                                 return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
                             },
-                            fieldLabel : "客户名称", 
+                            allowBlank : true, 
                             columnWidth : 0.25
                         }],
                         //放大镜窗口列表
                         dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
+                            "text": "客户ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
-                            "text": "供应商编号",
-                            "flex": 1,
+                            "text": "客户编号",
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
-                            "text": "供应商名称",
-                            "flex": 1,
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -98,25 +110,37 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         }],
                         //放大镜窗口列表
                         dbColumns:[{
-                            "text": "ID",
-                            "flex": 0,
+                            "text": "客户ID",
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
-                            "text": "供应商编号",
-                            "flex": 1,
+                            "text": "客户编号",
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
-                            "text": "供应商名称",
-                            "flex": 1,
+                            "text": "客户名称",
+                            "dataIndex": "cu_name",
+                            "width": 200
+                        },{
+                            "text": "客户类型",
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
+                        },{
+                            "text": "业务员",
+                            "dataIndex": "cu_sellername",
+                            "width": 100
+                        },{
+                            "text": "税率",
+                            "dataIndex": "cu_taxrate",
+                            "width": 100
+                        },{
+                            "text": "承付天数",
+                            "dataIndex": "cu_promisedays",
+                            "width": 100
+                        },{
+                            "text": "额度",
+                            "dataIndex": "cu_credit",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.money.recBalance.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -42,37 +42,50 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dbColumns:[{
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
                             "text": "供应商编号",
+                            "flex": 1,
                             "dataIndex": "ve_code",
+                            "width": 100
                         }, {
                             "text": "供应商名称",
+                            "flex": 1,
                             "dataIndex": "ve_name",
+                            "width": 100
                         }, {
                             "text": "供应商类型",
+                            "flex": 0,
                             "dataIndex": "ve_type",
-                        },{
+                            "width": 200,
+                            "items": null
+                        }, {
                             "text": "税率",
+                            "flex": 1,
                             "dataIndex": "ve_taxrate",
-                            "width": 80,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "承付天数",
+                            "flex": 1,
                             "dataIndex": "ve_promisedays",
-                            "width": 80,
-                            "xtype": "",
-                            "items": null
-                        },{
+                            "width": 100
+                        }, {
                             "text": "纳税人识别号",
-                            "dataIndex": "ve_nsrzh",
-                        },{
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
                             "text": "开户银行",
-                            "dataIndex": "ve_bankcode",
-                        },{
-                            "text": "银行账户",
+                            "flex": 1,
                             "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.purchase.purchase.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -45,36 +45,52 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -44,36 +44,52 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -133,6 +133,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 text : "已转数", 
                 dataIndex : "sd_yqty", 
                 width : 120.0, 
+                hidden : true,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

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

@@ -90,11 +90,11 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '客户编号',
             dataIndex: 'sa_custcode',
-            width: 120
+            width: 150
         }, {
             text: '客户名称',
             dataIndex: 'sa_custname',
-            width: 120
+            width: 180
         }, {
             text: '审核状态',
             dataIndex: 'sa_status',

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

@@ -43,36 +43,52 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -94,9 +110,9 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                             from:'cu_name',to:'pi_custname'
                         }],
                         dbtpls:[{
-                            field:'pi_custcode',width:100
+                            field:'cu_code',width:100
                         },{
-                            field:'pi_custname',width:100
+                            field:'cu_name',width:100
                         }],
                         defaultCondition:"cu_statuscode='OPEN'",
                         //放大镜窗口字段
@@ -112,54 +128,36 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanelController', {
                         }],
                         dbColumns:[{
                             "text": "客户ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "客户编号",
-                            "flex": 1,
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
                             "text": "客户名称",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 200
                         },{
                             "text": "客户类型",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "业务员",
-                            "flex": 1,
                             "dataIndex": "cu_sellername",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "税率",
-                            "flex": 1,
                             "dataIndex": "cu_taxrate",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "承付天数",
-                            "flex": 1,
                             "dataIndex": "cu_promisedays",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "额度",
-                            "flex": 1,
                             "dataIndex": "cu_credit",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.stock.appropriationInOut.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.stock.make.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -38,36 +38,52 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -112,54 +128,36 @@ Ext.define('saas.view.stock.otherIn.FormPanelController', {
                         }],
                         dbColumns:[{
                             "text": "客户ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "客户编号",
-                            "flex": 1,
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
                             "text": "客户名称",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 200
                         },{
                             "text": "客户类型",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "业务员",
-                            "flex": 1,
                             "dataIndex": "cu_sellername",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "税率",
-                            "flex": 1,
                             "dataIndex": "cu_taxrate",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "承付天数",
-                            "flex": 1,
                             "dataIndex": "cu_promisedays",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "额度",
-                            "flex": 1,
                             "dataIndex": "cu_credit",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }]
                     });
 

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

@@ -34,36 +34,52 @@ Ext.define('saas.view.stock.otherIn.QueryPanelController', {
                             columnWidth : 0.25
                         }],
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -38,36 +38,52 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             }
                         }],                        
                         dbColumns:[{
-                            conditionCode:'id',
                             "text": "供应商ID",
                             "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 
@@ -89,9 +105,9 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                             from:'cu_name',to:'pi_custname'
                         }],
                         dbtpls:[{
-                            field:'pi_custcode',width:100
+                            field:'cu_code',width:100
                         },{
-                            field:'pi_custname',width:100
+                            field:'cu_name',width:100
                         }],
                         defaultCondition:"pi_statuscode='OPEN'",
                         //放大镜窗口字段
@@ -107,54 +123,36 @@ Ext.define('saas.view.stock.otherOut.FormPanelController', {
                         }],
                         dbColumns:[{
                             "text": "客户ID",
-                            "flex": 0,
+                            "hidden": true,
                             "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
                         },{
                             "text": "客户编号",
-                            "flex": 1,
                             "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 200,
                         }, {
                             "text": "客户名称",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 200
                         },{
                             "text": "客户类型",
-                            "flex": 1,
                             "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "业务员",
-                            "flex": 1,
                             "dataIndex": "cu_sellername",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "税率",
-                            "flex": 1,
                             "dataIndex": "cu_taxrate",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "承付天数",
-                            "flex": 1,
                             "dataIndex": "cu_promisedays",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         },{
                             "text": "额度",
-                            "flex": 1,
                             "dataIndex": "cu_credit",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -22,37 +22,64 @@ Ext.define('saas.view.stock.otherOut.QueryPanelController', {
                         },{
                             field:'ve_name',width:100
                         }],
+                        defaultCondition:"ve_statuscode='OPEN'",
+                        dbSearchFields:[{
+                            emptyText:'输入供应商编号或名称',
+                            xtype : "textfield", 
+                            name : "ve_name", 
+                            allowBlank : true, 
+                            columnWidth : 0.25,
+                            getCondition:function(v){
+                                return "(upper(ve_name) like '%"+v.toUpperCase()+"%' or upper(ve_code) like '%"+v.toUpperCase()+"%')";
+                            }
+                        }],  
                         dbColumns:[{
-                            conditionCode:'ve_id',
                             "text": "供应商ID",
                             "hidden": true,
-                            "dataIndex": "ve_id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
                         },{
-                            conditionCode:'ve_code',
                             "text": "供应商编号",
                             "flex": 1,
                             "dataIndex": "ve_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_name',
                             "text": "供应商名称",
                             "flex": 1,
                             "dataIndex": "ve_name",
-                            "xtype": "",
-                            "items": null
+                            "width": 100
                         }, {
-                            conditionCode:'ve_type',
                             "text": "供应商类型",
                             "flex": 0,
                             "dataIndex": "ve_type",
                             "width": 200,
-                            "xtype": "",
                             "items": null
+                        }, {
+                            "text": "税率",
+                            "flex": 1,
+                            "dataIndex": "ve_taxrate",
+                            "width": 100
+                        }, {
+                            "text": "承付天数",
+                            "flex": 1,
+                            "dataIndex": "ve_promisedays",
+                            "width": 100
+                        }, {
+                            "text": "纳税人识别号",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "开户银行",
+                            "flex": 1,
+                            "dataIndex": "ve_bankaccount",
+                            "width": 100
+                        }, {
+                            "text": "银行账户",
+                            "flex": 1,
+                            "dataIndex": "ve_bankcode",
+                            "width": 100
                         }]
                     }) ;   
 

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

@@ -110,5 +110,16 @@ Ext.define('saas.view.sys.config.FormPanel', {
         allowBlank : true, 
         editable:false,
         columnWidth : 0.25
-    }]
+    }],
+
+    initComponent: function () {
+        var me = this,
+        viewModel = me.getViewModel();
+
+        viewModel.set('createTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
+        viewModel.set('updateTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
+        viewModel.setFormulas(o);
+        viewModel.set(statusCodeField, auditTexts.unAuditCode);
+        me.callParent(arguments);
+    }
 });