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

modules/common/const/bills_fixed.js

@@ -246,6 +246,8 @@ if (process.env.NODE_ENV.indexOf('hw') !== -1) {
         RESEARCH_EXPERIMENT: 207,
         // 压覆重要矿床评估费
         IMPORTANT_ORE_DEPOSITS: 208,
+        // 招标文件及标底编制费
+        INVITATION_BID_DOC_COMPILATION: 209
 
     };
 }
@@ -329,6 +331,7 @@ const fixedFlagList = [
     { name: '建设项目其他费设置', value: fixedFlag.CONSTRUCTION_OTHER_SETTING },
     { name: '研究试验费', value: fixedFlag.RESEARCH_EXPERIMENT },
     { name: '压覆重要矿床评估费', value: fixedFlag.IMPORTANT_ORE_DEPOSITS },
+    { name: '招标文件及标底编制费', value: fixedFlag.INVITATION_BID_DOC_COMPILATION },
 ];
 
 export { fixedFlag as default, fixedFlagList as List };

public/web/rpt_value_define.js

@@ -225,6 +225,8 @@ const JV = {
 
   RUN_TYPE_BEFORE_GROUP_TEXT_OUT: "before_group_text_output",
 
+  RUN_TYPE_RESET_CROSS_COLUMNS: 'reset_cross_columns',
+
   PAGE_STATUS: [
     "EveryPage",
     "FirstPage",

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -222,6 +222,14 @@
                    
                 </select>
             </div>
+            <div class="input-group col-2">
+                <div class="input-group-addon">报表格式</div>
+                <select class="form-control input-sm" id="report_format_adjustable"
+                    onchange="zTreeOprObj.onChangeFlag('rptFormatAdjust', this)">
+                    <option value="F">不可调</option>
+                    <option value="T">可调</option>
+                </select>
+            </div>
         </div>
         <p>
         <div class="form-group col-md-6">

web/maintain/report/js/rpt_tpl_calculation.js

@@ -44,32 +44,13 @@ let calculationTreeOprObj = {
   },
   buildRunType: function () {
     let et = $("#exprRunType");
-    et.append(
-      "<option value='" + JV.RUN_TYPE_BEFORE_PAGING + "'>默认运行</option>"
-    );
-    et.append(
-      "<option value='" + JV.RUN_TYPE_BEFORE_OUTPUT + "'>每页实时运行</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_BEFORE_ANALYZING +
-        "'>数据分析前运行</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_BEFORE_COMBINE +
-        "'>合并单元格前事件</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_AFTER_COMBINE +
-        "'>合并单元格后事件</option>"
-    );
-    et.append(
-      "<option value='" +
-        JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT +
-        "'>分组text输出前事件</option>"
-    );
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_PAGING}">默认运行</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_OUTPUT}">每页实时运行</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_ANALYZING}">数据分析前运行</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_COMBINE}">合并单元格前事件</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_AFTER_COMBINE}">合并单元格后事件</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT}">分组text输出前事件</option>`);
+    et.append(`<option value="${JV.RUN_TYPE_RESET_CROSS_COLUMNS}">重设交叉表列数</option>`);
   },
   buildTreeData: function (rptTpl) {
     let me = this,
@@ -142,10 +123,10 @@ let calculationTreeOprObj = {
         $("#exprRunType")[0].selectedIndex = 3;
       } else if (treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_AFTER_COMBINE) {
         $("#exprRunType")[0].selectedIndex = 4;
-      } else if (
-        treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT
-      ) {
+      } else if (treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_BEFORE_GROUP_TEXT_OUT) {
         $("#exprRunType")[0].selectedIndex = 5;
+      } else if (treeNode[JV.PROP_RUN_TYPE] === JV.RUN_TYPE_RESET_CROSS_COLUMNS) {
+        $("#exprRunType")[0].selectedIndex = 6;
       } else {
         $("#exprRunType")[0].selectedIndex = 2;
       }

web/maintain/report/js/rpt_tpl_main.js

@@ -1404,6 +1404,17 @@ let zTreeOprObj = {
               } else {
                 $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
               }
+              if (me.currentNode.flags.hasOwnProperty("rptFormatAdjust")) {
+                let rType = me.currentNode.flags["rptFormatAdjust"];
+                if (rType === "T") {
+                  $("#report_format_adjustable")[0].selectedIndex = 1;
+                } else {
+                  $("#report_format_adjustable")[0].selectedIndex = 0;
+                }
+              } else {
+                $("#report_format_adjustable")[0].selectedIndex = 0;
+              }
+
             } else {
               $("#element_flags_select")[0].selectedIndex = 0;
               $("#element_prjFlags_select")[0].selectedIndex = 0;
@@ -1418,6 +1429,7 @@ let zTreeOprObj = {
               $("#element_Flags_tplType")[0].selectedIndex = 0;
               $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
               $("#select_aid_report_data_select")[0].selectedIndex = 0;
+              $("#report_format_adjustable")[0].selectedIndex = 0;
             }
 
             if (