下拉高度修改

frontend/saas-web/app/view/core/base/ImportWindow.js

@@ -178,7 +178,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                             var caller = b.ownerCt.ownerCt.ownerCt.ownerCt.caller;
                             //获取模版
                             var serverOptions = Ext.manifest.server;
-                            window.location.href = (serverOptions.basePath.http?serverOptions.basePath.http:serverOptions.basePath) + '/api/commons/excel/import/templet?caller='+caller;
+                            window.location.href = (serverOptions.basePath.https?serverOptions.basePath.https:serverOptions.basePath) + '/api/commons/excel/import/templet?caller='+caller;
                         }
                     }
                 },{
@@ -229,7 +229,7 @@ Ext.define('saas.view.core.base.ImportWindow', {
                             //导入权限校验
                             var hasPower = false;
                             Ext.Ajax.request({
-                                url: 'http://192.168.253.41:8560/api/commons/'+form.ownerCt.caller+'/import',
+                                url: '/api/commons/'+form.ownerCt.caller+'/import',
                                 async:false,
                                 method: 'GET',
                                 success: function(response, opts) {

frontend/saas-web/app/view/core/grid/column/YnColumn.js

@@ -0,0 +1,49 @@
+Ext.define('saas.view.core.grid.column.YnColumn', {
+    extend: 'Ext.grid.column.Column',
+    alias: 'widget.yncolumn',
+    constructor: function(cfg){
+        this.callParent(arguments);
+        if(!this.readOnly){
+            this.editor = {
+                    xtype: 'combo',
+                	store: Ext.create('Ext.data.Store', {
+                        fields: ['display', 'value'],
+                        data : [
+                            {"display":"是", "value":'1'},
+                            {"display":"否", "value":'0'}
+                        ]
+                    }),
+                    editable: false,
+                    displayField: 'display',
+                    valueField: 'value',
+            		queryMode: 'local',
+            		value: '0',
+            		hideTrigger: false,
+            		listeners: {
+            			scope: this,
+            			'change':function(c,newVal,oldVal){
+                            if(newVal=='1'){
+                                var grid = c.ownerCt.column.ownerCt.ownerCt;
+                                var nowId = grid.selModel.lastSelected.id;
+                                var items = grid.store.data.items
+                                for (let index = 0; index < items.length; index++) {
+                                    if(items[index].id!=nowId){
+                                        items[index].set(c.ownerCt.column.dataIndex,"")
+                                    }
+                                }
+                            }
+            			}
+            		}
+            };
+        }
+        this.renderer = function(value,meta,record,rol,col,store,view){
+            if(value === undefined){
+                return '';
+            }
+            if(!value || value == 0 || value == '0'){
+                return '';
+            }
+            return '是';
+        };
+    }
+});

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

@@ -284,50 +284,10 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 width:180 
             },
             {
-                editor : {
-                    displayField : "display", 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    valueField : "value", 
-                    xtype : "combo",
-                    store:{
-                        fields: ['display', 'value'],
-                        data : [
-                            {"display":"是", "value":'1'},
-                            {"display":"否", "value":'0'}
-                        ]
-                    },
-                    listeners:{
-                        'change':function(c,newVal,oldVal){
-                            if(newVal=='1'){
-                                var grid = c.ownerCt.column.ownerCt.ownerCt;
-                                var nowId = grid.selModel.lastSelected.id;
-                                var items = grid.store.data.items
-                                for (let index = 0; index < items.length; index++) {
-                                    if(items[index].id!=nowId){
-                                        items[index].set('cc_default',"")
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }, 
                 text : "默认联系人", 
                 width:110 ,
                 dataIndex : "cc_default", 
-                xtype : "",
-                renderer: function (v, m, r) {
-                    if(v=='0'){
-                        return '';
-                    }else if(v=='1'){
-                        return '是';
-                    }
-                    return v;
-                }
+                xtype : "yncolumn"
             }]
     } ,{
         xtype : "detailGridField", 
@@ -380,49 +340,10 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 width:110  
             },
             {
-                editor : {
-                    displayField : "display", 
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    valueField : "value", 
-                    xtype : "combo",
-                    store:{
-                        fields: ['display', 'value'],
-                        data : [
-                            {"display":"是", "value":'1'},
-                            {"display":"否", "value":'0'}
-                        ]
-                    },
-                    listeners:{
-                        'change':function(c,newVal,oldVal){
-                            if(newVal=='1'){
-                                var grid = c.ownerCt.column.ownerCt.ownerCt;
-                                var nowId = grid.selModel.lastSelected.id;
-                                var items = grid.store.data.items
-                                for (let index = 0; index < items.length; index++) {
-                                    if(items[index].id!=nowId){
-                                        items[index].set('ca_default',"")
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }, 
                 text : "默认地址", 
                 dataIndex : "ca_default", 
                 width:110,
-                renderer: function (v, m, r) {
-                    if(v=='0'){
-                        return '';
-                    }else if(v=='1'){
-                        return '是';
-                    }
-                    return v;
-                }
+                xtype:'yncolumn'
             }]
     }],
     defaultButtons:[{

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

@@ -227,6 +227,7 @@ Ext.define('saas.view.document.kind.ChildForm', {
                         grid.store.load();
                     }
                 }
+                //从表 remoteCombo 赋值
                 if(relativeField&&relativeValue&&form.ownerCt._parent&&form.ownerCt._parent.xtype!='document-kind'){
                     var grid = form.ownerCt._parent.down('grid');
                     var rec = grid.getSelectionModel().getLastSelected();
@@ -235,9 +236,15 @@ Ext.define('saas.view.document.kind.ChildForm', {
                         rec.set(name,relativeValue);
                     });
                 }
+                //主表 remoteCombo 赋值
+                //remoteCombo store刷新
                 if(combo){
                     combo.store.load(function() {
                         typeof combo.setValue == 'function' && combo.setValue(relativeValue);
+                        //重新设置combo高度
+                        var count = combo.store.getCount();
+                        var newHeight = count>5?248-(combo.hiddenBtn?50:0):(33*count+(combo.hiddenBtn?0:50));
+                        combo.picker.setHeight(newHeight);
                     });
                 }
                 saas.util.BaseUtil.showSuccessToast('保存成功');

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

@@ -279,50 +279,9 @@ Ext.define('saas.view.document.vendor.FormPanel', {
                 width:180
             },
             {
-                editor : {
-                    displayField : "display", 
-                    editable:true,
-                    format : "", 
-                    hideTrigger : false, 
-                    maxLength : 100.0, 
-                    minValue : null, 
-                    positiveNum : false, 
-                    queryMode : "local", 
-                    valueField : "value", 
-                    xtype : "combo",
-                    store:{
-                        fields: ['display', 'value'],
-                        data : [
-                            {"display":"是", "value":'1'},
-                            {"display":"否", "value":'0'}
-                        ]
-                    },
-                    listeners:{
-                        'change':function(c,newVal,oldVal){
-                            if(newVal=='1'){
-                                var grid = c.ownerCt.column.ownerCt.ownerCt;
-                                var nowId = grid.selModel.lastSelected.id;
-                                var items = grid.store.data.items
-                                for (let index = 0; index < items.length; index++) {
-                                    if(items[index].id!=nowId){
-                                        items[index].set('vc_default',"")
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }, 
                 text : "默认联系人", 
                 dataIndex : "vc_default", 
-                xtype : "",
-                renderer: function (v, m, r) {
-                    if(v=='0'){
-                        return '';
-                    }else if(v=='1'){
-                        return '是';
-                    }
-                    return v;
-                }
+                xtype : "yncolumn",
             }]
         }
     ],