Просмотр исходного кода

增加清单预算工程类型

TonyKang 3 лет назад
Родитель
Сommit
ff2a8ab791

+ 2 - 0
public/common_constants.js

@@ -117,6 +117,7 @@
         FEASIBILITY: 'feasibility', // 可行性估算
         ROUGH: 'rough', // 概算
         BUDGET: 'bill', // 预算
+        BILL_BUDGET: 'bill_budget', // 清单预算
         BOQ: 'ration', // 工程量清单
         ESTIMATION: 'estimation', // 估算
         
@@ -126,6 +127,7 @@
         [ValuationType.FEASIBILITY]: '可行性估算',
         [ValuationType.ROUGH]: '概算',
         [ValuationType.BUDGET]: '预算',
+        [ValuationType.BILL_BUDGET]: '清单预算',
         [ValuationType.BOQ]: '工程量清单',
         [ValuationType.ESTIMATION]: '估算',
     }

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

@@ -361,8 +361,8 @@
                                 </div>
                             <% } else if (compilationName.includes('四川养护(2013)')) { %>
                                 <div class="custom-control custom-radio custom-control-inline">
-                                    <input type="radio" value="ration" id="radioRation" name="valuation_type" class="custom-control-input">
-                                    <label class="custom-control-label" checked for="radioRation">工程量清单</label>
+                                    <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 {%>
                                 <div class="custom-control custom-radio custom-control-inline">

+ 6 - 2
web/building_saas/pm/js/pm_newMain.js

@@ -36,7 +36,7 @@ let taxTypeMap = {
 let regions = [];
 
 const { 
-    ValuationType: { SUGGESTION, FEASIBILITY, ROUGH, BUDGET, BOQ, ESTIMATION },
+    ValuationType: { SUGGESTION, FEASIBILITY, ROUGH, BUDGET, BILL_BUDGET, BOQ, ESTIMATION },
     ValuationText,
     BOQType: { BID_INVITATION, BID_SUBMISSION },
 } = window.commonConstants;
@@ -1984,6 +1984,8 @@ $(document).ready(function() {
             //ESTIMATION
             if (compilationData.name === '内蒙古高速公路日常养护估算(2021)') {
                 changeValuationType(ESTIMATION);
+            } else if (compilationData.name === '四川养护(2013)') {
+                changeValuationType(BILL_BUDGET);
             } else {
                 changeValuationType(BUDGET);
             }
@@ -2597,7 +2599,7 @@ function initProjectOptSet($target) {
                                 ` : ``
                             }
                             ${ (COMPILATION_NAME.includes('四川养护(2013)')) ? `
-                                ${_getOptionDivDomStr(BOQ, "valuation-type", "工程量清单", "type-boq", true)}
+                                ${_getOptionDivDomStr(BILL_BUDGET, "valuation-type", "清单预算", "type-bill_budget", true)}
                                 ` : ``
                             }
                             ${(COMPILATION_NAME !== '内蒙古高速公路日常养护估算(2021)' && COMPILATION_NAME !== '四川养护(2013)') ? `
@@ -2899,6 +2901,8 @@ function getValuationData(type) {
         valuationData = JSON.parse(roughValuation);
     } else if (type === BUDGET) {
         valuationData = JSON.parse(billValuation);
+    } else if (type === BILL_BUDGET) {
+        valuationData = JSON.parse(rationValuation);
     } else if (type === ESTIMATION) {
         valuationData = JSON.parse(estimationData);
     } else {