部颁2018计价标准需求重新调整

modules/pm/controllers/pm_controller.js

@@ -375,7 +375,7 @@ module.exports = {
             sessionCompilation.ration_valuation : [];
         rationValuation = await engineeringLibModel.getLib(rationValuation);
 
-        if (sessionCompilation.name === '四川养护(2013)') {
+        if (sessionCompilation.name === '四川养护(2013)' || sessionCompilation.name === '部颁2018计价标准') {
             billValuation = rationValuation;
         }
 

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

@@ -359,18 +359,16 @@
                                     <input type="radio" value="estimation" id="radioEstimation" name="valuation_type" class="custom-control-input">
                                     <label class="custom-control-label" checked for="radioEstimation">估算</label>
                                 </div>
-                            <% } else if (compilationName.includes('四川养护(2013)')) { %>
+                            <% } else if (compilationName.includes('四川养护(2013)') || compilationName.includes('部颁2018计价标准')) { %>
                                 <div class="custom-control custom-radio custom-control-inline">
                                     <input type="radio" value="bill_budget" id="radioRation" name="valuation_type" class="custom-control-input">
                                     <label class="custom-control-label" checked for="radioRation">清单预算</label>
                                 </div>
                             <% } else {%>
-                                <% if (!compilationName.includes('部颁2018计价标准')) { %>
-                                    <div class="custom-control custom-radio custom-control-inline">
-                                        <input type="radio" value="bill" id="radioBill" name="valuation_type" class="custom-control-input">
-                                        <label class="custom-control-label" <%= (compilationName.includes('公路造价')) ? '' : 'checked' %> for="radioBill">预算</label>
-                                    </div>
-                                <% } %>
+                                <div class="custom-control custom-radio custom-control-inline">
+                                    <input type="radio" value="bill" id="radioBill" name="valuation_type" class="custom-control-input">
+                                    <label class="custom-control-label" <%= (compilationName.includes('公路造价')) ? '' : 'checked' %> for="radioBill">预算</label>
+                                </div>
                                 <div class="custom-control custom-radio custom-control-inline" <% if (!compilationName.includes("广东农村养护(2021)")) { %> style="display:none" <% } %>>
                                     <input type="radio" value="ration" id="radioRation" name="valuation_type" class="custom-control-input">
                                     <label class="custom-control-label" for="radioRation">工程量清单</label>

web/building_saas/pm/js/pm_newMain.js

@@ -1985,7 +1985,7 @@ $(document).ready(function() {
             //ESTIMATION
             if (compilationData.name === '内蒙古高速公路日常养护估算(2021)') {
                 changeValuationType(ESTIMATION);
-            } else if (compilationData.name === '四川养护(2013)') {
+            } else if (compilationData.name === '四川养护(2013)' || compilationData.name === '部颁2018计价标准') {
                 changeValuationType(BILL_BUDGET);
             } else {
                 changeValuationType(BUDGET);
@@ -2599,11 +2599,11 @@ function initProjectOptSet($target) {
                                 ${_getOptionDivDomStr(ESTIMATION, "valuation-type", "估算", "type-suggestion", true)}
                                 ` : ``
                             }
-                            ${ (COMPILATION_NAME.includes('四川养护(2013)')) ? `
+                            ${ (COMPILATION_NAME.includes('四川养护(2013)') || COMPILATION_NAME.includes('部颁2018计价标准')) ? `
                                 ${_getOptionDivDomStr(BILL_BUDGET, "valuation-type", "清单预算", "type-bill_budget", true)}
                                 ` : ``
                             }
-                            ${(COMPILATION_NAME !== '内蒙古高速公路日常养护估算(2021)' && COMPILATION_NAME !== '四川养护(2013)') ? `
+                            ${(COMPILATION_NAME !== '内蒙古高速公路日常养护估算(2021)' && COMPILATION_NAME !== '四川养护(2013)' && COMPILATION_NAME !== '部颁2018计价标准') ? `
                                 ${ !COMPILATION_NAME.includes('部颁2018计价标准') ? _getOptionDivDomStr(BUDGET, "valuation-type", "预算", "type-budget", !COMPILATION_NAME.includes('公路造价')) : '' }
                                 ${_getOptionDivDomStr(BOQ, "valuation-type", "工程量清单", "type-boq", COMPILATION_NAME.includes('部颁2018计价标准'))}
                                 ` : ``