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

frontend/saas-web/app/view/core/dbfind/types/BankInfoDbfindTrigger.js

@@ -7,10 +7,10 @@ Ext.define('saas.view.core.dbfind.types.BankInfoDbfindTrigger', {
     addTitle: '资金账户',
     dbtpls: [{
         field: 'bk_bankcode',
-        width: 100
+        width: 150
     }, {
         field: 'bk_bankname',
-        width: 100
+        width: 200
     }],
     dbSearchFields: [{
         emptyText: '查找资金账户',
@@ -30,33 +30,28 @@ Ext.define('saas.view.core.dbfind.types.BankInfoDbfindTrigger', {
         xtype: ""
     }, {
         text: "资金账户",
-        flex: 1,
         dataIndex: "bk_bankcode",
-        width: 120,
+        width: 150,
         xtype: ""
     }, {
         text: "账户名称",
-        flex: 1,
         dataIndex: "bk_bankname",
-        width: 150,
+        width:200,
         xtype: ""
     }, {
         text: "账户类别",
-        flex: 1,
         dataIndex: "bk_type",
-        width: 120,
+        width: 110,
         xtype: ""
     }, {
         text: "账户余额",
-        flex: 1,
         dataIndex: "bk_thisamount",
-        width: 120,
+        width: 110,
         xtype: 'numbercolumn',
     }, {
         text: "建帐日期",
-        flex: 1,
+        xtype: "datecolumn",
         dataIndex: "bk_date",
-        width: 120,
-        xtype: "datecolumn"
+        width: 110
     }]
 });

frontend/saas-web/app/view/core/dbfind/types/BomDbfindTrigger.js

@@ -12,10 +12,10 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
     //联想设置
     dbtpls: [{
         field: 'bo_mothercode',
-        width: 100
+        width: 150
     }, {
         field: 'bo_mothername',
-        width: 100
+        width: 200
     }],
     
     defaultCondition: "bo_statuscode='OPEN'",
@@ -39,20 +39,19 @@ Ext.define('saas.view.core.dbfind.types.BomDbfindTrigger', {
     }, {
         text: "产品编号",
         dataIndex: "bo_mothercode",
-        width: 200,
+        width: 150,
     }, {
         text: "产品名称",
         width: 200,
         dataIndex: "bo_mothername",
     }, {
         text: "产品规格",
-        width: 200,
+        width: 150,
         dataIndex: "pr_spec",
     }, {
         text: "版本",
-        width: 200,
-        dataIndex: "bo_version",
-        flex: 1
+        width: 80,
+        dataIndex: "bo_version"
     }]
 
 });

frontend/saas-web/app/view/core/dbfind/types/CustomerDbfindTrigger.js

@@ -12,10 +12,10 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
     
     dbtpls: [{
         field: 'cu_code',
-        width: 100
+        width: 150
     }, {
         field: 'cu_name',
-        width: 100
+        width: 200
     }],
     dbSearchFields: [{
         emptyText: '输入客户编号或客户名称',
@@ -43,22 +43,22 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
         conditionCode: 'cu_name',
         text: "客户名称",
         dataIndex: "cu_name",
-        width: 180,
+        width: 200,
         xtype: "",
     }, {
         conditionCode: 'cu_type',
         text: "客户类型",
         dataIndex: "cu_type",
-        width: 150,
+        width: 110,
         xtype: "",
     }, {
         text: "业务员编号",
         dataIndex: "cu_sellercode",
-        width:150
+        width:110
     }, {
         text: "业务员",
         dataIndex: "cu_sellername",
-        width:180
+        width:110
     }, {
         text: "税率",
         dataIndex: "cu_taxrate",
@@ -68,9 +68,9 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
             return Ext.util.Format.number(v, '0');
         }
     }, {
-        text: "承付天数",
+        text: "结算天数",
         dataIndex: "cu_promisedays",
-        width:100,
+        width:110,
         xtype: 'numbercolumn',
         renderer: function (v) {
             return Ext.util.Format.number(v, '0');
@@ -78,7 +78,7 @@ Ext.define('saas.view.core.dbfind.types.CustomerDbfindTrigger', {
     }, {
         text: "额度",
         dataIndex: "cu_credit",
-        width:100,
+        width:110,
         xtype: 'numbercolumn',
     }, {
         text: "客户地址",

frontend/saas-web/app/view/core/dbfind/types/EmployeeDbfindTrigger.js

@@ -11,9 +11,9 @@ Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
     addTitle: '人员资料',
     //联想设置
     dbtpls:[{
-        field:'em_code',width:100
+        field:'em_code',width:150
     },{
-        field:'em_name',width:100
+        field:'em_name',width:110
     }],
     defaultCondition: "em_class='正式'",
     dbSearchFields:[{
@@ -36,23 +36,23 @@ Ext.define('saas.view.core.dbfind.types.EmployeeDbfindTrigger', {
     },{
         text: "人员编号",
         dataIndex: "em_code",
-        width: 200
+        width: 150
     }, {
         text: "人员名称",
         dataIndex: "em_name",
-        width: 200
+        width: 110
     }, {
         text: "类型",
         dataIndex: "em_class",
-        width: 180,
+        width: 110,
     }, {
         text: "手机",
         dataIndex: "em_mobile",
-        width: 180,
+        width: 110,
     }, {
         text: "邮箱",
         dataIndex: "em_email",
-        width: 180,
+        width: 180
     }]
 
 });

frontend/saas-web/app/view/core/dbfind/types/OriOrderMutiDbfindTrigger.js

@@ -0,0 +1,68 @@
+Ext.define('saas.view.core.dbfind.types.OriOrderMutiDbfindTrigger', {
+    extend: 'saas.view.core.dbfind.MultiDbfindTrigger',
+    xtype: 'oriOrderMutiDbfindTrigger',
+/**
+ * 用于资金首付款单明细
+ */
+    dataUrl: '/api/money/subledger/list',
+    addTitle: '源单资料',
+    dbtpls: [{
+        field: 'sl_code',
+        width: 150
+    }],
+    dbSearchFields: [{
+        emptyText: '查找资金账户',
+        xtype: "textfield",
+        name: "search",
+        getCondition: function (v) {
+            return "(upper(bk_bankcode) like '%" + v.toUpperCase() + "%' or upper(bk_bankname) like '%" + v.toUpperCase() + "%')";
+        },
+        allowBlank: true,
+        columnWidth: 0.25
+    }],
+    dbSearchFields:[{
+        emptyText:'输入源单编号',
+        xtype : "textfield",
+        name : "search",
+        getCondition: function(v) {
+            return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
+        },
+        allowBlank : true,
+        columnWidth : 0.25
+    }],
+    dbColumns:[{
+        "text": "源单id",
+        "hidden": true,
+        "dataIndex": "id",
+        "width": 100,
+        "xtype": "numbercolumn"
+    },{
+        "text": "源单编号",
+        "dataIndex": "sl_code",
+        "width": 150
+    },{
+        "text": "源单类型",
+        "dataIndex": "sl_kind",
+        "width": 110
+    }, {
+        "text": "单据金额",
+        "dataIndex": "sl_orderamount",
+        "width": 110,
+        xtype: 'numbercolumn'
+    }, {
+        "text": "已核销金额",
+        "dataIndex": "sl_yamount",
+        "width": 110,
+        xtype: 'numbercolumn'
+    }, {
+        "text": "未核销金额",
+        "dataIndex": "sl_namount",
+        "width": 110,
+        xtype: 'numbercolumn'
+    },{
+        "text": "单据日期",
+        "dataIndex": "sl_date",
+        "width": 110,
+        xtype: 'datecolumn'
+    }]
+});

frontend/saas-web/app/view/core/dbfind/types/ProductDbfindTrigger.js

@@ -9,9 +9,9 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     addXtype: 'document-product-formpanel',
     addTitle: '物料资料',
     dbtpls:[{
-        field:'pr_code',width:100
+        field:'pr_code',width:150
     },{
-        field:'pr_detail',width:100
+        field:'pr_detail',width:200
     }],
     defaultCondition: "pr_statuscode='OPEN'",
     dbSearchFields:[{
@@ -32,7 +32,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     }, {
         text: "物料编号",       
         dataIndex: "pr_code",
-        width: 200,
+        width: 150,
     }, {
         text: "物料名称",
         width: 200,
@@ -40,11 +40,11 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     }, {
         text: "规格",
         dataIndex: "pr_spec",
-        width: 100,
+        width: 150,
     }, {
         text: "单位",
         dataIndex: "pr_spec",
-        width: 100,
+        width: 80,
     },{
         text: "仓库id",
         dataIndex: "pr_whid",
@@ -61,7 +61,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     },{
         text: "总库存数",
         dataIndex: "po_onhand",
-        width: 100,
+        width: 110,
         xtype: 'numbercolumn',
         renderer : function(v) {
             var arr = (v + '.').split('.');
@@ -73,23 +73,23 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     },{
         text: "类型",
         dataIndex: "pr_kind",
-        width: 100,
+        width: 110,
     },{
         text: "型号",
         dataIndex: "pr_orispeccode",
-        width: 100,
+        width: 150,
     },{
         text: "品牌",
         dataIndex: "pr_brand",
-        width: 100,
+        width: 110,
     },{
         text: "供应商",
         dataIndex: "pr_vendname",
-        width: 100,
+        width: 250,
     },{
         text: "最小包装",
         dataIndex: "pr_zxbzs",
-        width: 100,
+        width: 110,
         xtype: 'numbercolumn',
         align: 'end',
         renderer : function(v) {
@@ -104,7 +104,7 @@ Ext.define('saas.view.core.dbfind.types.ProductDbfindTrigger', {
     },{
         text: "L/T",
         dataIndex: "pr_leadtime",
-        width: 100,
+        width: 80
     }]
 
 });

frontend/saas-web/app/view/core/dbfind/types/ProductMultiDbfindTrigger.js

@@ -35,10 +35,10 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     //联想设置
     dbtpls: [{
         field: 'pr_code',
-        width: 100
+        width: 150
     }, {
         field: 'pr_detail',
-        width: 100
+        width: 200
     }],
     defaultCondition: "pr_statuscode='OPEN'",
     dbSearchFields: [{
@@ -60,7 +60,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }, {
         text: "物料编号",
         dataIndex: "pr_code",
-        width: 200,
+        width: 150,
     }, {
         text: "物料名称",
         width: 200,
@@ -68,15 +68,14 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }, {
         text: "规格",
         dataIndex: "pr_spec",
-        width: 100,
+        width: 150,
     }, {
         text: "单位",
         dataIndex: "pr_unit",
-        width: 100,
+        width: 80
     }, {
         text: "最新采购单价",
         dataIndex: "pr_purcprice",
-        align: 'end',
         xtype: 'numbercolumn',
         hidden:true,
     }, {
@@ -95,35 +94,34 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }, {
         text: "总库存数",
         dataIndex: "po_onhand",
-        width: 100,
+        width: 110,
         xtype: 'numbercolumn',
         renderer: function (v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length)).fill('0');
             var format = '0,000.' + xr.join();
             return Ext.util.Format.number(v, format);
-        },
-        align: 'end'
+        }
     }, {
         text: "类型",
         dataIndex: "pr_kind",
-        width: 100,
+        width: 110
     }, {
         text: "型号",
         dataIndex: "pr_orispeccode",
-        width: 100,
+        width: 150
     }, {
         text: "品牌",
         dataIndex: "pr_brand",
-        width: 100,
+        width: 110
     }, {
         text: "供应商",
         dataIndex: "pr_vendname",
-        width: 100,
+        width: 200
     }, {
         text: "最小包装",
         dataIndex: "pr_zxbzs",
-        width: 100,
+        width: 110,
         xtype: 'numbercolumn',
         renderer : function(v) {
             if(!v) {
@@ -137,7 +135,7 @@ Ext.define('saas.view.core.dbfind.types.ProductMultiDbfindTrigger', {
     }, {
         text: "L/T",
         dataIndex: "pr_leadtime",
-        width: 100,
+        width: 80
     }]
 
 });

frontend/saas-web/app/view/core/dbfind/types/VendorDbfindTrigger.js

@@ -13,9 +13,9 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
 
     //联想设置
     dbtpls:[{
-        field:'ve_code',width:100
+        field:'ve_code',width:150
     },{
-        field:'ve_name',width:100
+        field:'ve_name',width:200
     }],
     defaultCondition: "ve_statuscode='OPEN'",
     dbSearchFields:[{
@@ -33,12 +33,11 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
         text: "供应商ID",
         hidden: true,
         dataIndex: "id",
-        width: 100,
         xtype: "numbercolumn"
     },{
         text: "供应商编号",
         dataIndex: "ve_code",
-        width: 200
+        width: 150
     }, {
         text: "供应商名称",
         dataIndex: "ve_name",
@@ -46,11 +45,11 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
     }, {
         text: "供应商类型",
         dataIndex: "ve_type",
-        width: 180,
+        width: 110,
     }, {
         text: "税率",
         dataIndex: "ve_taxrate",
-        width: 100,
+        width: 80,
         xtype: 'numbercolumn',
         align:'end',
         renderer : function(v) {
@@ -63,9 +62,9 @@ Ext.define('saas.view.core.dbfind.types.VendorDbfindTrigger', {
             return Ext.util.Format.number(v, format);
         }
     }, {
-        text: "承付天数",
+        text: "结算天数",
         dataIndex: "ve_promisedays",
-        width: 100,
+        width: 110,
         xtype: 'numbercolumn',
         align: 'end', 
         renderer : function(v) {

frontend/saas-web/app/view/core/dbfind/types/WarehouseDbfindTrigger.js

@@ -12,10 +12,10 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
     defaultCondition: "wh_statuscode='OPEN'",
     dbtpls: [{
         field: 'wh_code',
-        width: 100
+        width: 150
     }, {
         field: 'wh_description',
-        width: 100
+        width: 200
     }],
     dbSearchFields: [{
         emptyText: '输入仓库编号或名称',
@@ -31,24 +31,19 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
         text: "仓库ID",
         flex: 0,
         dataIndex: "id",
-        hidden:true,
-        xtype: "",
+        hidden:true
     }, {
         text: "仓库编号",
-        flex: 1,
         dataIndex: "wh_code",
-        width: 100,
-        xtype: "",
+        width: 150
     }, {
         text: "仓库名称",
-        flex: 1,
         dataIndex: "wh_description",
-        xtype: "",
+        width: 200
     }, {
         text: "仓库类型",
-        flex: 1,
         dataIndex: "wh_type",
-        xtype: "",
+        width: 110
     }],
 
     onAddClick: function() {
@@ -66,7 +61,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                 columns: [{
                     text: '编号',
                     dataIndex: 'wh_code',
-                    width: 200
+                    width: 150
                 },{
                     text: '仓库名称',
                     dataIndex: 'wh_description',
@@ -74,7 +69,7 @@ Ext.define('saas.view.core.dbfind.types.WarehouseDbfindTrigger', {
                 },{
                     text: '类型',
                     dataIndex: 'wh_type',
-                    width: 200
+                    width: 110
                 },{  
                     text: '仓库状态码',
                     dataIndex: 'wh_status',

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -254,7 +254,7 @@ Ext.define('saas.view.core.report.ReportPanel', {
 
         Ext.Array.each(columns, function(c) {
             c.columns || Ext.applyIf(c, {
-                width: 120
+                width: 110
             });
 
             if(c.xtype == 'datecolumn') {

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

@@ -69,17 +69,17 @@ Ext.define('saas.view.document.bom.BasePanel', {
         },{
             text : "产品编号", 
             dataIndex : "bo_mothercode",
-            width : 200.0,
+            width : 150.0,
         }, 
         {
             text : "产品名称", 
             dataIndex : "bo_mothername", 
-            width : 120.0, 
+            width :200.0, 
         }, 
         {
             text : "产品状态", 
             dataIndex : "bo_status", 
-            width : 120.0, 
+            width : 90.0, 
         }, 
         {
             text : "产品状态码", 
@@ -89,7 +89,7 @@ Ext.define('saas.view.document.bom.BasePanel', {
         {   
             text : "产品版本", 
             dataIndex : "bo_version", 
-            width : 120.0, 
+            width :80.0, 
         }]
     },
 

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

@@ -260,7 +260,7 @@ Ext.define('saas.view.document.kind.Kind', {
         },
         employee:{
             columns: [{
-                text: '人员编号1',
+                text: '人员编号',
                 dataIndex: 'em_code',
                 width: 150
             },{

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

@@ -96,7 +96,7 @@ Ext.define('saas.view.main.Main', {
                             }
                         },{
                             text: '客服热线',
-                            iconCls:'x-fa fa-phone-o sa-navicon',
+                            iconCls:'x-fa fa-phone sa-navicon',
                             menu:{
                                 cls:'sa-nav-menu',
                                 items:[{

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

@@ -210,7 +210,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
                 queryMode : "local",
                 store : null,
                 valueField : "value",
-                xtype : "multidbfindtrigger",
+                xtype : "oriOrderMutiDbfindTrigger",
                 listeners:{
                     beforetriggerclick:'vendnamechange'
                 }

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

@@ -27,11 +27,9 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
                 }
             },
-            'multidbfindtrigger[name=pbd_slcode]': {
+            'oriOrderMutiDbfindTrigger[name=pbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/money/subledger/list',
-                        addTitle: '源单资料',
                         dbfinds: [{
                             from: 'id',
                             to: 'pbd_slid'
@@ -57,69 +55,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             from:'sl_namount',
                             to:'pbd_nowbalance'
                         }],
-                        dbtpls: [{
-                            field: 'sl_code',
-                            width: 100
-                        }],
-                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0" ,
-                        dbSearchFields:[{
-                            emptyText:'输入源单编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "源单id",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "源单编号",
-                            "flex": 1,
-                            "dataIndex": "sl_code",
-                            "width": 100
-                        },{
-                            "text": "源单类型",
-                            "flex": 1,
-                            "dataIndex": "sl_kind",
-                            "width": 100
-                        }, {
-                            "text": "单据金额",
-                            "flex": 1,
-                            "dataIndex": "sl_orderamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "已核销金额",
-                            "flex": 1,
-                            "dataIndex": "sl_yamount",
-                            "width": 150,
-                            xtype: 'numbercolumn',
-                            align:'end',
-                            "items": null
-                        }, {
-                            "text": "未核销金额",
-                            "flex": 1,
-                            "dataIndex": "sl_namount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "单据日期",
-                            "flex": 1,
-                            "dataIndex": "sl_date",
-                            "width": 120,
-                            xtype: 'datecolumn',
-                            align:'end'
-                        }]
+                        defaultCondition: "sl_vendid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0" 
                     });
-
                 }
             },
             'dbfindtrigger[name=pd_bankname]':{

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

@@ -171,7 +171,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             text: "备注",
             dataIndex: "rd_remark",
             width: 250,
-            flex:1,
             editor: {
                 xtype: 'textfield'
             }
@@ -215,7 +214,7 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 queryMode : "local",
                 store : null,
                 valueField : "value",
-                xtype : "multidbfindtrigger",
+                xtype : "oriOrderMutiDbfindTrigger",
                 listeners:{
                     beforetriggerclick:'custnamechange'
                 }

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

@@ -37,11 +37,9 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-            'multidbfindtrigger[name=rbd_slcode]': {
+            'oriOrderMutiDbfindTrigger[name=rbd_slcode]': {
                 beforerender: function (f) {
                     Ext.apply(f, {
-                        dataUrl: '/api/money/subledger/list',
-                        addTitle: '源单单据',
                         dbfinds: [{
                             from: 'id',
                             to: 'rbd_slid',ignore:true
@@ -67,66 +65,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                             from: 'sl_namount',
                             to: 'rbd_nowbalance'
                         }],
-                        dbtpls: [{
-                            field: 'sl_code',
-                            width: 100
-                        }],
-                        defaultCondition: "sl_custid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0",
-                        dbSearchFields:[{
-                            emptyText:'输入源单编号',
-                            xtype : "textfield",
-                            name : "search",
-                            getCondition: function(v) {
-                                return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
-                            },
-                            allowBlank : true,
-                            columnWidth : 0.25
-                        }],
-                        dbColumns:[{
-                            "text": "源单id",
-                            "hidden": true,
-                            "dataIndex": "id",
-                            "width": 100,
-                            "xtype": "numbercolumn"
-                        },{
-                            "text": "源单编号",
-                            "dataIndex": "sl_code",
-                            "width": 180
-                        }, {
-                            "text": "源单类型",
-                            "flex": 1,
-                            "dataIndex": "sl_kind",
-                            "width": 100
-                        },{
-                            "text": "单据金额",
-                            "flex": 1,
-                            "dataIndex": "sl_orderamount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "已核销金额",
-                            "flex": 0,
-                            "dataIndex": "sl_yamount",
-                            "width": 200,
-                            "items": null,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "未核销金额",
-                            "flex": 1,
-                            "dataIndex": "sl_namount",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        },{
-                            "text": "单据日期",
-                            "flex": 1,
-                            "dataIndex": "sl_date",
-                            "width": 120,
-                            xtype: 'datecolumn',
-                            align:'end'
-                        }]
+                        defaultCondition: "sl_custid<>0 and sl_kind in ('期初余额','出货单','销售退货单') and sl_namount<>0"
                     });
 
                 }

frontend/saas-web/app/view/money/report/AccountBalance.js

@@ -29,7 +29,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
          {
             text: '账户编号',
             dataIndex: 'bankcode',
-            width: 200
+            width: 150
         }, {
             text: '账户名称',
             dataIndex: 'bankname',
@@ -38,14 +38,16 @@ Ext.define('saas.view.money.report.AccountBalance', {
             text: '日期',
             dataIndex: 'date',
             xtype:'datecolumn',
-            width: 200
+            width: 110
         }, {
             text: '业务类型',
-            dataIndex: 'kind'
+            dataIndex: 'kind',
+            width: 110
         },{
             text:'收入',
             dataIndex:'inamount',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -63,6 +65,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             text:'支出',
             dataIndex:'outamount',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -80,6 +83,7 @@ Ext.define('saas.view.money.report.AccountBalance', {
             text: '账户余额',
             dataIndex: 'thisamount',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -88,12 +92,16 @@ Ext.define('saas.view.money.report.AccountBalance', {
             }
         }, {
             text: '往来单位',
-            dataIndex: 'bcode'
+            dataIndex: 'bcode',
+            width: 150
         }, {
             text: '收付款人',
-            dataIndex: 'bmanname'
+            dataIndex: 'bmanname',
+            width: 110
         }, {
             text: '备注',
-            dataIndex: 'remark'
+            dataIndex: 'remark',
+            width: 250,
+            flex:1
         }]
 });

frontend/saas-web/app/view/money/report/CustomerCheck.js

@@ -33,56 +33,57 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 200
+            width: 110
         }, {
             text: '单据日期',
             dataIndex: 'pi_date',
-            xtype: 'datecolumn'
+            xtype: 'datecolumn',
+            width: 110
         }, {
             text: '序号',
             dataIndex: 'pd_pdno',
-            xtype: 'numbercolumn'
-        },{
-            text:'客户编号',
-            dataIndex:'pi_vendcode',
-            hidden: true
-        },{
-            text:'客户名称',
-            dataIndex:'pi_vendname',
-            hidden: true
+            xtype: 'numbercolumn',
+            width: 80
         },{
             text: '物料编号',
-            width: 200,
+            width: 150,
             dataIndex: 'pr_code'
         }, {
             text: '物料名称',
-            dataIndex: 'pr_detail'
+            dataIndex: 'pr_detail',
+            width: 200
         }, {
             text: '物料规格',
-            dataIndex: 'pr_spec'
+            dataIndex: 'pr_spec',
+            width: 150
         }, {
             text: '单位',
-            dataIndex: 'pd_unit'
+            dataIndex: 'pd_unit',
+            width: 80
         }, {
             text: '数量',
             xtype: 'numbercolumn',
             dataIndex: 'qty',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '单价',
             dataIndex: 'pd_orderprice',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 80
         }, {
             text: '金额',
             xtype: 'numbercolumn',
+            width: 110,
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
             renderer : function(v) {
@@ -100,10 +101,12 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             }
         }, {
             text: '不含税单价',
+            width: 110,
             dataIndex: 'pd_netprice',
             xtype: 'numbercolumn'
         }, {
             text: '不含税金额',
+            width: 110,
             xtype: 'numbercolumn',
             dataIndex: 'pd_nettotal',
             xtype: 'numbercolumn',
@@ -122,6 +125,7 @@ Ext.define('saas.view.money.report.CustomerCheckCheck', {
             }
         }, {
             text: '备注',
-            dataIndex: 'pd_remark'
+            dataIndex: 'pd_remark',
+            width: 250
         }]
 });

frontend/saas-web/app/view/money/report/PayDetail.js

@@ -32,10 +32,11 @@ Ext.define('saas.view.money.report.PayDetail', {
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         },{
             text:'供应商编号',
-            dataIndex:'pi_vendcode'
+            dataIndex:'pi_vendcode',
+            width: 150
         },{
             text:'供应商名称',
             width: 200,
@@ -43,20 +44,22 @@ Ext.define('saas.view.money.report.PayDetail', {
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 200
+            width: 110
         }, {
             text: '单据日期',
             xtype: 'datecolumn',
             dataIndex: 'pb_date',
+            width: 110
         }, {
             text: '采购员',
-            dataIndex: 'pu_buyercode'
+            dataIndex: 'pu_buyercode',
+            width: 110
         },{
             text: '期初应付余额',
             xtype: 'numbercolumn',
             dataIndex: 've_beginapamount',
             xtype: 'numbercolumn',
-            width: 140,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -75,7 +78,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'pb_pdamount',
             xtype: 'numbercolumn',
-            width: 140,
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -94,6 +97,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -111,9 +115,11 @@ Ext.define('saas.view.money.report.PayDetail', {
             text: '应付日期',
             xtype: 'datecolumn',
             dataIndex: 'mustdate',
+            width: 110
         }, {
             text: '单据总金额',
             xtype: 'numbercolumn',
+            width: 110,
             dataIndex: 'pi_total',
             xtype: 'numbercolumn',
             renderer : function(v) {
@@ -131,6 +137,7 @@ Ext.define('saas.view.money.report.PayDetail', {
             }
         }, {
             text: '备注',
-            dataIndex: 'pi_remark'
+            dataIndex: 'pi_remark',
+            width: 250
         }]
 });

frontend/saas-web/app/view/money/report/RecDetail.js

@@ -33,11 +33,11 @@ Ext.define('saas.view.money.report.RecDetail', {
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
-            width: 200
+            width: 150
         }, {
             text: '客户编号',
             dataIndex: 'pi_custcode',
-            width: 200
+            width: 150
         }, {
             text: '客户名称',
             dataIndex: 'pi_custname',
@@ -45,23 +45,25 @@ Ext.define('saas.view.money.report.RecDetail', {
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 200
+            width: 110
         },{
             text: '业务员',
             dataIndex: 'pu_buyername',
-            width: 200
+            width: 110
         }, {
             text: '单据日期',
             dataIndex: 'rb_date',
-            width: 200,
+            width: 110
         }, {
             text: '序号',
             dataIndex: 'pd_pdno',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 80
         },{
             text:'期初应收',
             dataIndex:'cu_beginaramount',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -80,6 +82,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             xtype: 'numbercolumn',
             dataIndex:'pb_pdamount',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -98,6 +101,7 @@ Ext.define('saas.view.money.report.RecDetail', {
             xtype: 'numbercolumn',
             dataIndex: 'mustpay',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -114,13 +118,16 @@ Ext.define('saas.view.money.report.RecDetail', {
         }, {
             text: '应收日期',
             dataIndex: 'mustdate',
-            xtype:'datecolumn'
+            xtype:'datecolumn',
+            width: 110
         }, {
             text: '单据总金额',
             dataIndex: 'pi_total',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '备注',
-            dataIndex: 'pd_unit'
+            dataIndex: 'pd_unit',
+            width: 250
         }]
 });

frontend/saas-web/app/view/money/report/VendorCheck.js

@@ -33,45 +33,50 @@ Ext.define('saas.view.money.report.VendorCheck', {
         }, {
             text: '单号',
             dataIndex: 'pi_inoutno',
-            width: 180
+            width: 150
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 180
+            width: 110
         }, {
             text: '单据日期',
             dataIndex: 'pi_date',
             xtype:'datecolumn',
+            width: 110
         }, {
             text: '序号',
-            dataIndex: 'pd_pdno'
+            dataIndex: 'pd_pdno',
+            width: 80
         },{
             text:'供应商编号',
             dataIndex:'pi_vendcode',
-            width: 180
+            width: 150
         },{
             text:'供应商名称',
             dataIndex:'pi_vendname',
-            width: 180
+            width: 200
         },{
             text: '物料编号',
             dataIndex: 'pr_code',
-            width: 200
+            width: 150
         }, {
             text: '物料名称',
             dataIndex: 'pr_detail',
-            width: 180
+            width: 200
         }, {
             text: '物料规格',
-            dataIndex: 'pr_spec'
+            dataIndex: 'pr_spec',
+            width: 150
         }, {
             text: '单位',
-            dataIndex: 'pd_unit'
+            dataIndex: 'pd_unit',
+            width: 80
         }, {
             text: '采购数量',
             xtype: 'numbercolumn',
             dataIndex: 'qty',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -88,16 +93,19 @@ Ext.define('saas.view.money.report.VendorCheck', {
         }, {
             text: '单价',
             dataIndex: 'pd_orderprice',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '税率',
             dataIndex: 'pd_taxrate',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 80
         }, {
             text: '金额',
             xtype: 'numbercolumn',
             dataIndex: 'pd_total',
             xtype: 'numbercolumn',
+            width: 110,
             renderer : function(v) {
                 var arr = (v + '.').split('.');
                 var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -114,13 +122,16 @@ Ext.define('saas.view.money.report.VendorCheck', {
         }, {
             text: '不含税单价',
             dataIndex: 'pd_netprice',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '不含税金额',
             dataIndex: 'pd_nettotal',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }, {
             text: '备注',
-            dataIndex: 'pd_remark'
+            dataIndex: 'pd_remark',
+            width: 250
         }]
 });

frontend/saas-web/app/view/money/verification/FormPanel.js

@@ -66,6 +66,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
             }, {
                 text: '来源单号',
                 dataIndex: 'vd_slcode',
+                width: 150,
                 editor:{
                     displayField : "display",
                     editable : true,
@@ -81,15 +82,18 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 }
             }, {
                 text: '业务类型',
-                dataIndex: "vd_slkind"
+                dataIndex: "vd_slkind",
+                width: 110
             }, {
                 text: "单据日期",
                 dataIndex: "vd_sldate",
-                xtype: 'datecolumn'
+                xtype: 'datecolumn',
+                width: 110
             }, {
                 text: "单据金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_amount",
+                width: 110,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -107,6 +111,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "已核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_yamount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -125,6 +130,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "未核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_namount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -143,7 +149,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "本次核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_nowbalance",
-                width:200,
+                width: 150,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2
@@ -181,6 +187,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
             }, {
                 text: '来源单号',
                 dataIndex: 'vd_slcode',
+                width: 150,
                 editor:{
                     displayField : "display",
                     editable : true,
@@ -196,15 +203,18 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 }
             }, {
                 text: '业务类型',
-                dataIndex: "vd_slkind"
+                dataIndex: "vd_slkind",
+                width: 110
             }, {
                 text: "单据日期",
                 dataIndex: "vd_sldate",
-                xtype: 'datecolumn'
+                xtype: 'datecolumn',
+                width: 110
             }, {
                 text: "单据金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_amount",
+                width: 110,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
                     var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -222,6 +232,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "已核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_yamount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -240,6 +251,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "未核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "sl_namount",
+                width: 110,
                 ignore:true,
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -258,7 +270,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
                 text: "本次核销金额",
                 xtype: 'numbercolumn',
                 dataIndex: "vd_nowbalance",
-                width:200,
+                width:150,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2

frontend/saas-web/app/view/money/verification/QueryPanel.js

@@ -37,39 +37,35 @@ Ext.define('saas.view.money.verification.QueryPanel', {
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 100,
             xtype: 'numbercolumn',
             hidden: true
         }, {
             text: '单据编号',
             dataIndex: 'rb_code',
-            width: 200
+            width: 150
         }, {
             text: '单据状态',
             dataIndex: 'rb_status',
-            width: 120
+            width: 90
         }, {
             text: '日期',
             dataIndex: 'rb_date',
             xtype: 'datecolumn',
-            width: 200
-        }, {
-            text: '客户编号',
-            dataIndex: 'rb_custcode',
-            hidden: true
+            width: 110
         }, {
             text: '客户名称',
             dataIndex: 'rb_custname',
+            width: 150
         }, {
             text: '收款人',
             dataIndex: 'rb_manname',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110
         }, {
             text: '收款金额',
             dataIndex: 'rb_rdamount',
             xtype: 'numbercolumn',
-            width: 120,
+            width: 110,
             flex: 1,
             hidden: true
         }]

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

@@ -46,49 +46,58 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '采购单号',
         dataIndex: 'pu_code',
-        width: 200
+        width: 150
     }, {
         text: '供应商编号',
         dataIndex: 'pu_vendcode',
-        width: 200
+        width: 150
     }, {
         text: '供应商名称',
         dataIndex: 'pu_vendname',
-        width: 200
+        width: 250
     }, {
         text: '业务状态',
-        dataIndex: 'pu_acceptstatus'
+        dataIndex: 'pu_acceptstatus',
+        width: 90
     }, {
         text: '采购员',
-        dataIndex: 'pu_buyername'
+        dataIndex: 'pu_buyername',
+        width: 110
     }, {
         text: '单据日期',
         xtype: 'datecolumn',
-        dataIndex: 'pu_date'
+        dataIndex: 'pu_date',
+        width: 110
     }, {
         text: '序号',
         dataIndex: 'pd_detno',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        width: 80
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode',
-        width: 200
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail', 
+        width: 200
     }, {
         text: '物料规格',
-        dataIndex: 'pr_spec', 
+        dataIndex: 'pr_spec',
+        width: 150 
     }, {
         text: '品牌',
-        dataIndex: 'pr_brand', 
+        dataIndex: 'pr_brand',
+        width: 110 
     }, {
         text: '单位',
-        dataIndex: 'pr_unit', 
+        dataIndex: 'pr_unit',
+        width: 80 
     }, {
         text: '采购数量',
         dataIndex: 'pd_qty',
         xtype: 'numbercolumn',
+        width: 110,
         summaryType: 'sum',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -99,6 +108,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '单价',
         dataIndex: 'pd_price',
+        width: 110,
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -109,6 +119,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '税率',
         dataIndex: 'pd_taxrate',
+        width: 80,
         xtype: 'numbercolumn',
         renderer: function(v) {
             return Ext.util.Format.number(v, '0');
@@ -116,6 +127,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '金额',
         dataIndex: 'pd_total',
+        width: 110,
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -133,6 +145,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '不含税单价',
         dataIndex: 'pd_taxprice',
+        width: 110,
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -142,6 +155,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
         }
     }, {
         text: '不含税金额',
+        width: 110,
         dataIndex: 'pd_taxtotal',
         xtype: 'numbercolumn',
         renderer: function(v) {
@@ -153,6 +167,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '收货数量',
         dataIndex: 'pd_acceptqty',
+        width: 110,
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -176,6 +191,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '收货金额',
         dataIndex: 'pd_accepttotal',
+        width: 110,
         xtype: 'numbercolumn',
         renderer: function(v) {
             var arr = (v + '.').split('.');
@@ -186,7 +202,8 @@ Ext.define('saas.view.purchase.report.Purchase', {
 
     }, {
         text: '备注',
-        dataIndex: 'pd_remark'
+        dataIndex: 'pd_remark',
+        width: 250
     }]
 
 });

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

@@ -33,37 +33,38 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {
         text: '付款单号',
         dataIndex: 'pb_code',
-        width: 200
+        width: 150
     }, {
         text: '供应商编号',
         dataIndex: 'pu_vendcode',
-        width: 200
+        width: 150
     }, {
         text: '供应商名称',
         dataIndex: 'pu_vendname',
-        width: 200
+        width: 250
     }, {
         text: '录入人',
         dataIndex: 'creatorName',
-        width: 200
+        width: 110
     }, {
         text : "日期", 
         dataIndex : "createTime", 
-        xtype:'datecolumn'
+        xtype:'datecolumn',
+        width: 110
     }, {
         text: '来源单号',
         dataIndex: 'pbd_slcode',
-        width: 200
+        width: 150
     }, {
         text: '类型',
         dataIndex: 'pbd_slkind',
-        width: 200
+        width: 110
     }, {//∑求和
         text: '采购金额',
         xtype: 'numbercolumn',
         dataIndex: 'pbd_amount',
         xtype: 'numbercolumn',
-        width: 200,
+        width: 110,
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -75,7 +76,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         text: '本次付款',
         dataIndex: 'pbd_nowbalance',
         xtype: 'numbercolumn',
-        width: 200,
+        width: 110,
         summaryType: 'sum',
         summaryRenderer: function(v) {
             var arr = (v + '.').split('.');
@@ -87,12 +88,14 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
         text: '应付余额',
         xtype: 'numbercolumn',
         dataIndex: 'pb_pbdamount',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        width: 110
     }, {
         text: '付款比例%',
         //本次付款/采购金额*100%
         dataIndex: 'pb_payrate',
         xtype: 'numbercolumn',
+        width: 110,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -102,7 +105,7 @@ Ext.define('saas.view.purchase.report.PurchasePay', {
     }, {
         text: '备注',
         dataIndex: 'pb_remark',
-        width: 200
+        width: 250
     }]
 
 });

frontend/saas-web/app/view/sale/report/Sale.js

@@ -45,15 +45,15 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '销售单号',
         dataIndex: 'sa_code',
-        width: 200
+        width: 150
     }, {
         text: '客户编号',
         dataIndex: 'sa_custcode',
-        width: 200
+        width: 150
     }, {
         text: '客户名称',
         dataIndex: 'sa_custname',
-        width: 200
+        width: 250
     }, {
         text: '业务状态',
         dataIndex: 'sa_sendstatus'
@@ -71,11 +71,12 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '序号',
         dataIndex: 'sd_detno',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        width: 80
     }, {
         text: '物料编号',
         dataIndex: 'sd_prodcode',
-        width: 200
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail',
@@ -85,7 +86,8 @@ Ext.define('saas.view.sale.report.Sale', {
         }
     }, {
         text: '物料规格',
-        dataIndex: 'pr_spec', 
+        dataIndex: 'pr_spec',
+        width: 150, 
         renderer: function (v, m, r) {
             return r.data["productDTO"]?r.data["productDTO"][m.column.dataIndex]:v;
         }
@@ -141,6 +143,7 @@ Ext.define('saas.view.sale.report.Sale', {
     }, {
         text: '税率',
         dataIndex: 'sd_taxrate',
+        width: 80,
         xtype: 'numbercolumn',
         renderer : function(v) {
             return Ext.util.Format.number(v, '0');

frontend/saas-web/app/view/sale/report/SaleProfit.js

@@ -38,50 +38,53 @@ Ext.define('saas.view.sale.report.SaleProfit', {
     }, {
         text: '客户编号',
         dataIndex: 'sa_custcode',
-        width: 200
+        width: 150
     }, {
         text: '客户名称',
         dataIndex: 'sa_custname',
         width: 200
-    }, {
-        text: '业务员编号',
-        dataIndex: 'sa_sellercode',
-        hidden:true
     }, {
         text: '业务员',
-        dataIndex: 'sa_seller'
+        dataIndex: 'sa_seller',
+        width: 110
     }, {
         text: '单据日期',
         xtype: 'datecolumn',
-        dataIndex: 'sa_date'
+        dataIndex: 'sa_date',
+        width: 110
     }, {
         text: '单据编号',
         dataIndex: 'pd_inoutno',
-        width: 200
+        width: 150
     }, {
         text: '单据类型',
-        dataIndex: 'pd_piclass'
+        dataIndex: 'pd_piclass',
+        width: 110
     }, {
         text: '物料类别',
-        dataIndex: 'pr_kind'
+        dataIndex: 'pr_kind',
+        width: 110
     }, {
         text: '物料编号',
         dataIndex: 'pr_code',
-        width: 200
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail',
         width: 200
     }, {
         text: '物料规格',
-        dataIndex: 'pr_spec'
+        dataIndex: 'pr_spec',
+        width: 150
     }, {
         text: '单位',
-        dataIndex: 'pr_unit'
+        dataIndex: 'pr_unit',
+        width: 110
     }, {
         text: '数量',
         dataIndex: 'pd_outqty',
         xtype: 'numbercolumn',
+        width: 110,
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 3 ? 3 : arr[1].length)).fill('0');
@@ -92,6 +95,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         text: '单价',
         dataIndex: 'pd_sendprice',
         xtype: 'numbercolumn',
+        width: 110,
         renderer: function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length > 2 ? 2 : arr[1].length)).fill('0');
@@ -102,6 +106,7 @@ Ext.define('saas.view.sale.report.SaleProfit', {
         text: '税率%',
         dataIndex: 'pd_taxrate',
         xtype: 'numbercolumn',
+        width: 90,
         renderer: function(v) {
             return Ext.util.Format.number(v, '0');
         }

frontend/saas-web/app/view/sale/report/SaleRec.js

@@ -32,11 +32,11 @@ Ext.define('saas.view.sale.report.SaleRec', {
         text: '收款单号',
         dataIndex: 'rb_code',
         summaryType: 'count',
-        width: 200
+        width: 150
     }, {
         text: '客户编号',
         dataIndex: 'rb_custcode',
-        width: 200
+        width: 150
     }, {
         text: '客户名称',
         dataIndex: 'rb_custname',
@@ -51,7 +51,7 @@ Ext.define('saas.view.sale.report.SaleRec', {
     }, {
         text: '来源单号',
         dataIndex: 'rbd_slcode',
-        width: 200
+        width: 150
     }, {
         text: '类型',
         dataIndex: 'rbd_slkind'
@@ -111,7 +111,8 @@ Ext.define('saas.view.sale.report.SaleRec', {
         }
     }, {
         text: '备注',
-        dataIndex: 'rb_remark'
+        dataIndex: 'rb_remark',
+        width: 250
     }]
 
 });

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

@@ -114,8 +114,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 250,
-            flex:1
+            width: 250
         },{
             text: '未含税金额',
             dataIndex: 'pi_nettotal',

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

@@ -115,8 +115,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'pi_remark',
-            width: 250,
-            flex:1
+            width: 250
         },{
             text: '未含税金额',
             dataIndex: 'pi_nettotal',

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -35,32 +35,35 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     }, {
         text: '物料编号',
         dataIndex: 'pr_code',
-        width: 200
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail',
         width: 200
     }, {
         text: '物料规格',
-        dataIndex: 'pr_spec'
+        dataIndex: 'pr_spec',
+        width: 150
     }, {
         text: '单位',
-        dataIndex: 'pr_unit'
+        dataIndex: 'pr_unit',
+        width: 80
     }, {
         text: '仓库',
-        dataIndex:'pd_whcode'
+        dataIndex:'pd_whcode',
+        width: 150
     }, {
         text: '期初',
         columns: [{
             text: '数量',
             dataIndex:'pwm_beginqty',
             xtype: 'numbercolumn',
-            width:100
+            width:110
         },{
             text: '成本',
             dataIndex:'pwm_beginamount',
             xtype: 'numbercolumn',
-            width:100
+            width:110
         }]
     }, {
         text: '入库合计',
@@ -68,34 +71,38 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
             text: '数量',
             dataIndex:'pwm_nowinqty',
             xtype: 'numbercolumn',
-            width:100
+            width:110
         },{
             text: '成本',
             dataIndex:'pwm_nowinamount',
             xtype: 'numbercolumn',
-            width:100
+            width:110
         }]
     }, {
         text: '出库合计',
         columns: [{
             text: '数量',
             dataIndex:'pwm_nowoutqty',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         },{
             text: '成本',
             dataIndex:'pwm_nowoutamount',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }]
     }, {
         text: '结存',
         columns: [{
             text: '数量',
             dataIndex:'pwm_endqty',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         },{
             text: '成本',
             dataIndex:'pwm_endamount',
-            xtype: 'numbercolumn'
+            xtype: 'numbercolumn',
+            width: 110
         }]
     }]
 });

frontend/saas-web/app/view/stock/report/Prodiodetail.js

@@ -56,19 +56,19 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     }, {
         text: '单号',
         dataIndex: 'pi_inoutno',
-        width: 200
+        width: 150
     }, {
         text: '单据类型',
         dataIndex: 'pi_class',
-        width: 200
+        width: 110
     }, {
         text: '客户/供应商编号',
         dataIndex: 'bizcode',
-        width: 200
+        width: 150
     }, {
         text: '客户/供应商名称',
         dataIndex: 'bizname',
-        width: 200
+        width: 250
     }, {
         text: '日期',
         dataIndex: 'pi_date',
@@ -76,24 +76,27 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     }, {
         text: '序号',
         dataIndex: 'pd_pdno',
-        xtype: 'numbercolumn'
+        xtype: 'numbercolumn',
+        width: 80
     }, {
         text: '物料类型',
         dataIndex: 'pr_kind'
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode',
-        width: 200
+        width: 150
     }, {
         text: '物料名称',
         dataIndex: 'pr_detail',
         width: 200
     }, {
         text: '物料规格',
-        dataIndex: 'pr_spec'
+        dataIndex: 'pr_spec',
+        width: 150
     }, {
         text: '单位',
-        dataIndex: 'pd_unit'
+        dataIndex: 'pd_unit',
+        width: 80
     }, {
         text: '入库数量',
         xtype: 'numbercolumn',
@@ -126,7 +129,7 @@ Ext.define('saas.view.stock.report.Prodiodetail', {
     },{
         text: '订单号',
         dataIndex: 'pd_ordercode',
-        width: 200
+        width: 150
     },{
         text: '备注',
         dataIndex: 'pd_remark',

frontend/saas-web/app/view/stock/stockamount/DataList.js

@@ -20,7 +20,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         xtype: 'textfield',
         emptyText : '物料编号'
     },{
-        width: 150,
+        width: 200,
         name: 'pr_detail',
         xtype: 'textfield',
         emptyText : '物料名称'
@@ -30,7 +30,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         xtype: 'textfield',
         emptyText : '仓库编号'
     },{
-        width: 150,
+        width: 200,
         name: 'wh_name',
         xtype: 'textfield',
         emptyText : '仓库名称'
@@ -64,13 +64,13 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         xtype : "", 
     },{
         text : "物料名称", 
-        width : 150.0, 
+        width : 200.0, 
         dataIndex : "rc_prodDetail", 
     }, 
     {
         text : "物料规格", 
         dataIndex : "rc_prodSpec", 
-        width : 120.0, 
+        width : 150.0, 
     }, 
     {
         text : "单位", 
@@ -80,19 +80,19 @@ Ext.define('saas.view.stock.stockamount.DataList', {
     {
         text : "仓库编号", 
         dataIndex : "rc_whCode", 
-        width : 100, 
+        width : 150, 
     }, 
     {
         text : "仓库名称", 
         dataIndex : "rc_whName", 
-        width : 120.0, 
+        width : 200.0, 
     }, 
     {
         text : "数量",
         xtype: 'numbercolumn',
         align: 'end',
         dataIndex : "rc_number", 
-        width : 120.0, 
+        width : 110.0, 
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length>3?3:arr[1].length)).fill('0');
@@ -105,7 +105,7 @@ Ext.define('saas.view.stock.stockamount.DataList', {
         xtype: 'numbercolumn',
         align: 'end',
         dataIndex : "rc_price", 
-        width : 120.0, 
+        width : 110.0, 
         renderer : function(v) {
             var arr = (v + '.').split('.');
             var xr = (new Array(arr[1].length>8?8:arr[1].length)).fill('0');

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.sys.account.DataList', {
         xtype: 'textfield',
         emptyText : '账户名称'
     },{
-        width: 150,
+        width: 110,
         name: 'mobile',
         xtype: 'textfield',
         emptyText : '电话'
@@ -63,13 +63,13 @@ Ext.define('saas.view.sys.account.DataList', {
     {
         text : '真实姓名', 
         dataIndex : 'realname', 
-        width : 120.0, 
+        width : 110.0, 
         xtype : '', 
     }, 
     {
         text : '联系电话', 
         dataIndex : 'mobile', 
-        width : 220.0,
+        width : 110.0,
     },{
         text : '联系邮箱', 
         dataIndex : 'email', 
@@ -79,13 +79,12 @@ Ext.define('saas.view.sys.account.DataList', {
         text : '关联角色id', 
         hidden:true,
         dataIndex : 'roleIds', 
-        width : 120.0, 
+        width : 110.0, 
         xtype : '', 
     },{
         text : '关联角色', 
         dataIndex : 'roleNames', 
-        flex:1,
-        xtype : '', 
+        width : 110.0
     }],
 
     dbSearchFields: [],

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

@@ -81,10 +81,10 @@ Ext.define('saas.view.sys.finish.DataList', {
         text:'结账期间',
         dataIndex : "ml_keyvalue",
         xtype:'',
-        width : 160.0, 
+        width : 110.0, 
     },{
         text : "操作日期", 
-        width : 200.0, 
+        width : 150.0, 
         format:'Y-m-d H:i:s',
         dataIndex : "createTime", 
         xtype:'datecolumn',
@@ -92,17 +92,17 @@ Ext.define('saas.view.sys.finish.DataList', {
     {
         text : "操作类型", 
         dataIndex : "ml_content", 
-        width : 220.0, 
+        width : 110.0, 
     },
     {
         text : "操作员", 
         dataIndex : "ml_man", 
-        width : 170.0, 
+        width : 110.0, 
     },
     {
         text : "结果", 
         dataIndex : "ml_result", 
-        width : 220.0, 
+        width : 250.0, 
     }],
 
     condition:'',

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

@@ -14,12 +14,12 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     deleteUrl:'/api/commons/number/delete/',
 
     tbar: [{
-        width: 150,
+        width: 110,
         name: 'mn_name',
         xtype: 'textfield',
         emptyText : '单据名称'
     },{
-        width: 150,
+        width: 110,
         name: 'mn_leadcode',
         xtype: 'textfield',
         emptyText : '单据前缀'
@@ -85,13 +85,13 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     {
         text : '单据前缀', 
         dataIndex : 'mn_leadcode', 
-        width : 120.0, 
+        width : 110.0, 
         xtype : '', 
     }, 
     {
         text : '单据规则', 
         dataIndex : 'mn_rule', 
-        width : 220.0,
+        width : 150.0,
         renderer: function(v) {
             var o = {
                 yyyymmdd: '年月日',
@@ -103,8 +103,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     },{
         text : '流水长度', 
         dataIndex : 'mn_number', 
-        width : 120.0, 
-        xtype : '', 
+        width : 110.0 
     }],
 
     dbSearchFields: [],

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

@@ -8,7 +8,7 @@ Ext.define('saas.view.sys.messagelog.DataList', {
     dataUrl:'/api/commons/messagelog/list',
 
     tbar: [{
-        width: 150,
+        width: 110,
         name: 'ml_name',
         xtype: 'textfield',
         emptyText : '单据类型'
@@ -18,7 +18,7 @@ Ext.define('saas.view.sys.messagelog.DataList', {
         xtype: 'textfield',
         emptyText : '单据编号'
     },{
-        width: 150,
+        width: 110,
         name: 'ml_man',
         xtype: 'textfield',
         emptyText : '操作人员'
@@ -54,33 +54,33 @@ Ext.define('saas.view.sys.messagelog.DataList', {
     },{
         text:'单据类型',
         dataIndex : "ml_name",
-        width : 120.0, 
+        width : 110.0, 
     },{
         text : "单据编号", 
-        width : 200.0, 
+        width : 150.0, 
         dataIndex : "ml_code", 
     }, 
     {
         text : "操作", 
         dataIndex : "ml_content", 
-        width : 220.0, 
+        width : 200.0, 
     }, 
     {
         xtype:'datecolumn',
         format:'Y-m-d H:i:s',
         text : "操作时间", 
         dataIndex : "createTime", 
-        width : 200.0, 
+        width : 150.0, 
     },
     {
         text : "结果", 
         dataIndex : "ml_result", 
-        width : 120.0, 
+        width : 150.0, 
     }, 
     {
         text : "操作人员", 
         dataIndex : "ml_man", 
-        width : 200, 
+        width : 110, 
     }],
 
     condition:'',