Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -8,22 +8,28 @@ Ext.define('saas.util.FormUtil', {
         urlRe: /(.*){viewName}(.*)/g,
 
         setItems: function(form) {
-            var me = this,
+            let me = this,
+            defaultItems;
+            
             defaultItems = form.defaultItems;
 
+            me.clearItems(defaultItems);
+
             me.applyCusItemConfig(form)
             .then(function(res) {
                 if(res.success) {
-                    var config = res.data || true, items = defaultItems || [];
+                    let config = res.data || true, items = defaultItems || [];
                     if(config) {
-                        var cusItems = config.items || [];
+                        let cusItems = config.items || [];
                         Ext.Array.each(cusItems, function(cusItem) {
-                            var item = items.find(function(item) {
+                            let item = items.find(function(item) {
                                 return item.name == cusItem.name;
                             });
                             Ext.apply(item, cusItem);
                         });
                         items = me.applyDefaultItems(form, items);
+
+                        items = me.applyItemsGroup(items);
                     }
                     form.removeAll();
                     return form.addItems(items);
@@ -44,6 +50,18 @@ Ext.define('saas.util.FormUtil', {
 
         },
 
+        clearItems: function(items) {
+            for(let i = items.length - 1; i >= 0; i--) {
+                let item = items[i];
+                if(item.group == '_nogroup') {
+                    item.group = undefined;
+                }
+                if(item.xtype == 'container') {
+                    items.splice(i, 1);
+                }
+            }
+        },
+
         /**
          * 获得form的客户自定义字段配置
          * @param form: form组件
@@ -51,7 +69,7 @@ Ext.define('saas.util.FormUtil', {
          */
 
         applyCusItemConfig: function(form) {
-            var me = this,
+            let me = this,
             viewName = form.viewName,
             defaultItems = form.defaultItems,
             url = me.baseUrl.replace(me.urlRe, '$1' + viewName);
@@ -62,7 +80,7 @@ Ext.define('saas.util.FormUtil', {
          * 处理formitems的一些默认配置
          */
         applyDefaultItems: function(form, items) {
-            var me = this,
+            let me = this,
             formModel = form.getViewModel();
 
             Ext.Array.each(items, function(item) {
@@ -97,8 +115,8 @@ Ext.define('saas.util.FormUtil', {
 
                 // 如果是从表为其绑定store
                 if(item.xtype == 'detailGridField') {
-                    var index = form.detailCount;
-                    var columns = item.columns,
+                    let index = form.detailCount;
+                    let columns = item.columns,
                     cnames = columns.filter(function(c) {
                         return c.dataIndex && !c.ignore;
                     }).map(function(c) {
@@ -140,7 +158,7 @@ Ext.define('saas.util.FormUtil', {
                             });
                         }
                         
-                        var editor = c.editor;
+                        let editor = c.editor;
                         if(editor) {
                             Ext.applyIf(editor, {
                                 selectOnFocus: true
@@ -179,7 +197,7 @@ Ext.define('saas.util.FormUtil', {
                         data: [],
                         listeners: {
                             datachanged: function(s, eOpts) {
-                                var g = form.query('detailGridField')[index];
+                                let g = form.query('detailGridField')[index];
                                 g.fireEvent('datachanged', g, s, eOpts);
                             },
                             // 为新增行设置默认值
@@ -201,23 +219,89 @@ Ext.define('saas.util.FormUtil', {
             return items;
         },
 
+        applyItemsGroup: function(items) {
+            let groups = [];
+
+            Ext.Array.each(items, function(item, index) {
+                let groupName = item.group;
+                if(!!groupName) {
+                    let idx = groups.findIndex(function(g) {
+                        return g.title == groupName;
+                    }),group;
+
+                    if(idx == -1) {
+                        group = {
+                            title: groupName,
+                            count: 1
+                        };
+                        groups.push(group);
+                    }else {
+                        group = groups[idx];
+                        group.count++;
+                    }
+                }
+            });
+
+            Ext.Array.sort(items, function(a, b) {
+                let gs = groups.concat([{
+                    title: '_nogroup'
+                }]);
+                a.group = a.group || '_nogroup';
+                let v1 = gs.findIndex(function(g) {
+                    return g.title == a.group;
+                })
+                let v2 = gs.findIndex(function(g) {
+                    return g.title == b.group;
+                })
+                return v1 - v2;
+            });
+
+            Ext.Array.each(groups, function(g) {
+                let idx = items.findIndex(function(i) {
+                    return i.group == g.title;
+                });
+                g.index = idx;
+            });
+
+            Ext.Array.each(groups, function(group, index) {
+                let formIndex = group.index;
+                delete group.index;
+                Ext.Array.insert(items, formIndex + index, [{
+                    xtype: 'container',
+                    userCls: 'x-field-separator',
+                    height: 24,
+                    html: group.title,
+                    columnWidth: 1,
+                    ignore: true,
+                    isValid: function() {
+                        return true;
+                    },
+                    isDirty: function() {
+                        return false;
+                    }
+                }]);
+            });
+
+            return items;
+        },
+
         loadData: function(form) {
-            var me = this;
+            let me = this;
             form.setLoading(true);
             if(form.initId && form.initId!=0) {
-                var url = form._readUrl + '/' + form.initId;
+                let url = form._readUrl + '/' + form.initId;
                 saas.util.BaseUtil.request({url })
                 .then(function(res) {
                     form.setLoading(false);
                     if(res.success) {
-                        var d = res.data;
-                        var o = {
+                        let d = res.data;
+                        let o = {
                             main: d.main
                         };
                         if(d.hasOwnProperty('items')) {
                             o.detail0 = d.items;
                         }else {
-                            var idx = 1;
+                            let idx = 1;
                             while(d.hasOwnProperty('items' + idx)) {
                                 o['detail' + (idx - 1)] = d['items' + idx];
                                 idx++;
@@ -246,25 +330,25 @@ Ext.define('saas.util.FormUtil', {
                 }).then(function(res) {
                     form.setLoading(false);
                     if(res.success){
-                        var code = res.data;
-                        var viewModel = form.getViewModel();
-                        var detailGrids = form.query('detailGridField');
+                        let code = res.data;
+                        let viewModel = form.getViewModel();
+                        let detailGrids = form.query('detailGridField');
 
                         if(code){
-                            var o = {};
+                            let o = {};
                             o[form._codeField] = code;
 
-                            var formData = {main: {}};
+                            let formData = {main: {}};
                             Ext.apply(formData.main, o);
                             Ext.Array.each(detailGrids, function(grid, index) {
-                                var detno = 0;
-                                var detnoColumn = grid.detnoColumn;
-                                var datas = [];
-                                var emptyRows = grid.emptyRows;
+                                let detno = 0;
+                                let detnoColumn = grid.detnoColumn;
+                                let datas = [];
+                                let emptyRows = grid.emptyRows;
                                 
                                 Ext.Array.each(new Array(emptyRows), function() {
                                     detno += 1;
-                                    var data = {};
+                                    let data = {};
                                     data[detnoColumn] = detno;
                                     datas.push(data);
                                 })
@@ -281,7 +365,7 @@ Ext.define('saas.util.FormUtil', {
                         }
                     }
                 }).then(function(formData) {
-                    var initData = form.initData;
+                    let initData = form.initData;
                     if(initData) {
                         Ext.apply(initData.main, formData.main);
                         form.setFormData(initData);

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -65,4 +65,24 @@
         border: 1px solid #FF002B;
         color: #FF002B;
     }
+}
+
+.x-field-separator {
+    &>div {
+        &>div {
+            padding-left: 20px;
+            font-weight: bold;
+
+            &:before {
+                content: ' ';
+                position: absolute;
+                width: 5px;
+                height: 16px;
+                border-radius: 4px;
+                background: #33b4ee;
+                left: 4px;
+                top: 1px;
+            }
+        }
+    }
 }

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

@@ -27,25 +27,29 @@ Ext.define('saas.view.document.customer.FormPanel', {
         name: 'id',
         fieldLabel: 'id',
         allowBlank: true,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 'cu_code',
         fieldLabel: '客户编号',
         allowBlank: false,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 'cu_name',
         fieldLabel: '客户名称',
         allowBlank: false,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 'cu_shortname',
         fieldLabel: '客户简称',
         columnWidth: 0.25,
-        hidden: true
+        hidden: true,
+        group: '基础信息',
     },{
         editable:false,
         xtype : "remotecombo", 
@@ -53,7 +57,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         name : "cu_type", 
         fieldLabel : "客户类型", 
         columnWidth : 0.25,
-        hiddenBtn:false,//true 则会关闭新增按钮功能
+        hiddenBtn:false,//true 则会关闭新增按钮功能,
+        group: '基础信息',
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
             var form = this.ownerCmp.ownerCt;
@@ -89,7 +94,8 @@ Ext.define('saas.view.document.customer.FormPanel', {
         format:'Y-m-d',
         fieldLabel : "期初日期", 
         allowBlank : true, 
-        columnWidth : 0.25  
+        columnWidth : 0.25,
+        group: '交易信息',
     },{ 
         xtype : "numberfield", 
         hideTrigger:true,
@@ -99,6 +105,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         columnWidth : 0.25,
         decimalPrecision: 2,
         minValue:0,
+        group: '交易信息',
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
@@ -111,9 +118,22 @@ Ext.define('saas.view.document.customer.FormPanel', {
         columnWidth : 0.25,
         decimalPrecision: 2,
         minValue:0,
+        group: '交易信息',
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },   
+    },{
+        xtype:'textfield',
+        name : "cu_leftamount", 
+        fieldLabel : "应收款余额", 
+        allowBlank : true, 
+        readOnly:true,
+        columnWidth : 0.25,
+        decimalPrecision: 2,
+        group: '交易信息',
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     },{
         xtype : "numberfield", 
         name : "cu_taxrate", 
@@ -122,6 +142,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         columnWidth : 0.25,
         minValue:0,
         maxValue:100,
+        group: '交易信息',
     },{ 
         xtype : "numberfield", 
         hideTrigger:true,
@@ -130,34 +151,39 @@ Ext.define('saas.view.document.customer.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision:0,
-        minValue:0
-    },{
-        xtype : "numberfield", 
-        hideTrigger:true,
-        name : "cu_credit", 
-        fieldLabel : "额度", 
-        allowBlank : true, 
-        columnWidth : 0.25,
-        decimalPrecision: 2,
         minValue:0,
-        renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
-        },
+        group: '交易信息',
     }, {
         xtype : "hidden", 
         name : "cu_sellerid", 
         fieldLabel : "业务员id",
-        defaultValue:saas.util.BaseUtil.getCurrentUser().id
+        defaultValue:saas.util.BaseUtil.getCurrentUser().id,
+        group: '交易信息',
     }, {
         xtype : "hidden", 
         name : "cu_sellercode", 
         fieldLabel : "业务员code",
+        group: '交易信息',
     }, {
         xtype : "employeeDbfindTrigger", 
         name : "cu_sellername", 
         fieldLabel : "业务员",  
         columnWidth : 0.25,
-        defaultValue:saas.util.BaseUtil.getCurrentUser().realname
+        defaultValue:saas.util.BaseUtil.getCurrentUser().realname,
+        group: '交易信息',
+    },{
+        xtype : "numberfield", 
+        hideTrigger:true,
+        name : "cu_credit", 
+        fieldLabel : "额度", 
+        allowBlank : true, 
+        columnWidth : 0.25,
+        decimalPrecision: 2,
+        minValue:0,
+        group: '交易信息',
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },
     },{
         xtype : "hidden", 
         name : "cu_nsrzh", 
@@ -184,17 +210,6 @@ Ext.define('saas.view.document.customer.FormPanel', {
         readOnly:true,
         editable:false,
         columnWidth : 0.25
-    },{
-        xtype:'textfield',
-        name : "cu_leftamount", 
-        fieldLabel : "应收款余额", 
-        allowBlank : true, 
-        readOnly:true,
-        columnWidth : 0.25,
-        decimalPrecision: 2,
-        renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
-        },
     },{
         xtype : "datefield", 
         name : "createTime", 
@@ -213,7 +228,7 @@ Ext.define('saas.view.document.customer.FormPanel', {
         fieldLabel : "备注", 
         xtype:'textfield',
         name : "cu_remark",
-        columnWidth : 0.75
+        columnWidth : 1
     }, {
         xtype : "detailGridField", 
         storeModel:'saas.model.document.customercontact',

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

@@ -26,18 +26,21 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype: 'hidden',
         name: 'id',
         fieldLabel: 'id',
-        allowBlank: true
+        allowBlank: true,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 'pr_code',
         fieldLabel: '物料编号',
-        allowBlank: false
+        allowBlank: false,
+        group: '基础信息',
     },{
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/productbrand/getCombo',
         name : "pr_brand", 
-        fieldLabel : "品牌", 
+        fieldLabel : "品牌",
+        group: '基础信息',
         addHandler:function(b){
             var form = this.ownerCmp.ownerCt;
             this.dialog = form.add({
@@ -57,31 +60,37 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype: 'textfield',
         name: 'pr_detail',
         fieldLabel: '名称',
-        allowBlank: false
+        allowBlank: false,
+        group: '基础信息',
     },{
         xtype: 'hidden',
         name: 'pr_status',
-        fieldLabel: '状态'
+        fieldLabel: '状态',
+        group: '基础信息',
     },{
         xtype: 'hidden',
         name: 'pr_statuscode',
-        fieldLabel: '状态码'
+        fieldLabel: '状态码',
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 'pr_orispeccode',
-        fieldLabel: '型号'
+        fieldLabel: '型号',
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 'pr_spec',
         fieldLabel: '规格',
-        allowBlank: false
+        allowBlank: false,
+        group: '基础信息',
     },{
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind", 
-        fieldLabel : "类型", 
-        allowBlank : false, 
+        fieldLabel : "类型",
+        allowBlank : false,
+        group: '基础信息',
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
             var form = this.ownerCmp.ownerCt;
@@ -107,6 +116,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         fieldLabel : "单位", 
         allowBlank : false, 
         editable:false,
+        group: '基础信息',
         addHandler:function(b){
             var form = this.ownerCmp.ownerCt;
             this.dialog = form.add({
@@ -122,50 +132,62 @@ Ext.define('saas.view.document.product.FormPanel', {
             });
             this.dialog.show();
         }
-    },{
-        xtype : "numberfield", 
-        name : "pr_standardprice", 
-        fieldLabel : "标准定价(元)", 
-        allowBlank : true, 
-        columnWidth : 0.25,
-        decimalPrecision: 4,
-        minValue:0
+    }, {
+        xtype: 'numberfield',
+        fieldLabel: '采购提前期',
+        name: 'pr_leadtime',
+        minValue: 0,
+        maxLength: 10,
+        group: '管理信息',
     },{
         xtype : "numberfield", 
         name : "pr_zxbzs", 
         fieldLabel : "最小包装数", 
         minValue:0,
         decimalPrecision: 0,
-        allowBlank : true
-    },{
-        xtype : "hidden", 
-        name : "pr_whid", 
-        fieldLabel : "仓库ID"
-    },{  
-        xtype : "warehouseDbfindTrigger",     
-        name : "pr_whcode", 
-        fieldLabel : "仓库编号", 
-    }, {
-        xtype : "textfield", 
-        name : "pr_whname", 
-        fieldLabel : "仓库名称", 
         allowBlank : true,
-        readOnly: true,
-        columnWidth : 0.25
+        group: '管理信息',
     },{
         xtype : "hidden", 
         name : "pr_vendid", 
-        fieldLabel : "供应商ID", 
-        columnWidth : 0
+        fieldLabel : "供应商ID",
+        group: '管理信息',
     },{
-        xtype : "vendorDbfindTrigger",   
+        xtype : "hidden",   
         name : "pr_vendcode", 
-        fieldLabel : "供应商编号"
+        fieldLabel : "供应商编号",
+        group: '管理信息',
     }, {
-        xtype : "textfield", 
+        xtype : "vendorDbfindTrigger", 
         name : "pr_vendname", 
         fieldLabel : "供应商名称",
-        readOnly: true
+        columnWidth: 0.5,
+        group: '管理信息',
+    },{
+        xtype : "hidden", 
+        name : "pr_whid", 
+        fieldLabel : "仓库ID",
+        group: '管理信息',
+    },{  
+        xtype : "hidden",     
+        name : "pr_whcode", 
+        fieldLabel : "仓库编号",
+        group: '管理信息',
+    }, {
+        xtype : "warehouseDbfindTrigger", 
+        name : "pr_whname", 
+        fieldLabel : "仓库名称", 
+        columnWidth: 0.25,
+        group: '管理信息',
+    },{
+        xtype : "numberfield", 
+        name : "pr_standardprice", 
+        fieldLabel : "标准定价(元)", 
+        allowBlank : true, 
+        columnWidth : 0.25,
+        decimalPrecision: 4,
+        minValue:0,
+        group: '管理信息',
     },{
         ignore:true,
         readOnly:true,
@@ -175,7 +197,8 @@ Ext.define('saas.view.document.product.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25,
         decimalPrecision: 4,
-        minValue:0
+        minValue:0,
+        group: '管理信息',
     },{
         ignore:true,
         readOnly:true,
@@ -183,7 +206,8 @@ Ext.define('saas.view.document.product.FormPanel', {
         name : "pr_saleprice", 
         fieldLabel : "最新售价(元)", 
         decimalPrecision: 4,
-        minValue:0
+        minValue:0,
+        group: '管理信息',
     },{  
         hidden:true,
         xtype : "datefield", 
@@ -194,12 +218,6 @@ Ext.define('saas.view.document.product.FormPanel', {
         xtype : "datefield", 
         name : "updateTime", 
         fieldLabel : "更新时间"
-    }, {
-        xtype: 'numberfield',
-        fieldLabel: '提前期',
-        name: 'pr_leadtime',
-        minValue: 0,
-        maxLength: 10
     },{
         xtype : "textfield", 
         name : "pr_text1", 

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

@@ -27,25 +27,29 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         name: 'id',
         fieldLabel: 'id',
         allowBlank: true,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 've_code',
         fieldLabel: '供应商编号',
         allowBlank: false,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 've_name',
         fieldLabel: '供应商名称',
         allowBlank: false,
-        columnWidth: 0.25
+        columnWidth: 0.25,
+        group: '基础信息',
     },{
         xtype: 'textfield',
         name: 've_shortname',
         fieldLabel: '供应商简称',
         columnWidth: 0.25,
-        hidden: true
+        hidden: true,
+        group: '基础信息',
     },{
         xtype: 'hidden',
         name: 've_status',
@@ -65,6 +69,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         name : "ve_type", 
         fieldLabel : "供应商类型", 
         columnWidth : 0.25,
+        group: '基础信息',
         addHandler:function(b){
             var document = Ext.create('saas.view.document.kind.Kind',{});
             var form = this.ownerCmp.ownerCt;
@@ -95,7 +100,8 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         format:'Y-m-d',
         fieldLabel : "期初日期", 
         allowBlank : true, 
-        columnWidth : 0.25  
+        columnWidth : 0.25,
+        group: '交易信息',
     },{ 
         xtype : "numberfield", 
         hideTrigger:true,
@@ -105,6 +111,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth : 0.25,
         decimalPrecision: 2,
         minValue:0,
+        group: '交易信息',
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },
@@ -117,9 +124,23 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth : 0.25,
         decimalPrecision: 2,
         minValue:0,
+        group: '交易信息',
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 2, true);
         },    
+    },{  
+        xtype : "numberfield", 
+        name : "ve_leftamount", 
+        fieldLabel : "应付款余额", 
+        allowBlank : true, 
+        readOnly:true,
+        ignore:true,
+        columnWidth : 0.25,
+        decimalPrecision: 2,
+        group: '交易信息',
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 2, true);
+        },  
     },{
         xtype : "numberfield", 
         name : "ve_taxrate", 
@@ -129,6 +150,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         columnWidth : 0.25,
         minValue:0,  
         maxValue:100,
+        group: '交易信息',
     },{ 
         xtype : "numberfield", 
         hideTrigger:true,
@@ -139,13 +161,15 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         minValue:0,
         maxLength: 8,
         enforceMaxLength: true,
-        decimalPrecision: 0
+        decimalPrecision: 0,
+        group: '交易信息',
     },{
         xtype : "textfield", 
         name : "ve_nsrzh", 
         fieldLabel : "纳税人识别号", 
         allowBlank : true, 
-        columnWidth : 0.25
+        columnWidth : 0.25,
+        group: '基础信息',
     },{
         xtype : "textfield", 
         name : "ve_bankcode", 
@@ -173,20 +197,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         allowBlank : true, 
         hidden:true,
         columnWidth : 0.25  
-    },{  
-        xtype : "numberfield", 
-        name : "ve_leftamount", 
-        fieldLabel : "应付款余额", 
-        allowBlank : true, 
-        readOnly:true,
-        ignore:true,
-        columnWidth : 0.25,
-        decimalPrecision: 2,
-        renderer : function(v) {
-            return saas.util.BaseUtil.numberFormat(v, 2, true);
-        },  
-    },
-    {
+    }, {
         xtype : "hidden", 
         name : "ve_buyercode", 
         fieldLabel : "采购员编号"
@@ -206,7 +217,7 @@ Ext.define('saas.view.document.vendor.FormPanel', {
         name : "ve_address", 
         fieldLabel : "地址", 
         allowBlank : true, 
-        columnWidth : 1
+        columnWidth : 0.75
     },{
         fieldLabel : "备注", 
         xtype:'textfield',