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

modules/reports/rpt_component/jpc_flow_tab.js

@@ -14,6 +14,7 @@ let PDFKit = require('pdfkit');
 let JpcFlowTabSrv = function(){};
 JpcFlowTabSrv.prototype.createNew = function(){
     //grpPageInfo ：{"segGrpRecStartIdx": 0, "insertedGrpRecAmt": 0, "preAddPageGrpInfo": null}; //纯属解释参数grpPageInfo结构
+    //valueIdx: [isFollowMode, type(normal, auto-height, group), valueIndex, sub-value-index(自动行高特有), total-value-amount(自动行高特有)] //解释 dispValueIdxLst 数据构造
     function private_addPageValue(ValuedIdxLst, sortedSequence, grpSequenceInfo, startRecIdx, maxRecPerPage,page_seg_map, segIdx, pageIdx, grpPageInfo, isFollow, segAutoHeightInfo, prePageLeftAutoHeightRecAmt) {
         let vIdx = [], preAmt = 0, insertedGrpAmt = 0, grp_lines = 0, followMode = (isFollow)?JV.TYPE_FOLLOW_MODE:-1, nextPageAutoHeightRecAmt = 0;
         if (grpSequenceInfo && grpPageInfo) {
@@ -809,7 +810,11 @@ JpcFlowTabSrv.prototype.createNew = function(){
                     }
                     //page sum content
                     for (let di = 0; di < page_sum_data_fields.length; di++) {
-                        rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(page_sum_data_fields[di], contentValuesIdx[rowIdx][2]);
+                        if (contentValuesIdx[rowIdx][1] === JV.DISPLAY_VAL_TYPE_NORMAL ||
+                            contentValuesIdx[rowIdx][1] === JV.DISPLAY_VAL_TYPE_AUTO_HEIGHT && contentValuesIdx[rowIdx][3] === 0) {
+                            rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(page_sum_data_fields[di], contentValuesIdx[rowIdx][2]);
+                        }
+                        // rowGrandTotal[di] = rowGrandTotal[di] + 1.0 * JpcFieldHelper.getValue(page_sum_data_fields[di], contentValuesIdx[rowIdx][2]);
                     }
                 }
                 me.pageSumValLst.push(rowGrandTotal);

package.json

@@ -51,7 +51,8 @@
     "wiredep": "^2.2.2",
     "gulp-uglify-es":"^0.1.3",
     "multiparty": "^4.1.3",
-    "node-xlsx": "^0.11.2"
+    "node-xlsx": "^0.11.2",
+    "node-schedule": "^1.3.0"
   },
   "scripts": {
     "start": "C:\\Users\\mai\\AppData\\Roaming\\npm\\babel-node.cmd server.js"

test/unit/reports/test_tpl_09.js

@@ -28,9 +28,10 @@ let demoPrjId = - 1;
 let demoRptId = 232, pagesize = "A4";
 
 // demoPrjId = 720; //QA: DW3
-demoPrjId = 1626; //QA:
+demoPrjId = 2260; //QA:
 //*/
-let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了
+// let userId_Leng = "59cdf14a0034a1000ba52b97"; //小冷User Id 换成_id了
+let userId_Leng = "5acac1e885bf55000bd055ba";
 let userId_Dft = userId_Leng;
 /*/
  let userId_Dft = "595328da1934dc327cad08eb";

web/building_saas/main/js/models/bills.js

@@ -642,6 +642,11 @@ var Bills = {
             let selection = projectObj.mainSpread.getActiveSheet().getSelections()[0];
             for(let i =0;i<selection.rowCount;i++){
                 let tem_node = controller.tree.items[selection.row+i];
+                //被行引用的清单（大项费用）不可删除
+                if (cbTools.isUsedByFormula(tem_node)){
+                    alert('该清单行被其它公式结点引用，不允许删除！');
+                    return;
+                }
                 if(i==0){//第一个直接添加;
                     mainTreeMap[tem_node.getID()] = tem_node;
                     mainNodes.push(tem_node);

web/building_saas/pm/html/project-management.html

@@ -322,10 +322,10 @@
                                 <input name="valuation_type" id="radioBill" value="bill" type="radio" class="custom-control-input">
                                 <label class="custom-control-label" for="radioBill">清单计价</label>
                             </label>
-                            <label class="custom-control custom-radio" style="margin-left: 5px;">
+                          <!--  <label class="custom-control custom-radio" style="margin-left: 5px;">
                                 <input name="valuation_type" id="radioRation" value="ration" type="radio" class="custom-control-input">
                                 <label class="custom-control-label" for="radioRation">定额计价</label>
-                            </label>
+                            </label>-->
                         </div>
                     </div>
                     <div>