fix: 报表模板预处理删除 绑定含量指标定制表模板，改成在flag里控制

public/web/rpt_value_define.js

@@ -80,8 +80,6 @@ const JV = {
   PROP_HANDLE_TYPE_LAND_COMPS: "清单土地计算合并",
   PROP_HANDLE_TYPE_COST_TREE_BU_GLJ: "造价书插入补项工料机",
   PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET: "筛选清单预算项目节",
-  PROP_HANDLE_TYPE_BIND_AID_REPORT: "绑定含量指标定制表模板",
-  PROP_HANDLE_TYPE_BIND_AID_REPORT_ID: "含量指标定制表模板ID",
 
   PROP_ADJUST_COLLECTION: "数据调整集",
   PROP_ADJUST_ACTION: "action",

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -199,6 +199,13 @@
                     <option value="mainScaleContrastThree">各阶段主要工程规模对比(3个)</option>
                 </select>
             </div>
+            <div class="input-group col-3">
+                <div class="input-group-addon">定制表格</div>
+                <select class="form-control input-sm" id="select_aid_report_data_select"
+                    onchange="zTreeOprObj.onChangeFlag('aidReportID', this)">
+                   
+                </select>
+            </div>
         </div>
 
     </div>

web/maintain/report/html/rpt_tpl_dtl_pre_hdl.html

@@ -35,8 +35,6 @@
             <%include ./rpt_tpl_dtl_pre_hdl_addDummy.html %>
             <!--工程量清单数据处理-->
             <%include ./rpt_tpl_dtl_pre_hdl_change_quantities_bills.html %>
-            <!--含量指标报表，定制表辅表-->
-            <%include ./rpt_tpl_dtl_pre_hdl_aidReportList.html %>
         </div>
     </div>
 </div>

web/maintain/report/html/rpt_tpl_dtl_pre_hdl_aidReportList.html

@@ -1,11 +0,0 @@
-<div id="div_aid_report_sort_bar">
-    <div class="form-group row" id="div_aid_report_list_bar">
-        <div class="input-group col-5">
-            <div class="input-group-addon">定制表格</div>
-            <select class="form-control input-sm" id="select_aid_report_data_select"
-                onchange="preHandleAidReportListObj.onAidReportIDChange(this)">
-               
-            </select>
-        </div>
-    </div>
-</div>

web/maintain/report/js/rpt_tpl_main.js

@@ -1340,6 +1340,7 @@ let zTreeOprObj = {
               $("#element_existLevel_select")[0].selectedIndex = 0;
               $("#element_Flags_tplType")[0].selectedIndex = 0;
               $("#element_costIndexFlags_audit")[0].selectedIndex = 0;
+              $("#select_aid_report_data_select")[0].selectedIndex = 0;
             }
 
             if (
@@ -1362,6 +1363,9 @@ let zTreeOprObj = {
           true,
           function (result) {
             $("#select_aid_report_data_select").empty();
+            $("#select_aid_report_data_select").append(
+              `<option value=""> </option>`
+            );
             result.forEach((i) => {
               if (i.aidReportID) {
                 $("#select_aid_report_data_select").append(
@@ -1369,6 +1373,10 @@ let zTreeOprObj = {
                 );
               }
             });
+            if (me.currentNode.flags.hasOwnProperty("aidReportID")) {
+              let val = me.currentNode.flags["aidReportID"];
+              $("#select_aid_report_data_select").val(val);
+            }
           },
           null,
           null

web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -668,9 +668,6 @@ let preHandleObj = {
         break;
       case JV.PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET:
         break;
-      case JV.PROP_HANDLE_TYPE_BIND_AID_REPORT:
-        item[JV.PROP_HANDLE_TYPE_BIND_AID_REPORT_ID] = "";
-        break;
       default:
         item[JV.PROP_HANDLE_TYPE] = JV.PROP_HANDLE_TYPE_SORT;
         item[JV.PROP_SORT_TYPE] = "normal";
@@ -698,10 +695,6 @@ let preHandleObj = {
       src[JV.PROP_HANDLE_TYPE] === JV.PROP_HANDLE_TYPE_CHANGE_QUANTITIES_BILLS
     ) {
       preHandleQuantitiesBillsSortObj.copyNode(src, dest);
-    } else if (
-      src[JV.PROP_HANDLE_TYPE] === JV.PROP_HANDLE_TYPE_BIND_AID_REPORT
-    ) {
-      preHandleAidReportListObj.copyNode(src, dest);
     }
   },
   private_set_title: function (node) {
@@ -751,8 +744,6 @@ let preHandleObj = {
           preHandleAddDummyObj.refresh_node();
         } else if (typeNode[JV.PROP_NAME] === "转化工程量清单") {
           preHandleQuantitiesBillsSortObj.refresh_node();
-        } else if (typeNode[JV.PROP_NAME] === "绑定含量指标定制表模板") {
-          preHandleAidReportListObj.refresh_node();
         }
       }
     }
@@ -770,7 +761,6 @@ let preHandleObj = {
     $("#div_sort_tree")[0].style.display = "none";
     $("#div_sort_self_define")[0].style.display = "none";
     $("#div_quantities_bills_sort_bar")[0].style.display = "none";
-    $("#div_aid_report_list_bar")[0].style.display = "none";
   },
   onPreHandleClick: function (event, treeId, treeNode) {
     //点击预处理环节 节点
@@ -952,9 +942,6 @@ let preHandleObj = {
           case JV.PROP_HANDLE_TYPE_FLITE_XMJ_IS_BILL_BUDGET:
             rst.push(preHandleBillDataMoveObj.extractTabFields(handleObj));
             break;
-          case JV.PROP_HANDLE_TYPE_BIND_AID_REPORT:
-            rst.push(preHandleAidReportListObj.extractTabFields(handleObj));
-            break;
           default:
             break;
         }
@@ -1908,30 +1895,3 @@ let preHandleFXGLJObj = {
     return rst;
   },
 };
-let preHandleAidReportListObj = {
-  copyNode: function (src, dest) {
-    dest[JV.PROP_HANDLE_TYPE_BIND_AID_REPORT_ID] = src.aidReportID;
-  },
-  refresh_node: function () {
-    // 好像是隐藏不必要的dom
-    $("#div_pre_handle_data").hide();
-    $("#div_aid_report_list_bar").show();
-    $("#select_aid_report_data_select")[0].value =
-      preHandleObj.currentNode[JV.PROP_HANDLE_TYPE_BIND_AID_REPORT_ID];
-  },
-  extractTabFields: function (handleObj) {
-    let me = preHandleAidReportListObj,
-      rst = {};
-    me.copyNode(handleObj, rst);
-    rst = {
-      预处理类型: "绑定含量指标定制表模板",
-      aidReportID: handleObj[JV.PROP_HANDLE_TYPE_BIND_AID_REPORT_ID],
-    };
-    return rst;
-  },
-  onAidReportIDChange: function (dom) {
-    // 绑定含量指标定制表模板
-    let me = preHandleObj;
-    me.currentNode[JV.PROP_HANDLE_TYPE_BIND_AID_REPORT_ID] = dom.value;
-  },
-};