Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/pm/models/project_property_template.js

@@ -21,7 +21,7 @@ const displaySetting = {
 
 const tenderSetting = {
     gljPriceTenderCoe: 1, //工料机单价调整系数
-    calcPriceOption: 'coeBase'//根据调整系数计算报价
+    calcPriceOption: 'priceBase_RCJ'//根据调整系数计算报价
 };
 
 const calcOptions = {

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -37,14 +37,14 @@
         <div class="content" style="margin-left: 0px;">
             <div class="container-fluid">
                 <div class="row" id="dataRow">
-                    <div id="leftContent" style="width: 25%;">
+                    <div id="leftContent" style="width: 28%;">
                         <div class="print-list" >
                             <div class="form-list" style="overflow: hidden">
                                 <div id="gljClassSpread" style="height: 100%; width: 100%;"></div>
                             </div>
                         </div>
                     </div>
-                    <div id="midContent" style="width: 50%; overflow: hidden">
+                    <div id="midContent" style="width: 47%; overflow: hidden">
                         <div id="leftResize" style="width: 1%; height: 100%; resize:horizontal; cursor: w-resize; float: left; background: #F1F1F1"></div>
                         <div id="GLJListSheet" class="p-0" style="height: 100%; width: 99%; float: left">
                         </div>

web/building_saas/complementary_glj_lib/js/glj.js

@@ -644,8 +644,8 @@ let repositoryGljObj = {
     },
     //组成物表能编辑则显示，否则隐藏该工作表
     spreadControl: function (showComponent) {
-        let leftWidth = getLocalCache('compleGLjleftContentWidth') || '50%',
-            midWidth = getLocalCache('compleGLjmidContentWidth') || '25%',
+        let leftWidth = getLocalCache('compleGLjleftContentWidth') || '28%',
+            midWidth = getLocalCache('compleGLjmidContentWidth') || '47%',
             rightWidth = getLocalCache('compleGLjrightContentWidth') || '25%';
         [leftWidth, midWidth, rightWidth] = [leftWidth, midWidth, rightWidth].map((v) => parseFloat(v.replace('%', '')));
         let curMidWidth = parseFloat($('#midContent')[0].style.width.replace('%', '')),

web/building_saas/main/html/tender_price.html

@@ -3,8 +3,8 @@
     <div class="btn-toolbar py-1">
         <div class="input-group input-group-sm mr-2">
             <select class="form-control form-control-sm" style="width: auto; font-size: .875rem" id="calcPriceOption">
-                <option value="coeBase">按调价系数计算</option>
                 <option value="priceBase_RCJ" >按目标价调整人材机消耗</option>
+                <option value="coeBase">按调价系数计算</option>
                 <option value="priceBase_ZM" >按目标价调整子目工程量</option>
             </select>
         </div>

web/building_saas/main/js/models/calc_program.js

@@ -375,6 +375,8 @@ let calcTools = {
                 for (let md of mds) {
                     if (md.type == detailType) {
                         let q = md["consumption"] ? md["consumption"] : 0;
+                         // 下面这句从养护来，建筑暂时用不上，以后可能会用上
+                        // let p = isTender ? (md["tenderPrice"] ? md["tenderPrice"] : 0) : (md["marketPrice"] ? md["marketPrice"] : 0);
                         let p = md["basePrice"] ? md["basePrice"] : 0;
                         mdSum = mdSum + (q * p).toDecimal(decimalObj.glj.unitPriceHasMix);
                         mdSum = (mdSum).toDecimal(decimalObj.glj.unitPriceHasMix);
@@ -1043,7 +1045,7 @@ let calcTools = {
     
     getTenderCalcType: function () {
         let tenderSetting = projectObj.project.property.tenderSetting;
-        let ct = tenderSetting && tenderSetting.calcPriceOption? tenderSetting.calcPriceOption : "coeBase";
+        let ct = tenderSetting && tenderSetting.calcPriceOption? tenderSetting.calcPriceOption : "priceBase_RCJ";
         if (ct == 'priceBase') ct = 'priceBase_RCJ';   // 兼容旧项目
         return ct;
     }