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

modules/common/const/bills_fixed.js

@@ -53,7 +53,9 @@ const fixedFlag = {
     //施工机械
     CONSTRUCTION_MACHINE:25,
     //暂列金额
-    PROVISIONAL:26
+    PROVISIONAL:26,
+    //安全生产费
+    SAFE_COST:27
 };
 
 export default fixedFlag;

web/building_saas/pm/js/pm_newMain.js

@@ -184,7 +184,6 @@ const projTreeObj = {
             this.bindEvent(newWorkBook);
             this.loadContextMenu();
             this.loadStartMenu();
-            this.loadBtn();
         }
         return newWorkBook;
     },
@@ -1125,7 +1124,6 @@ const projTreeObj = {
         $("#mr_title").text(title);
         this.initHtmlByFromRadio();
         let result = from == "unitPriceFile"?await this.setUnitFileChangeFileData():await this.setFeeRateChangeFileData();
-        console.log(result);
         this.changeInfo = result;
         this.loadFileOptions(this.changeInfo,from);
 
@@ -1332,8 +1330,6 @@ const projTreeObj = {
         //发送文件改变消息
         data.oldFileIDs = _.uniq(oldFileIDs);
         socket.emit('multiFileChangeNotify', data);
-
-        console.log(result);
     },
     checkFileName:async function (fileID,name,type) {
         let node = this.tree.selected;
@@ -1392,7 +1388,7 @@ const projTreeObj = {
         }
         // projTreeObj.remove(sheet, fromRow, rCout);
 
-        me.renderSheetFuc(sheet, function () {
+       // me.renderSheetFuc(sheet, function () {
             sheet.deleteRows(fromRow, rCout);
             sheet.addRows(newNode.serialNo(),rCout);
             let oldSelection = sheet.getSelections()[0];
@@ -1406,7 +1402,7 @@ const projTreeObj = {
             }
             refreshNodes = refreshNodes.concat(children);
             me.refreshNodeData(refreshNodes);
-        });
+       // });
 
         function addNewNodes(node,parent,next) {
             let newNode = me.tree.addNodeData(node.data, parent, next);
@@ -1445,6 +1441,8 @@ const projTreeObj = {
 };
 
 $(document).ready(function() {
+    //绑定项目管理的升降级、上下移按钮事件
+    projTreeObj.loadBtn();
     $('#sideTab').find('li').click(function () {
        //消除tooltip
         $('[data-toggle="tooltip"]').tooltip('hide');
@@ -1537,7 +1535,6 @@ $(document).ready(function() {
     //选择计价规则
     $("#valuation").change(function () {
         let engineeringList = getEngineeringList();
-        console.log(engineeringList);
         let engineeringHtml = getEngineeringHtml(engineeringList);
         $("#tender-engineering").html(engineeringHtml);
         $('#valuation-info').hide();
@@ -1816,7 +1813,6 @@ $(document).ready(function() {
         $("#copy-to-dialog").modal('hide');
         $.bootstrapLoading.start();
         CommonAjax.post('/pm/api/copyProjects',{projectMap:projectMap,user_id: userID},function (result) {
-            console.log(result);
             let newNode = projTreeObj.insert(result['copy'].document,parent,next);
             let refreshNodes = projTreeObj.calEngineeringCost(newNode);
             projTreeObj.refreshNodeData(refreshNodes);