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

Dockerfile_pp

@@ -14,4 +14,4 @@ EXPOSE 2060
 
 ENV NODE_ENV=pp
 
-ENTRYPOINT babel-node server.js
+ENTRYPOINT babel-node --max-old-space-size=1000 server.js

web/building_saas/main/html/main.html

@@ -41,7 +41,6 @@
         let userID = '<%- userID %>';
         let projectReadOnly = JSON.parse('<%- projectReadOnly %>');
         let projectCooperate = JSON.parse('<%- projectCooperate %>');
-        console.log(projectCooperate);
         const G_SHOW_BLOCK_LIB = false;
 //        const G_SHOW_BLOCK_LIB = false;
     </script>

web/building_saas/main/js/models/quantity_detail.js

@@ -193,7 +193,6 @@ var quantity_detail = {
             let treeNode = gljOprObj.updateDataNodeProperty(node.ID,node.data);
             if(treeNode){//触发计算
                 if(treeNode.sourceType === project.Bills.getSourceType()){
-                    console.log(treeNode.data.quantity);
                     this.updateBillQuantity(treeNode.data.quantity,treeNode,treeNode.data.quantityEXP);
                 }else {//更新定额所使用的值要用还没转换前的
                     node.data? this.updateRationQuantity(node.data.r_quantity,treeNode,treeNode.data.quantityEXP):"";

web/building_saas/main/js/models/ration_glj.js

@@ -862,10 +862,10 @@ let ration_glj = {
             if (selectCode == gljOprObj.getIndex(oldData, gljKeyArray)) {
                 return callback(null);
             }
-            //如果是从混凝土改成商品混凝土，并且混凝土的定额消耗量不为空，则原混凝土的自定义消耗改成0，插入一条新的商品混凝土自定义消耗量为原自定义或定额消耗
+            //如果是从混凝土改成商品混凝土，并且混凝土的定额消耗量不为空，则原混凝土的自定义消耗改成0，插入一条新的商品混凝土自定义消耗量为原定额计算后的消耗量
             if(gljUtil.isAddCommercialForReplace(oldData.type,glj.gljType,oldData.rationItemQuantity)){
                 let originalID = oldData.ID;
-                let customQuantity = gljUtil.isDef(oldData.customQuantity)? oldData.customQuantity:oldData.rationItemQuantity;
+                let customQuantity = gljUtil.isDef(oldData.quantity)? oldData.quantity:0;
                 oldData = this.getAddDataByStd(glj,oldData.rationID,oldData.billsItemID,oldData.projectID);
                 oldData.toCommercial=true;
                 oldData.originalID = originalID;
@@ -908,7 +908,7 @@ let ration_glj = {
                         tem_doc = {'customQuantity':'0'};
                         //插入一条新的定额,这里的更新自定义消耗量操作由task完成了，不用像单条替换那样做标记，修改等
                         let newDoc =  this.getAddDataByStd(glj,d.rationID,d.billsItemID,d.projectID);
-                        let customQuantity = gljUtil.isDef(d.customQuantity)? d.customQuantity:d.rationItemQuantity;
+                        let customQuantity = gljUtil.isDef(d.quantity)? d.quantity:0;
                         newDoc.customQuantity = customQuantity;
                         let tTask = {insertOne:{document: newDoc}};
                         tasks.push(tTask);

web/building_saas/main/js/views/fee_rate_view.js

@@ -626,7 +626,6 @@ var feeRateObject={
                  }
              }
          }
-         console.log(updateDatas);
         if(updateDatas.length > 0){
             $.bootstrapLoading.start();
             feeRate.updateFeeRatesByIDs(updateDatas,function () {

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

@@ -123,10 +123,8 @@ var gljOprObj = {
     onRationGLJSelectionChange:function(sender,args){
         let me = gljOprObj;
         let selected = args.newSelections[0] ? args.newSelections[0] : {row: 0, col: 0};
-        console.log("selected changed-------");
         //这主要记录是否点击了sheet以外的地方，如果点击了sheet里的单元格，则将cancelUpdate设置为true不触发提交更新操作
         me.cancelUpdate = true;//取消延时任务由这里进行判断处理
-        console.log("change to true");
         me.sheetInitSelection(selected);
         if(me.rationGljEditObj){
             if(ifNeedUpdate(selected)){
@@ -1044,9 +1042,13 @@ var gljOprObj = {
     filterLibGLJByType: function () {
         var me = this;
         var selected = me.sheetData[gljContextMenu.selectedRow];
+        let materialTypes = [gljType.CONCRETE,gljType.MORTAR,gljType.MIX_RATIO,gljType.COMMERCIAL_CONCRETE,gljType.COMMERCIAL_MORTAR];//混凝土、砂浆、配合比、商品混凝土、商品砂浆
+        let normalTypes = [gljType.GENERAL_MATERIAL,gljType.PURCHASE_COMPONENT,gljType.GREEN_SEEDLING];//普通材料、外购砼构件、绿化苗木;
+        let filterTypes = [selected.type];
         //当前人材机类型是“混凝土、砂浆、配合比、商品混凝土、商品砂浆”时，筛选的可替换的人材机类型应是“混凝土、或砂浆、或配合比、或商品混凝土、或商品砂浆”。
-        let materialTypes = [202, 203, 204, 205, 206];//除了普通材料
-        let filterTypes = materialTypes.includes(selected.type) ? materialTypes : [selected.type];
+        if(materialTypes.includes(selected.type)) filterTypes = materialTypes;
+        //当前人材机类型是普通材料、外购砼构件、绿化苗木
+        if(normalTypes.includes(selected.type)) filterTypes = normalTypes;
         me.gljLibSheetData = _.filter(me.gljLibSheetData, function (data) {
             return filterTypes.includes(data.gljType);
         });
@@ -1082,7 +1084,6 @@ var gljOprObj = {
                 distTypeTree.comboDatas.push({text: distTypeObj.data.fullName, value: distTypeObj.data.ID});
             }
         });
-        console.log(distTypeTree);
         return distTypeTree;
     },
     doInsertGLJ: function () {

web/building_saas/main/js/views/glj_view_contextMenu.js

@@ -377,7 +377,6 @@ function getGLJData(actionType) {
     $('#actionType').val(actionType);
     $.bootstrapLoading.start();
     projectObj.project.ration_glj.getGLJData(function (result) {
-        console.log(+new Date());
         gljOprObj.treeData =  result.datas.treeData;
         //zTreeHelper.createTree(result.datas.treeData, gljOprObj.gljTreeSetting, "gljTree", gljOprObj);
         gljOprObj.initClassTree('std', gljOprObj.treeData.std);

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

@@ -873,11 +873,9 @@ var projectObj = {
         var that = this;
         this.project = PROJECT.createNew(scUrlUtil.GetQueryString('project'), userID);
         let startTime = +new Date();
-        console.log("开始加载-----"+startTime);
         $.bootstrapLoading.start();
         this.project.loadDatas(function (err) {
             let mTime = +new Date();
-            console.log(`get data时间——${mTime - startTime}`);
             //快速列设置
             if(!colSettingObj.getVisible('itemCharacterText')){
                 switchTznrHtml(true);
@@ -891,7 +889,6 @@ var projectObj = {
                 subObj.initSubSpread();//初始化主界面下方的表格
 
                 let quantityTime = +new Date();
-                console.log(`计算quantity时间——${quantityTime - mTime}`);
                 that.project.property = projectInfoObj.projectInfo.property;
                 if (typeof overwriteRationCalcBases === 'function')
                     overwriteRationCalcBases(that.project.property.taxType);
@@ -901,7 +898,6 @@ var projectObj = {
                 // that.project.initCalcFields();
                 let str = JSON.stringify(that.project.projSetting.main_tree_col);
                 that.project.projSetting.mainGridSetting = JSON.parse(str);
-                console.log(that.project.projSetting.mainGridSetting);
                 that.project.projSetting.mainGridSetting.frozenCols = 4;
                 TREE_SHEET_HELPER.initSetting($('#billsSpread')[0], that.project.projSetting.mainGridSetting);
                 that.project.projSetting.mainGridSetting.setAutoFitRow = MainTreeCol.getEvent("setAutoFitRow");
@@ -949,7 +945,6 @@ var projectObj = {
                 that.mainController = TREE_SHEET_CONTROLLER.createNew(that.project.mainTree, that.mainSpread.getActiveSheet(), that.project.projSetting.mainGridSetting);
                 that.mainController.showTreeData();
                 let endShowTime = +new Date();
-                console.log(`show data时间——${endShowTime - startShowTime}`);
                 that.mainController.bind('refreshBaseActn', that.refreshBaseActn);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.beforeTreeSelectedChange, that.beforeMainTreeSelectedChange);
                 that.mainController.bind(TREE_SHEET_CONTROLLER.eventName.treeSelectedChanged, that.treeSelectedChanged);
@@ -980,8 +975,6 @@ var projectObj = {
                 //}
                 socketObject.connect();//连接socket服务器
                 let endTime = +new Date();
-                console.log(`其它时间——${endTime - endShowTime}`);
-                console.log("加载完成-----"+endTime);
                 console.log(`时间——${endTime - startTime}`);
                 that.project.projectMarkChecking();//是否需要重新进行造价计算
                 autoFlashHeight();

web/building_saas/main/js/views/zmhs_view.js

@@ -84,6 +84,7 @@ let zmhs_obj = {
             //this.coeSheet.bind(GC.Spread.Sheets.Events.CellClick, this.onCoeCellClick);  配合自定义系数使用，现在自定义系数不在这显示了
             this.coeSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, this.onButtonClick);
             this.coeSheet.bind(GC.Spread.Sheets.Events.ValueChanged,this.onCoeValueChange);
+            this.coeSheet.bind(GC.Spread.Sheets.Events.RangeChanged, this.onCoeRangeChanged);
             this.coeSheet.bind(GC.Spread.Sheets.Events.SelectionChanged, function (e,args) {
                 args.sheet.repaint();
             });
@@ -420,6 +421,13 @@ let zmhs_obj = {
             zmhs_obj.coeSheet.startEdit();
         }
     },
+
+    onCoeRangeChanged:function(e,args){
+        if(args.action == GC.Spread.Sheets.RangeChangedAction.clear){
+            args.newValue = null;//目前只支持delete清除辅助定额
+            zmhs_obj.onCoeValueChange(e,args);
+        }
+    },
     onCoeValueChange:function (e,args) {
         let fieldID =  zmhs_obj.coeSetting.header[args.col].dataCode;
         let recode = zmhs_obj.coeSheetData[args.row];