bug fixed

web/building_saas/glj/js/common_spread.js

@@ -29,11 +29,12 @@ function CommonSpreadJs (header) {
 CommonSpreadJs.prototype.init = function(target) {
 
     let setting = {
-        header: []
+        header: [],
+        view:{rowHeaderWidth:35}
     };
     this.columnInfo = [];
     for(let tmp of this.header) {
-        let width = tmp.field === 'name' ? 200 : 120;
+        let width = tmp.width==undefined ? 120 : tmp.width;
         setting.header.push({headerName: tmp.name, headerWidth: width});
         this.columnInfo.push({name: tmp.field, displayName: tmp.name, visible: tmp.visible, cellType: tmp.cellType, size: width});
     }

web/building_saas/glj/js/project_glj_spread.js

@@ -40,34 +40,36 @@ ProjectGLJSpread.prototype.init = function () {
     selectBox.items(supplySelect);
     selectBox.editorValueType(GC.Spread.Sheets.CellTypes.EditorValueType.text);
     let header = [
-        {name: '编码', field: 'code', visible: true},
-        {name: '名称', field: 'name', visible: true},
-        {name: '规格型号', field: 'specs', visible: true},
-        {name: '单位', field: 'unit', visible: true},
-        {name: '类型', field: 'unit_price.short_name', visible: true},
+        {name: '编码', field: 'code', visible: true,width:80},
+        {name: '名称', field: 'name', visible: true,width:100},
+        {name: '规格型号', field: 'specs', visible: true,width:120},
+        {name: '单位', field: 'unit', visible: true,width:45},
+        {name: '类型', field: 'unit_price.short_name', visible: true,width:45},
         {name: 'ID', field: 'id', visible: false},
         {name: '类型', field: 'unit_price.type', visible: false},
-        {name: '总消耗量', field: 'quantity', visible: true},
-        {name: '基价单价', field: "unit_price.base_price", visible: true},
-        {name: '调整基价', field: 'adjust_price', visible: true},
-        {name: '市场单价', field: "unit_price.market_price", visible: true, validator: 'number'},
+        {name: '总消耗量', field: 'quantity', visible: true,width:100},
+        {name: '基价单价', field: "unit_price.base_price", visible: true,width:70},
+        {name: '调整基价', field: 'adjust_price', visible: true,width:70},
+        {name: '市场单价', field: "unit_price.market_price", visible: true, validator: 'number',width:70},
         {
             name: '是否暂估',
             field: 'is_evaluate',
             visible: true,
             cellType: new GC.Spread.Sheets.CellTypes.CheckBox(),
             validator: 'boolean'
+            ,width:40
         },
-        {name: '供货方式', field: 'supply', visible: true, cellType: selectBox},
-        {name: '甲供数量', field: 'supply_quantity', visible: true},
-        {name: '交货方式', field: 'delivery', visible: true},
-        {name: '送达地点', field: 'delivery_address', visible: true},
+        {name: '供货方式', field: 'supply', visible: true, cellType: selectBox,width:80},
+        {name: '甲供数量', field: 'supply_quantity', visible: true,width:100},
+        {name: '交货方式', field: 'delivery', visible: true,width:90},
+        {name: '送达地点', field: 'delivery_address', visible: true,width:100},
         {
             name: '不调价',
             field: 'is_adjust_price',
             visible: true,
             cellType: new GC.Spread.Sheets.CellTypes.CheckBox(),
-            validator: 'boolean'
+            validator: 'boolean',
+            width:40
         },
         {name: 'UID', field: 'unit_price.id', visible: false},
         {name: '工料机ID', field: 'glj_id', visible: false},

web/building_saas/main/js/views/fee_rate_view.js

@@ -252,7 +252,8 @@ var feeRateObject={
         FeeRateEditCellType.prototype = new ns.CellTypes.Text();
         FeeRateEditCellType.prototype.paint = function (ctx, value, x, y, w, h, style, options) {
             if(value!=null){
-                ctx.fillText(value,x+3+ctx.measureText(value).width,y+h-3);
+               // ctx.fillText(value,x+3+ctx.measureText(value).width,y+h-3);
+                ctx.fillText(value,x+w,y+h-3);
             }
             if(feeRateObject.editingCell){
                 if(feeRateObject.editingCell.row==options.row&&feeRateObject.editingCell.col==options.col){