信息价相关

modules/main/facade/info_price_facade.js

@@ -50,13 +50,20 @@ async function getOptions(data,compilation){//data 是预留对象，暂时不
 async function getDataByCondition(data,compilation){
   let result = {};
   data.condition["compilationID"] = compilation._id;
+  //特殊处理重庆的，地区选择非“通用”时，搜索范围应是当前选择的地区，加上“通用”中的信息价。
+  if (data.condition.commonInfoPriceID) { 
+    let idArray = [data.condition.areaID,data.condition.commonInfoPriceID];
+    data.condition.areaID = {$in: idArray}
+    delete data.condition.commonInfoPriceID;
+  }
+
   //根据地区+期数+材料编号的前4位与信息价材料的分类编号匹配，如果有数据，则显示数据出来。
   //先按编号匹配
   if (data.code) { 
     result = await getDataByCode(data.code, data);
     if (result.totalSize > 0) return result;
   }
-
+ 
   //编号匹配不上的情况：
   //有关键字的情况
   if (data.keyWord) { 

web/building_saas/main/js/views/project_glj_view.js

@@ -4,6 +4,7 @@
 let projectGljObject = {
   showTag: 'ration', //mixRatio/machine
   showMixRatioMark: '',
+  commonInfoPriceID:'',
   displayType: filterType.ALL,
   mixRatioType: [gljType.CONCRETE, gljType.MORTAR, gljType.MIX_RATIO, gljType.MAIN_MATERIAL],
   machineType: [gljType.GENERAL_MACHINE],
@@ -1635,6 +1636,7 @@ let projectGljObject = {
     for (let o of opts) {
       if (isArea == true) {
         str += `<option value="${o.ID}">${o.name}</option>`
+        if (o.name == "通用") this.commonInfoPriceID = o.ID;
       } else {
         str += `<option value="${o}">${o}</option>`
       }
@@ -1670,6 +1672,7 @@ let projectGljObject = {
           period: year + "-" + month,
           areaID: areaID
         }
+        if (projectGljObject.addCommonInfoPriceID) projectGljObject.addCommonInfoPriceID(condition);
         let data = {
           condition: condition
         };
@@ -1745,6 +1748,10 @@ let projectGljObject = {
   getInfoMarketPrice: function (info) {
     let taxType = projectObj.project.property.taxType; //1: 一般计税 2: 简易计税
     return gljUtil.getInfoMarketPrice(info, taxType);
+  },
+  refreshInfoPrice: function () { 
+    $('#info_price_sheet').height($("#mix_ratio_sheet").height() - $("#infoToolDiv").height()-10);
+    projectGljObject.initInfoPriceSpread();
   }
 };
 
@@ -1805,8 +1812,6 @@ function loadProjectGljSize() {
         //信息价相关
         $('#info_price_sheet').height($("#mix_ratio_sheet").height() - $("#infoToolDiv").height());
         if ($('#info_price_sheet').is(':visible')) me.initInfoPriceSpread();
-
-
       });
     }
 
@@ -1863,6 +1868,7 @@ $(function () {
   SlideResize.verticalSlide(pojGljResizeEles.eleObj, pojGljResizeEles.limit, function () {
     projectGljObject.projectGljSpread.refresh();
     projectGljObject.mixRatioSpread ? projectGljObject.mixRatioSpread.refresh() : '';
+    projectGljObject.refreshInfoPrice();
   });
 
   let tr = getConficMaterialResizeEles();
@@ -2127,8 +2133,7 @@ $(function () {
     projectGljObject.showRelatedRationDatas();
   });
   $("#info-nav").on('shown.bs.tab', function () {
-    $('#info_price_sheet').height($("#mix_ratio_sheet").height() - $("#infoToolDiv").height());
-    projectGljObject.initInfoPriceSpread();
+    projectGljObject.refreshInfoPrice();
     projectGljObject.autoShowInfoPriceData(); 
   });
   $('#info_year').change(function () {

web/over_write/js/chongqing_2018.js

@@ -10,6 +10,9 @@ if(typeof projectGljObject !== 'undefined'){
         {ID:'MAIN_MATERIAL',text:'主材'}
     ];
     $('#menu_index_info').show();
+  projectGljObject.addCommonInfoPriceID = function (condition) { 
+    if(condition.areaID != projectGljObject.commonInfoPriceID) condition.commonInfoPriceID = projectGljObject.commonInfoPriceID;
+  }
 }
 if(typeof gljUtil !== 'undefined'){
     gljUtil.hasCompMachine = [301,304];//有组成物的机械