Merge branch '1.0.0_online' of http://192.168.1.12:3000/SmartCost/ConstructionCost into 1.0.0_online

public/web/socket/connection.js

@@ -7,7 +7,8 @@ socketObject={
       // 连接socket服务器
       var hostName = window.location.hostname;
       let me = this;
-      socket = io('http://'+hostName+':3300');
+      let port = window.location.protocol ==='http:'?3300:3301
+      socket = io(window.location.protocol+'//'+hostName+':'+port);
       socket.on('connect', function () {
           me.roomInfo={
               feeRate:me.getFeeRateRoomID(),

web/building_saas/main/js/models/calc_program.js

@@ -314,8 +314,10 @@ let calcTools = {
         };
 
         if (priceType == priceTypes.ptDiffPrice){
-            result = (temp.toDecimal(decimalObj.ration.unitPrice) - temp2.toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
-            // result = (temp - temp2).toDecimal(decimalObj.ration.unitPrice);
+            if (gljTypes == baseMaterialTypes)
+                result = (temp - temp2).toDecimal(decimalObj.ration.unitPrice)
+            else
+                result = (temp.toDecimal(decimalObj.ration.unitPrice) - temp2.toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
         }
         else{
             result = result.toDecimal(decimalObj.ration.unitPrice);

web/building_saas/main/js/models/ration.js

@@ -432,8 +432,8 @@ var Ration = {
                     $.bootstrapLoading.end();
                 });
 
-                if(data.length<recodes.length&&recodes[data.length].value!=null){//说明有部分定额编号没找到记录
-                    alert('当前库中找不到定额"' + recodes[data.length].value + '"');
+                if(data.length < nodeInfo.length && nodeInfo[data.length].newCode!=null){//说明有部分定额编号没找到记录
+                    alert('当前库中找不到定额"' + nodeInfo[data.length].newCode + '"');
                 }
                 updateBillsOprRation();
             })
@@ -593,9 +593,6 @@ var Ration = {
                     needInstall = project.Bills.isFBFX(billsNode);//在分部分项插入的定额才需要定额安装增加费
                 }
                 $.bootstrapLoading.start();
-                newNode = project.mainTree.insert(billItemID, nextID, newID);
-                newNode.sourceType = project.Ration.getSourceType();
-                newNode.data = newData;
                 CommonAjax.post("/ration/addNewRation",{itemQuery:itemQuery,newData:newData,firstLibID: rationLibObj.getFirstStdRationLibID(),calQuantity:calQuantity,brUpdate:brUpdate,needInstall:needInstall},function (data) {
                     //更新缓存
                     me.datas.push(data.ration);
@@ -605,12 +602,12 @@ var Ration = {
 
                     //插入树节点
                     newSource = data.ration;
-                    // newNode = project.mainTree.insert(billItemID, nextID, newSource.ID);  上移到post方法外部。批量粘贴时，先插入空行，前端等不了，先生成树结点，效果同清单处理方式。
+                    newNode = project.mainTree.insert(billItemID, nextID, newSource.ID);
                     newNode.source = newSource;
-                    // newNode.sourceType = project.Ration.getSourceType();
+                    newNode.sourceType = project.Ration.getSourceType();
                     newNode.data = newSource;
                     project.projectGLJ.loadData(function () {
-                        // ProjectController.syncDisplayNewNode(sheetController, newNode);
+                        ProjectController.syncDisplayNewNode(sheetController, newNode);
                         project.ration_glj.addToMainTree(data.ration_gljs);
                         projectObj.mainController.refreshTreeNode([newNode], false);
                         project.calcProgram.calcAndSave(newNode,function () {
@@ -626,11 +623,55 @@ var Ration = {
                         $.bootstrapLoading.end();
                     });
                 })
+                return newNode;
+            }
+            else return null;
+        };
+        ration.prototype.addNewRationForPaste = function (rationType) {
+            let me = this;
+            let project = projectObj.project, sheetController = projectObj.mainController;
+            let engineering = projectInfoObj.projectInfo.property.engineering;
+            let selected = project.mainTree.selected, newSource = null, newNode = null,pre=null,br=null;
+            let billItemID = null,serialNo=1,nextID=null;
+            if (selected === null) { return null; }
+            if (selected.sourceType === project.Ration.getSourceType()) {
+                billItemID = selected.getParentID();
+                br = this.getBillsSortRation(billItemID);
+                serialNo = selected.data.serialNo+1;
+                nextID = selected.getNextSiblingID();
+                pre = selected.source;
+            };
+            if(billItemID){
+                let newID = me.getNewRationID();
+                let newData =  me.getTempRationData(newID, billItemID, serialNo, rationType);
+                let brUpdate = [];
+                //更新兄弟节点的序列号
+                if (pre) {
+                    let preIndex = br.indexOf(pre), i;
+                    for (i = preIndex + 1; i < br.length; i++) {
+                        br[i].serialNo = i < br.length - 1 ? br [i + 1].serialNo : br[i].serialNo + 1;
+                        brUpdate.push({projectID:newData.projectID,ID:br[i].ID,serialNo:br[i].serialNo});
+                    }
+                }
+                if(engineering==engineeringType.BUILD_IN) {//如果是安装工程，要看需不需要生成安装增加费
+                    let billsNode = project.mainTree.getNodeByID(billItemID);
+                }
+                $.bootstrapLoading.start();
+                newNode = project.mainTree.insert(billItemID, nextID, newID);
+                newNode.sourceType = project.Ration.getSourceType();
+                newNode.data = newData;
+                CommonAjax.post("/ration/addNewRation",{itemQuery:null,newData:newData,firstLibID: rationLibObj.getFirstStdRationLibID(),calQuantity:false,brUpdate:brUpdate,needInstall:false},function (data) {
+                    //更新缓存
+                    me.datas.push(data.ration);
+                    //插入树节点
+                    newSource = data.ration;
+                    newNode.source = newSource;
+                    newNode.data = newSource;
+                })
                 ProjectController.syncDisplayNewNode(sheetController, newNode);
                 return newNode;
             }
             else return null;
-
         };
         ration.prototype.deleteSubListOfRation = function(ration){
             projectObj.project.ration_glj.deleteByRation(ration);

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

@@ -584,17 +584,18 @@ var projectObj = {
         }
     },
     onClipboardPasting: function (sender, info){
-        info.cancel = true;
-
         let rIdx = info.sheet.getActiveRowIndex();
         let node = projectObj.project.mainTree.items[rIdx];
         if (!node.parent){
+            info.cancel = true;
             hintBox.infoBox('系统提示','大项费用不允许粘贴！', 1);
             return false;
         };
 
         let colName = projectObj.project.projSetting.main_tree_col.cols[info.cellRange.col].data.field;
         if (colName == 'code'){
+            info.cancel = true;
+
             function getNodeType(node) {
                 let t = null;
                 if (calcTools.isRationItem(node))
@@ -621,7 +622,7 @@ var projectObj = {
                 }
                 return rstArr;
             };
-            function getPasteNodes(count, nodeType) {
+            function getPasteNodes(node, nodeType, count) {
                 let nodesArr = [];
                 let curNode = null;
                 for (let i = rIdx; i < rIdx + count; i++) {
@@ -643,7 +644,7 @@ var projectObj = {
                     for (let i = 0; i < add; i++) {
                         switch (nodeType) {
                             case 1:
-                                curNode = projectObj.project.Ration.addNewRation(null,rationType.ration,null,true);
+                                curNode = projectObj.project.Ration.addNewRationForPaste(rationType.ration);
                                 break;
                             case 2:
                                 curNode = ProjectController.addFB(projectObj.project, projectObj.mainController);
@@ -670,12 +671,16 @@ var projectObj = {
 
                 return nodesArr;
             };
-            function doPaste(datas, nodes, nodeType) {
+            function doPaste(nodes, nodeType, datas) {
                 if (nodeType == 1){  // 批量粘贴定额有严重的异步问题，这里要和清单分开处理
                     let updateRationCodes = [];
                     for (let i = 0; i < datas.length; i++) {
                         let ptNode = nodes[i];
                         let code = datas[i][0];
+                        // 编号去掉“换、借、补”等多余的字
+                        code = code.replace(new RegExp(rationPrefix.complementary), '');
+                        code = code.replace(new RegExp(rationPrefix.borrow), '');
+                        code = code.replace(new RegExp(rationPrefix.replace), '');
                         updateRationCodes.push({'node':ptNode, value:code});
                     }
                     projectObj.project.Ration.updateRationCodes(updateRationCodes);
@@ -697,11 +702,10 @@ var projectObj = {
                 hintBox.infoBox('系统提示', '该树结点类型不支持从项目编码列粘贴！', 1);
                 return false;
             };
-
             let datas = getPasteTextArr(info);
             if (!datas) return;
-            let pasteNodes = getPasteNodes(datas.length, tagType);
-            doPaste(datas, pasteNodes, tagType);
+            let pasteNodes = getPasteNodes(node, tagType, datas.length);
+            doPaste(pasteNodes, tagType, datas);
         };
     },
     mainSpreadEditEnded: function (sender, info) {
@@ -2897,4 +2901,4 @@ $('#calcBaseFeeRateConf').click(function () {
     else if(!validateFeeRate && needToSave) {
         projectObj.project.calcProgram.calcAndSave(selected);
     }
-});
+});