Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/unit_price_file/controllers/unit_price_controller.js

@@ -44,7 +44,7 @@ module.exports={
           taxType:project.property.taxType,
           region:project.property.region,
           overWriteUrl:req.session.sessionCompilation.overWriteUrl,
-          usedTenderList:usedTenderList,
+          usedTenderList:JSON.stringify(usedTenderList),
           usedTenderString:usedTenderString,
           unitpriceList:JSON.stringify(unitpriceList),
           gljTypeMap:JSON.stringify(gljTypeMap),

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

@@ -456,16 +456,14 @@ let baseFigureTemplate = {
         const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
         return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, programID, 'labour', tender);
     },
+    'FBFXDESGJJSYFRGTSF': function (tender) {
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['人工土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, programID, 'machine', tender);
+    },
     'FBFXJXBPTSFDEJXF': function (tender) {
         const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
         return cbTools.getFeeWithTypeByFlag(fixedFlag.SUB_ENGINERRING, programID, 'machine', tender);
     },
-    'FBFXDERGFTSFCW': function (tender) {
-        return (this['FBFXDEJJRGF'](tender) - this['FBFXRGTSFDERGF'](tender) - this['FBFXJXBPTSFDERGF'](tender)).toDecimal(decimalObj.bills.totalPrice);
-    },
-    'FBFXDEJXFTSFCW': function (tender) {
-        return (this['FBFXDEJJJXF'](tender) - this['FBFXJXBPTSFDEJXF'](tender)).toDecimal(decimalObj.bills.totalPrice);
-    },
     'FBFXDEJJZJGCF': function (tender) {
         return (this['FBFXDEJJRGF'](tender) + this['FBFXDEJJCLF'](tender) + this['FBFXDEJJJXF'](tender)).toDecimal(decimalObj.bills.totalPrice);
     },
@@ -561,16 +559,14 @@ let baseFigureTemplate = {
         const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
         return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, programID, 'labour', tender);
     },
+    JSCSXMDESGJJSYFRGTSF: function (tender) {
+        const programID = projectObj.project.calcProgram.compiledTemplateMaps['人工土石方工程'];
+        return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, programID, 'machine', tender);
+    },
     JSCSXMJXBPTSFDEJXF: function (tender) {
         const programID = projectObj.project.calcProgram.compiledTemplateMaps['机械(爆破)土石方工程'];
         return cbTools.getFeeWithTypeByFlag(fixedFlag.CONSTRUCTION_TECH, programID, 'machine', tender);
     },
-    JSCSXMDERGFTSFCW: function (tender) {
-        return (this['JSCSXMDEJJRGF'](tender) - this['JSCSXMRGTSFDERGF'](tender) - this['JSCSXMJXBPTSFDERGF'](tender)).toDecimal(decimalObj.bills.totalPrice);
-    },
-    JSCSXMDEJXFTSFCW: function (tender) {
-        return (this['FBFXDEJJRGF'](tender) - this['JSCSXMRGTSFDERGF'](tender) - this['JSCSXMJXBPTSFDERGF'](tender)).toDecimal(decimalObj.bills.totalPrice);
-    },
     'JSCSXMDEJJZJGCF': function (tender) {
         return (this['JSCSXMDEJJJXF'](tender) + this['JSCSXMJXBPTSFDEJXF'](tender)).toDecimal(decimalObj.bills.totalPrice);
     },
@@ -579,6 +575,44 @@ let baseFigureTemplate = {
             subFeeField = tender ? 'tenderTotalFee' : 'totalFee';
         return cbTools.getBillsFee(fixedFlag.OTHER, feeField, subFeeField);
     },
+    'DERGFTSFCW': function (tender) {
+        return (
+            this['FBFXDEJJRGF'](tender) + 
+            this['JSCSXMDEJJRGF'](tender) -
+            this['FBFXJXBPTSFDERGF'](tender) -
+            this['FBFXRGTSFDERGF'](tender) -
+            this['JSCSXMRGTSFDERGF'](tender) -
+            this['JSCSXMJXBPTSFDERGF'](tender)
+            ).toDecimal(decimalObj.bills.totalPrice);
+    },
+    'DERGFJXBPTSF': function (tender) {
+        return (
+            this['FBFXJXBPTSFDERGF'](tender) + 
+            this['JSCSXMJXBPTSFDERGF'](tender)
+            ).toDecimal(decimalObj.bills.totalPrice);
+    },
+    'DERGFRGTSF': function (tender) {
+        return (
+            this['FBFXRGTSFDERGF'](tender) + 
+            this['JSCSXMRGTSFDERGF'](tender)
+            ).toDecimal(decimalObj.bills.totalPrice);
+    },
+    'DESGJJSYFTSFCW': function (tender) {
+        return (
+            this['FBFXDEJJJXF'](tender) + 
+            this['JSCSXMDEJJJXF'](tender) -
+            this['FBFXJXBPTSFDEJXF'](tender) -
+            this['JSCSXMJXBPTSFDEJXF'](tender) -
+            this['FBFXDESGJJSYFRGTSF'](tender) -
+            this['JSCSXMDESGJJSYFRGTSF'](tender)
+            ).toDecimal(decimalObj.bills.totalPrice);
+    },
+    'DESGJJSYFJXBPTSF': function (tender) {
+        return (
+            this['FBFXJXBPTSFDEJXF'](tender) + 
+            this['JSCSXMJXBPTSFDEJXF'](tender)
+            ).toDecimal(decimalObj.bills.totalPrice);
+    },
     'GF': function (tender) {
         let feeField = 'common',
             subFeeField = tender ? 'tenderTotalFee' : 'totalFee';

web/building_saas/main/js/views/calc_base_view.js

@@ -160,8 +160,19 @@ let calcBaseView = {
     //计算基数转换为显示数据Obj to Array, 给清单基数分类赋值
     toViewData: function (obj) {
         let rst = [];
+        const noneClassFigures = [
+            '费率',
+            '分部分项定额人工费(人工土石方)',
+            '分部分项定额人工费(机械爆破土石方)',
+            '分部分项定额施工机具使用费(人工土石方)',
+            '分部分项定额施工机具使用费(机械爆破土石方)',
+            '技术措施项目定额人工费(人工土石方)',
+            '技术措施项目定额人工费(机械爆破土石方)',
+            '技术措施项目定额施工机具使用费(人工土石方)',
+            '技术措施项目定额施工机具使用费(机械爆破土石方)',
+        ]
         for(let figure in obj){
-            if (figure === '费率') {
+            if (noneClassFigures.includes(figure)) {
                 continue;
             }
             let figureObj = Object.create(null);
@@ -170,7 +181,9 @@ let calcBaseView = {
             rst.push(figureObj);
             //set class datas
             this.billsCBClass.ALL.push(figureObj);
-            this.billsCBClass[obj[figure]['class']].push(figureObj);
+            if (obj[figure]['class'] !== 'ALL') {
+                this.billsCBClass[obj[figure]['class']].push(figureObj);
+            }
         }
         return this.billsCBClass.ALL;
     },

web/building_saas/unit_price_file/index.html

@@ -43,6 +43,7 @@
   let taxType = '<%- taxType %>';
   let region = '<%- region %>';
   let unitPriceList = JSON.parse(`<%- unitpriceList %>`);
+  let usedTenderList = JSON.parse(`<%- usedTenderList %>`);
   let gljTypeMap = JSON.parse(`<%- gljTypeMap %>`);
   let mixRatioMap = JSON.parse(`<%- mixRatioMap %>`);
 </script>
@@ -72,7 +73,7 @@
             <span class="text-muted px-1"></span>
              <span><i class="fa fa-puzzle-piece"></i></span>
             <span class="text-truncate" data-toggle="tooltip" data-placement="bottom" data-original-title="<%= unitFileName%>">&nbsp;<%= unitFileName%></span>
-            &nbsp;(<span class="a_color" data-toggle="tooltip" id="pop-used-list"  style="float: none;" data-original-title="" title="<%= usedTenderString%>">与<span id="used-project-count" style="float: none;">1</span>个单位工程同步</span>)
+            &nbsp;(<span class="a_color" data-toggle="tooltip" id="pop-used-list"  style="float: none;" data-original-title="" title="<%= usedTenderString%>">与<span id="used-project-count" style="float: none;"> </span>个单位工程同步</span>)
           </div>
         </nav>
     </div>

web/building_saas/unit_price_file/index.js

@@ -587,6 +587,8 @@ function initPage(){
   unitPriceObj.showMainDatas();
   unitPriceObj.showSubDatas();
   socketObject.connect("unitPrice");
+  let usedCount = usedTenderList.length;
+  $("#used-project-count").text(usedCount);
 }
 
 unitPriceObj.setUntiPriceMap();

web/over_write/js/chongqing_2018.js

@@ -257,11 +257,10 @@ if(typeof baseFigureMap !== 'undefined'){
         '分部分项定额施工机具使用费': {base: 'FBFXDEJJJXF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
         '分部分项主材费': {base: 'FBFXZCF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
         '分部分项人工工日': {base: 'FBFXRGGR', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
-        '分部分项人工土石方定额人工费': {base: 'FBFXRGTSFDERGF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
-        '分部分项机械(爆破)土石方定额人工费': {base: 'FBFXJXBPTSFDERGF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
-        '分部分项机械(爆破)土石方定额施工机具使用费': {base: 'FBFXJXBPTSFDEJXF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
-        '分部分项定额人工费(土石方除外)': {base: 'FBFXDERGFTSFCW', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
-        '分部分项定额施工机具使用费(土石方除外)': {base: 'FBFXDEJXFTSFCW', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'FBFX'},
+        '分部分项定额人工费(人工土石方)': {base: 'FBFXRGTSFDERGF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'NONE'},
+        '分部分项定额人工费(机械爆破土石方)': {base: 'FBFXJXBPTSFDERGF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'NONE'},
+        '分部分项定额施工机具使用费(人工土石方)': {base: 'FBFXDESGJJSYFRGTSF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'NONE'},
+        '分部分项定额施工机具使用费(机械爆破土石方)': {base: 'FBFXJXBPTSFDEJXF', fixedFlag: fixedFlag.SUB_ENGINERRING, class: 'NONE'},
         '措施项目费': {base: 'CSXMF', fixedFlag: fixedFlag.MEASURE, class: 'CSXM'},
         '组织措施项目费': {base: 'ZZCSXMF', fixedFlag: fixedFlag.CONSTRUCTION_ORGANIZATION, class: 'CSXM'},
         '组织措施项目定额人工费': {base: 'ZZCSXMDEJJRGF', fixedFlag: fixedFlag.CONSTRUCTION_ORGANIZATION, class: 'CSXM'},
@@ -274,12 +273,16 @@ if(typeof baseFigureMap !== 'undefined'){
         '技术措施项目定额施工机具使用费': {base: 'JSCSXMDEJJJXF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
         '技术措施项目主材费': {base: 'JSCSXMZCF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
         '技术措施项目人工工日': {base: 'JSCSXMRGGR', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
-        '技术措施项目人工土石方定额人工费': {base: 'JSCSXMRGTSFDERGF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
-        '技术措施项目机械(爆破)土石方定额人工费': {base: 'JSCSXMJXBPTSFDERGF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
-        '技术措施项目机械(爆破)土石方定额施工机具使用费': {base: 'JSCSXMJXBPTSFDEJXF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
-        '技术措施项目定额人工费(土石方除外)': {base: 'JSCSXMDERGFTSFCW', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
-        '技术措施项目定额施工机具使用费(土石方除外)': {base: 'JSCSXMDEJXFTSFCW', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'CSXM'},
+        '技术措施项目定额人工费(人工土石方)': {base: 'JSCSXMRGTSFDERGF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'NONE'},
+        '技术措施项目定额人工费(机械爆破土石方)': {base: 'JSCSXMJXBPTSFDERGF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'NONE'},
+        '技术措施项目定额施工机具使用费(人工土石方)': {base: 'JSCSXMDESGJJSYFRGTSF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'NONE'},
+        '技术措施项目定额施工机具使用费(机械爆破土石方)': {base: 'JSCSXMJXBPTSFDEJXF', fixedFlag: fixedFlag.CONSTRUCTION_TECH, class: 'NONE'},
         '其他项目费': {base: 'QTXMF',  fixedFlag: fixedFlag.OTHER, class: 'QTXM'},
+        '定额人工费(土石方除外)': {base: 'DERGFTSFCW',  fixedFlag: null, class: 'ALL'},
+        '定额人工费(机械爆破土石方)': {base: 'DERGFJXBPTSF',  fixedFlag: null, class: 'ALL'},
+        '定额人工费(人工土石方)': {base: 'DERGFRGTSF',  fixedFlag: null, class: 'ALL'},
+        '定额施工机具使用费(土石方除外)': {base: 'DESGJJSYFTSFCW',  fixedFlag: null, class: 'ALL'},
+        '定额施工机具使用费(机械爆破土石方)': {base: 'DESGJJSYFJXBPTSF',  fixedFlag: null, class: 'ALL'},
         '规费': {base: 'GF', fixedFlag: fixedFlag.CHARGE, class: 'GF'},
         '税金': {base: 'SJ', fixedFlag: fixedFlag.TAX, class: 'SJ'},
         '增值税': {base: 'ZZS', class: 'SJ', fixedFlag: fixedFlag.ADDED_VALUE_TAX},