Przeglądaj źródła

为概算表增加一些标记

TonyKang 4 lat temu
rodzic
commit
8b5b60d28d

Plik diff jest za duży
+ 1446 - 1145
package-lock.json


+ 3 - 3
package.json

@@ -15,7 +15,7 @@
     "express-partials": "^0.3.0",
     "express-session": "^1.15.1",
     "glob": "~4.0.5",
-    "lodash": "^4.17.10",
+    "lodash": "^4.17.21",
     "moment": "^2.18.1",
     "mongoose": "~4.13.12",
     "request": "^2.79.0",
@@ -23,12 +23,12 @@
     "uuid": "^3.1.0"
   },
   "dependencies": {
-    "axios": "^0.19.2",
+    "axios": "^0.21.1",
     "babel-core": "^6.26.0",
     "bluebird": "^3.5.0",
     "cheerio": "^1.0.0-rc.3",
     "jszip": "^3.1.3",
-    "log4js": "~2.3.3",
+    "log4js": "^2.6.1",
     "lz-string": "^1.4.4",
     "moment-timezone": "^0.5.27",
     "multiparty": "^4.1.3",

+ 13 - 2
web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -54,12 +54,23 @@
                     <div class="input-group-addon">建设项目汇总类型</div>
                     <select class="form-control input-sm" id="element_constructSumFlags_select" onchange="zTreeOprObj.onChangeFlag('constructSumType', this)"><option value ="NA">N/A</option><option value ="constructSum">建设项目汇总</option></select>
                 </div>
-                <div class="input-group col-3">
+                <div class="input-group col-2">
                     <div class="input-group-addon">审核对比类型</div>
                     <select class="form-control input-sm" id="element_constructSumFlags_audit" onchange="zTreeOprObj.onChangeFlag('auditType', this)"><option value ="NA">N/A</option><option value ="audit_compare">审核对比</option></select>
                 </div>
-
+                <div class="input-group col-2">
+                    <div class="input-group-addon">概算类型</div>
+                    <select class="form-control input-sm" id="element_Flags_budgetType" onchange="zTreeOprObj.onChangeFlag('budgetType', this)"><option value ="NA">N/A</option><option value ="1">建设安装工程</option><option value ="2">轨道工程</option></select>
+                </div>
+                <div class="input-group col-2">
+                    <div class="input-group-addon">概算汇总类型</div>
+                    <select class="form-control input-sm" id="element_Flags_budgetSummaryType" onchange="zTreeOprObj.onChangeFlag('budgetSumType', this)"><option value ="NA">N/A</option><option value ="budget_construct">建设项目级别</option><option value ="budget_single">单项工程级别</option></select>
+                </div>
+            </div>
+            <!--
+            <div class="row">
             </div>
+            -->
         </div>
     </div>
 </div>

+ 26 - 0
web/maintain/report/js/rpt_tpl_main.js

@@ -979,10 +979,36 @@ let zTreeOprObj = {
                             } else {
                                 $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
                             }
+                            if (me.currentNode.flags.hasOwnProperty('budgetType')) {
+                                let val = me.currentNode.flags['budgetType'];
+                                if (val === '1') {
+                                    $("#element_Flags_budgetType")[0].selectedIndex = 1;
+                                } else if (val === '2') {
+                                    $("#element_Flags_budgetType")[0].selectedIndex = 2;
+                                } else {
+                                    $("#element_Flags_budgetType")[0].selectedIndex = 0;
+                                }
+                            } else {
+                                $("#element_Flags_budgetType")[0].selectedIndex = 0;
+                            }
+                            if (me.currentNode.flags.hasOwnProperty('budgetSumType')) {
+                                let val = me.currentNode.flags['budgetSumType'];
+                                if (val === 'budget_construct') {
+                                    $("#element_Flags_budgetSummaryType")[0].selectedIndex = 1;
+                                } else if (val === 'budget_single') {
+                                    $("#element_Flags_budgetSummaryType")[0].selectedIndex = 2;
+                                } else {
+                                    $("#element_Flags_budgetSummaryType")[0].selectedIndex = 0;
+                                }
+                            } else {
+                                $("#element_Flags_budgetSummaryType")[0].selectedIndex = 0;
+                            }
                         } else {
                             $("#element_flags_select")[0].selectedIndex = 0;
                             $("#element_constructSumFlags_select")[0].selectedIndex = 0;
                             $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
+                            $("#element_Flags_budgetType")[0].selectedIndex = 0;
+                            $("#element_Flags_budgetSummaryType")[0].selectedIndex = 0;
                         }
 
                         if ($("#rpt_tpl_visual_tab")[0].className === "nav-link p-1 active") {