فهرست منبع

按实际情况增加项目人材机的数量过滤(>0的人材机才需要显示) + code sync

TonyKang 7 سال پیش
والد
کامیت
bf119b432f
2فایلهای تغییر یافته به همراه4 افزوده شده و 0 حذف شده
  1. 3 0
      modules/reports/util/rpt_construct_data_util.js
  2. 1 0
      web/maintain/report/js/rpt_tpl_pre_handle.js

+ 3 - 0
modules/reports/util/rpt_construct_data_util.js

@@ -559,6 +559,9 @@ function filterData(sourceData, handleCfg, prjData) {
                 }
             }
             startIdx++;
+            if (!compRst) {
+                break; //由不符合条件的数据则退出(这里的判断条件是and关系)
+            }
         }
         return compRst;
     };

+ 1 - 0
web/maintain/report/js/rpt_tpl_pre_handle.js

@@ -84,6 +84,7 @@ const exposed_prj_glj_properties = [
     ,{Name: "项目人材机_所属工程ID", Title: "", Key: "projectID", Order: "ascend"}
     ,{Name: "项目人材机_代码", Title: "", Key: "code", Order: "ascend"}
     ,{Name: "项目人材机_类型", Title: "", Key: "type", Order: "ascend", individualType: fixed_glj_types}
+    ,{Name: "项目人材机_数量", Title: "", Key: "quantity", Order: "ascend"}
     ,{Name: "项目人材机_是否暂估", Title: "", Key: "is_evaluate", Order: "ascend", isBoolean: true, booleanOptions: [1,0]}
     ,{Name: "项目人材机_供货方式", Title: "", Key: "supply", Order: "ascend", individualType: fixed_supply_types}
     ,{Name: "项目人材机_三材类别", Title: "", Key: "materialType", Order: "ascend", individualType: fixed_material_types}