Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

modules/options/models/optionTypes.js

@@ -18,6 +18,12 @@ const optionSetting = {
             stringFont: '15px Arial',
             numFont: '13px Arial'
         },
+        SELECTED: {
+            backColor: '#dddddd',
+            foreColor: 'default',
+            stringFont: 'default',
+            numFont: 'default'
+        },
         DXFY: {
             backColor: 'default',
             foreColor: 'default',

web/building_saas/main/js/views/project_property_indicativeInfo.js

@@ -63,6 +63,10 @@ let indicativeInfoObj = {
         let fuc = function () {
             sheet.setRowCount(datas.length);
             for(let col = 0, cLen = cols.length; col < cLen; col++){
+                //设置小数位数
+                if(cols[col]['dataCode'] === 'price'){
+                    sheet.setFormatter(-1, col, MainTreeCol.getNumberFormatter(decimalObj.bills.totalPrice, true));
+                }
                 sheet.getRange(-1, col, -1, 1, GC.Spread.Sheets.SheetArea.viewport).hAlign(GC.Spread.Sheets.HorizontalAlign[cols[col]['hAlign']]);
                 sheet.getRange(-1, col, -1, 1, GC.Spread.Sheets.SheetArea.viewport).vAlign(GC.Spread.Sheets.VerticalAlign[cols[col]['vAlign']]);
                 for(let row = 0, rLen = datas.length; row < rLen; row++){
@@ -136,9 +140,9 @@ let indicativeInfoObj = {
                         materialDiff = this.fee(node, this.feeType.materialDiff),
                         machineDiff = this.fee(node, this.feeType.machineDiff),
                         rcjDiff = labourDiff + materialDiff + machineDiff;
-                    rst.push({name: '人材机价差', price: parseFloat(rcjDiff).toDecimal(decimalObj.bills.totalPrice), rate: '', perCentiare: ''});
-                    rst.push({name: '企业管理费', price: parseFloat(this.fee(node, this.feeType.manage)).toDecimal(decimalObj.bills.totalPrice), rate: '', perCentiare: ''});
-                    rst.push({name: '利润', price: parseFloat(this.fee(node, this.feeType.profit)).toDecimal(decimalObj.bills.totalPrice), rate: '', perCentiare: ''});
+                    rst.push({name: '       人材机价差', price: parseFloat(rcjDiff).toDecimal(decimalObj.bills.totalPrice), rate: '', perCentiare: ''});
+                    rst.push({name: '       企业管理费', price: parseFloat(this.fee(node, this.feeType.manage)).toDecimal(decimalObj.bills.totalPrice), rate: '', perCentiare: ''});
+                    rst.push({name: '       利润', price: parseFloat(this.fee(node, this.feeType.profit)).toDecimal(decimalObj.bills.totalPrice), rate: '', perCentiare: ''});
                 }
                 else if(this.isCSXM(node)){
                     rst.push(dxfy);

web/building_saas/pm/html/project-management.html

@@ -317,12 +317,12 @@
                     </div>
                     <div>
                         <label>计价方式</label>
-                        <div>
-                            <label class="custom-control custom-radio">
+                        <div class="row">
+                            <label class="custom-control custom-radio" style="margin-left: 20px;">
                                 <input name="valuation_type" id="radioBill" value="bill" type="radio" class="custom-control-input">
                                 <label class="custom-control-label" for="radioBill">清单计价</label>
                             </label>
-                            <label class="custom-control custom-radio">
+                            <label class="custom-control custom-radio" style="margin-left: 5px;">
                                 <input name="valuation_type" id="radioRation" value="ration" type="radio" class="custom-control-input">
                                 <label class="custom-control-label" for="radioRation">定额计价</label>
                             </label>

web/building_saas/pm/js/pm_newMain.js

@@ -1215,16 +1215,18 @@ function init() {
     //init spread and pmTree
     $.bootstrapLoading.start();
     GetAllProjectData(function (datas) {
-       // projTreeObj.getShowData(datas);
-        projTreeObj.tree = pmTree.createNew(projTreeObj.setting, datas);
-        projTreeObj.tree.selected = projTreeObj.tree.items[0];
-        projTreeObj.workBook = projTreeObj.buildSheet(projTreeObj.workBook,'projSpread',projTreeObj.setting);
-        projTreeObj.sumEngineeringCost();
-        projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting.header, projTreeObj.workBook.getActiveSheet());
-        //初始选择
-        let initSel = projTreeObj.workBook.getSheet(0).getSelections()[0] ? projTreeObj.workBook.getSheet(0).getSelections()[0] : {row: 0, rowCount: 1};
-        projTreeObj.initSelection(initSel,null,projTreeObj.workBook.getActiveSheet());
-        $.bootstrapLoading.end();
+        CommonAjax.post('/options/getOptions', [], function (rstData) {
+            projTreeObj.setting.style.selectedColor = rstData.COLOROPTS.SELECTED.backColor;
+            projTreeObj.tree = pmTree.createNew(projTreeObj.setting, datas);
+            projTreeObj.tree.selected = projTreeObj.tree.items[0];
+            projTreeObj.workBook = projTreeObj.buildSheet(projTreeObj.workBook,'projSpread',projTreeObj.setting);
+            projTreeObj.sumEngineeringCost();
+            projTreeObj.showTreeData(projTreeObj.tree.items, projTreeObj.setting.header, projTreeObj.workBook.getActiveSheet());
+            //初始选择
+            let initSel = projTreeObj.workBook.getSheet(0).getSelections()[0] ? projTreeObj.workBook.getSheet(0).getSelections()[0] : {row: 0, rowCount: 1};
+            projTreeObj.initSelection(initSel,null,projTreeObj.workBook.getActiveSheet());
+            $.bootstrapLoading.end();
+        });
     });
     engineering = engineeringList !== null && engineeringList !== undefined ? JSON.parse(engineeringList) : [];
 }