清单基数debug

web/building_saas/main/js/models/calc_base.js

@@ -1521,7 +1521,8 @@ let cbParser = {
         //暂估材料费特殊处理：CN(CN)
         let isZG = false;
         for(let i = 0, len = temp.length; i < len; i++){
-            if(temp[i] !== '' && rst.indexOf(temp[i]) === -1){
+            if(temp[i] !== ''){
+            //if(temp[i] !== '' && rst.indexOf(temp[i]) === -1){
                 if(temp[i] === '暂估材料费'){//处理暂估材料基数
                     isZG = true;
                     continue;
@@ -1632,7 +1633,7 @@ let cbParser = {
             return '$CBC.base(\'NONE\')';
         }
         //基数
-        let strs = this.getFigure(v);
+        let strs = _.uniq(this.getFigure(v));
         let exps = [];
         for(let i = 0, len = strs.length; i < len; i++){
             let exp = Object.create(null);

web/over_write/js/jiangxi_2017.js

@@ -445,6 +445,9 @@ if(typeof $ !== 'undefined' && $('#cbClassList')){
     let $li = $('<li class="p-1"><a id="cb_GJXM" href="javascript:void(0);">估价项目</a></li>');
     $li.insertAfter($('#cbClassList').find('li:eq(4)'));
 }
+if (typeof calcBaseView !== 'undefined') {
+    calcBaseView.billsCBClass = {ALL: [], FBFX: [], CSXM: [], QTXM: [], FBF: [], RCJ: [], GF: [], SJ: [], GJXM: []};
+}