fix: 新增结算项目汇总表数据取值

web/maintain/report/html/rpt_tpl_dtl_info.html

@@ -215,6 +215,7 @@
                     <option value="project_compare">步骤对比</option>
                     <option value="costUnitCompare">造价审核记录对比</option>
                     <option value="settlement_audit_compare">结算审核对比合同格式</option>
+                    <option value="settlement_withhold_compare">结算审核对比代收代扣</option>
                 </select>
 
             </div>
@@ -243,7 +244,7 @@
                 </select>
             </div>
         </div>
-        <div>
+        <div class="row p-3">
             <div class="input-group input-group-sm col-3">
                 <div class="input-group-addon">汇总表汇总忽略名称空格</div>
                 <select class="form-control input-sm" id="element_flags_ignoreSpaces_select"
@@ -252,6 +253,15 @@
                     <option value="true">是</option>
                     <option value="false">否</option>
                 </select>
+                </div>
+            <!-- 新增一个新属性，结算项目专用，如果为结算项目，可以选择取结算列的值还是合同列的值 -->
+            <div class="input-group input-group-sm col-3">
+                <div class="input-group-addon">汇总表数据取值（结算用）</div>
+                <select class="form-control input-sm" id="element_flags_feeType_select"
+                    onchange="zTreeOprObj.onChangeFlag('feeType', this)">
+                    <option value="NA">N/A</option>
+                    <option value="settlement">结算列</option>
+                </select>
             </div>
         </div>
         <p>

web/maintain/report/js/rpt_tpl_main.js

@@ -1406,6 +1406,8 @@ let zTreeOprObj = {
                   $("#element_constructSumFlags_audit")[0].selectedIndex = 2;
                 } else if (val === "settlement_audit_compare") {
                   $("#element_constructSumFlags_audit")[0].selectedIndex = 3;
+                } else if (val === "settlement_withhold_compare") {
+                  $("#element_constructSumFlags_audit")[0].selectedIndex = 4;
                 } else {
                   $("#element_constructSumFlags_audit")[0].selectedIndex = 0;
                 }
@@ -1446,6 +1448,20 @@ let zTreeOprObj = {
               } else {
                 $("#element_flags_ignoreSpaces_select")[0].selectedIndex = 0;
               }
+              if (me.currentNode.flags.hasOwnProperty("feeType")) {
+                let val = me.currentNode.flags["feeType"];
+                if (val === "contract") {
+                  $("#element_flags_feeType_select")[0].selectedIndex = 1;
+                } else if (val === "change") {
+                  $("#element_flags_feeType_select")[0].selectedIndex = 2;
+                } else if (val === "settlement") {
+                  $("#element_flags_feeType_select")[0].selectedIndex = 3;
+                } else {
+                  $("#element_flags_feeType_select")[0].selectedIndex = 0;
+                }
+              } else {
+                $("#element_flags_feeType_select")[0].selectedIndex = 0;
+              }
             } else {
               $("#element_flags_select")[0].selectedIndex = 0;
               $("#element_prjFlags_select")[0].selectedIndex = 0;