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

modules/glj/models/unit_price_model.js

@@ -123,10 +123,10 @@ class UnitPriceModel extends BaseModel {
             glj_id: data.glj_id,
             is_add:0
         };
-        if(data.from=='cpt'){//如果是来自补充工料机，则都添加新增标记
-            insertData.is_add=1;
-        }
-
+        if(data.from=='cpt') insertData.is_add=1; //如果是来自补充工料机，则都添加新增标记
+      
+        if(operation=='add' && insertData.code != insertData.original_code) insertData.is_add=1;//添加的时候如果是复制整块来的，可能在源项目中是新增的工料机，这里也要添上
+        
         if (unitPriceData&&unitPriceData.length>0&&operation!='add') {// 如果原始编码能找到，但不存在一样的编号，名称，单位.型号等，更改code和添加新增标记，新增的时候除外。新增的情况下能到这一步说明有存在编码一致但其它属性不一致的情况，所以不用更改编码
             //insertData.code = data.original_code+"-"+unitPriceData.length;
             insertData.code = data.original_code+"-"+this.getLastNumber(data.original_code,unitPriceData);

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -25,7 +25,7 @@
             cursor: s-resize;
         }
         div.resize-x{
-            width: 1%;
+            width: 4px;
             height: 100%;
             background: #efefef;
             cursor: w-resize;

web/building_saas/css/custom.css

@@ -21,7 +21,7 @@ div.resize-y{
     cursor: s-resize;
 }
 div.resize-x{
-    width: 1%;
+    width: 4px;
     height: 100%;
     background: #efefef;
     cursor: w-resize;

web/building_saas/main/js/views/project_view.js

@@ -640,6 +640,7 @@ var projectObj = {
             }
         }
         if(node.sourceType == ModuleNames.ration){ //在定额编码中双击，如果右侧定额库没有展开，则自动展开。
+            if(node.data.type != rationType.ration) return ;//只有定额类型才需要自动展开，其它都不用 
             let libID = node.data.libID;
             if (node.data.from === 'cpt') {
                 libID = rationLibObj.compleRationLibId;

web/building_saas/main/js/views/quantity_edit_view.js

@@ -143,6 +143,7 @@ let quantityEditObj = {
         quantityEXP = quantityEXP?quantityEXP.toUpperCase():'';//非空判断
         quantityEXP =replaceAll('（','(',quantityEXP);//转换中文左右符号
         quantityEXP =replaceAll('）',')',quantityEXP);
+        quantityEXP = quantityEXP.replace(/[\s\r\n]/g, "")//去掉空格回车换行等字符
         let value = me.evalQuantityExp(quantityEXP,node);
         if(value!=='evalError'){
             if(node.data.hasOwnProperty('isFromDetail')&&node.data.isFromDetail==1){

web/building_saas/report/html/rpt_main.html

@@ -14,7 +14,7 @@
                 </div>
             </div>
         </div>
-        <div class="col-auto" id="main-view" style="width: 80%">
+        <div class="col-auto p-0" id="main-view" style="width: 80%">
             <div class="resize-x" id="right-spr" r-Type="width" div1="#tree-view" div2="#main-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
             <div class="toolsbar-f d-flex justify-content-between">
                 <div class="print-toolsbar">

web/building_saas/report/js/rpt_print.js

@@ -219,7 +219,7 @@ function buildText(destRst, cell, font, control, offsetX, offsetY, adjustY, canv
             let innerDftFontHeight = (dftFontHeight * 3 / 4); //SVG的字体与canvas的字体大小的切换, 不用考虑取整
             if (control) {
                 if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "top") {
-                    y = innerArea[JV.IDX_TOP] + JV.OUTPUT_OFFSET[JV.IDX_TOP];
+                    y = innerArea[JV.IDX_TOP] + JV.OUTPUT_OFFSET[JV.IDX_TOP] + orgFontHeight;
                 } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "bottom") {
                     y = innerArea[JV.IDX_BOTTOM] - JV.OUTPUT_OFFSET[JV.IDX_BOTTOM];
                 } else if (control[JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL]] === "center") {