Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/YangHuCost

modules/reports/rpt_component/helper/jpc_helper_common_output.js

@@ -2,7 +2,7 @@ let JV = require('../jpc_value_define');
 let JpcFieldHelper = require('./jpc_helper_field');
 
 let JpcCommonOutputHelper = {
-    createCommonOutputWithoutDecorate: function (node, value) {
+    createCommonOutputWithoutDecorate: function (node, value, forceCombine) {
         let me = this, rst = {};
         //1. font/style/control
         rst[JV.PROP_FONT] = node[[JV.PROP_FONT]];
@@ -14,9 +14,13 @@ let JpcCommonOutputHelper = {
         // innerFormat(node[JV.PROP_FORMAT], rst);
         if (node[JV.PROP_PREFIX] && rst[JV.PROP_VALUE] !== null) {
             rst[JV.PROP_VALUE] = node[JV.PROP_PREFIX] + rst[JV.PROP_VALUE];
+        } else if (node[JV.PROP_PREFIX] && forceCombine) {
+            rst[JV.PROP_VALUE] = node[JV.PROP_PREFIX];
         }
         if (node[JV.PROP_SUFFIX] && rst[JV.PROP_VALUE] !== null) {
             rst[JV.PROP_VALUE] = rst[JV.PROP_VALUE] + node[JV.PROP_SUFFIX];
+        } else if (node[JV.PROP_SUFFIX] && forceCombine) {
+            rst[JV.PROP_VALUE] = node[JV.PROP_SUFFIX];
         }
         return rst;
     },

modules/reports/rpt_component/helper/jpc_helper_discrete.js

@@ -60,7 +60,7 @@ let JpcDiscreteHelper = {
                                 let param = JE.P(df[JV.PROP_PARAM_ID], $CURRENT_RPT);
                                 value = param[JV.PROP_DFT_VALUE];
                             }
-                            let item = JpcCommonOutputHelper.createCommonOutputWithoutDecorate(df, value, null);
+                            let item = JpcCommonOutputHelper.createCommonOutputWithoutDecorate(df, value, true);
                             //position
                             item[JV.PROP_AREA] = JpcAreaHelper.outputArea(df[JV.PROP_AREA], band, unitFactor, 1, 0, 1, 0, multiCols, multiColIdx, false, false);
                             rst.push(item);

test/unit/reports/test_preview_page.js

@@ -24,15 +24,17 @@ cfgCacheUtil.setupDftCache();
 let fsUtil = require("../../../public/fsUtil");
 
 // let demoPrjId = - 1;
-let demoRptId = 275; //重庆09年建筑 09表
+// let demoRptId = 275; //重庆09年建筑 09表
 // let demoRptId = 229; //重庆09年建筑 封2表
+let demoRptId = 28; //09 重庆养护2018
 
 let pagesize = "A4";
 
 // demoPrjId = 720; //QA: DW3
 // demoPrjId = 1626; //QA:
 //*/
-let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了
+// let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了
+let userId_Leng = "5c3ffa9aa0a92732f41216e0"; //小冷User Id (养护的)
 let userId_Dft = userId_Leng;
 /*/
  let userId_Dft = "595328da1934dc327cad08eb";
@@ -57,7 +59,7 @@ test('测试 - 预览: ', function (t) {
                 printCom.initialize(rptTpl);
                 let pageRst = printCom.outputAsPreviewPage(rptTpl, defProperties);
                 if (pageRst) {
-                    fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/previewPageResult.jsp");
+                    fsUtil.writeObjToFile(pageRst, "D:/GitHome/YangHuCost/tmp/previewPageResult.jsp");
                     t.pass('pass with succeed!');
                     t.end();
                 } else {

test/unit/reports/test_rpt_test_template.js

@@ -27,7 +27,10 @@ let fsUtil = require("../../../public/fsUtil");
 
 let demoPrjId = - 1;
 // let demoRptId = 38; //5.2.2表
-let demoRptId = 6; //封面
+// let demoRptId = 6; //封面
+// let demoRptId = 22; //03
+// let demoRptId = 26; //07
+let demoRptId = 28; //09
 
 let pagesize = "A4";
 //288: 11-2表(新)

web/building_saas/main/html/main.html

@@ -150,7 +150,7 @@
                               <a class="nav-link px-3 right-nav-link"  href="javascript:void(0)" id = 'locateTab' relaPanel="#locate">查找定位</a>
                           </li>-->
                           <li class="nav-item">
-                              <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id = 'stdBillsGuidanceTab' relaPanel="#zy">清单规则</a>
+                              <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id = 'stdBillsGuidanceTab' relaPanel="#zy">项目表</a>
                           </li>
                          <!-- <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id = 'stdBillsTab' relaPanel="#qd">清单规则</a>
@@ -187,9 +187,9 @@
                           <div class="resize-y" id="mainVerticalResize"></div>
                           <div class="bottom-content" id="bottom_div">
                               <ul class="nav nav-tabs" role="tablist" id="bottom_div_ul">
-                                  <li class="nav-item" id="QDJL_div">
+                                  <!--<li class="nav-item" id="QDJL_div">
                                       <a class="nav-link sub-item" id="linkQDJL" data-toggle="tab" href="#subSpread" role="tab">清单精灵</a>
-                                  </li>
+                                  </li>-->
                                   <li class="nav-item" id="GLJ_div">
                                       <a class="nav-link sub-item active" id="linkGLJ" data-toggle="tab" href="#subSpread" role="tab">工料机</a>
                                   </li>
@@ -311,7 +311,7 @@
                                       <div class="main-data-bottom ovf-hidden" style="display: none" id="comments">
                                           <textarea style="font-size: 0.9rem" class="form-control" rows="8" readonly=""></textarea>
                                       </div>
-                                      <div class="container-fluid main-data-bottom ovf-hidden" id="qdjl" role="tabpanel">
+                                      <!--<div class="container-fluid main-data-bottom ovf-hidden" id="qdjl" role="tabpanel">
                                           <div class="row p-0" style="background: #efefef">
                                               <div class="col-6 p-0">
                                                   <div id="qdjlTools" style="width: calc(100% - 5px); border-bottom: solid 1px lightgrey;">
@@ -322,7 +322,7 @@
                                                   </div>
                                               </div>
                                           </div>
-                                      </div>
+                                      </div>-->
                                   </div>
                               </div>
                           </div>

web/building_saas/main/js/views/glj_view.js

@@ -18,7 +18,7 @@ var gljOprObj = {
     parentNodeIds: {},
     activeTab: '#linkGLJ',
     rationTab:'#linkGLJ',
-    billsTab:'#linkQDJL',
+    billsTab:'#linkGCLMX',
     setting: {},
     detailSetting: {
         header: [

web/building_saas/main/js/views/project_info.js

@@ -34,10 +34,10 @@ var projectInfoObj = {
                 that.projectInfo = data;
                 if(!data.engineeringInfo.billsGuidance_lib || data.engineeringInfo.billsGuidance_lib.length === 0){
                     $('#stdBillsGuidanceTab').addClass('disabled');
+                } else {
+                    //打开预算项目时，右侧“清单规则”显示为“项目表”，打开工程量清单项目时，右侧“清单规则”显示为“清单范本”。
+                    $('#stdBillsGuidanceTab').text(data.property.valuationType === 'bill' ? '项目表' : '清单范本');
                 }
-              /*  else {
-                    $('#stdBillsGuidanceTab').text(data.engineeringInfo.billsGuidance_lib[0].type === 1 ? '清单指引' : '清单精灵');
-                }*/
 
                 //init decimal
                 setDecimal(decimalObj, data.property.decimal);

web/building_saas/main/js/views/sub_view.js

@@ -73,7 +73,7 @@ let subObj = {
             $("#ZMHS_div").hide();
             $("#MBZM_div").hide();
             $("#AZZJF_div").hide();
-            $('#QDJL_div').show();
+            $('#QDJL_div').hide();//暂时隐藏
             $(gljOprObj.billsTab).click();
         }
         projectObj.mainSpread.focus();