Merge remote-tracking branch 'origin/master'

web/building_saas/main/js/models/fee_rate.js

@@ -252,7 +252,8 @@ var FeeRate = {
                 if(socketObject.roomInfo){
                     //判断费率文件ID是否改变了
                     if(socketObject.roomInfo.feeRate == me.getActivateFeeRateFileID()){//如果没变，则是重选了标准
-                        project.markUpdateProject({projectID:project.ID(),feeRateID:me.getActivateFeeRateFileID()},"feeRate",function () {
+                        console.log(me.getActivateFeeRateFileID());
+;                        project.markUpdateProject({projectID:project.ID(),feeRateID:me.getActivateFeeRateFileID()},"feeRate",function () {
                             socket.emit('feeRateChangeNotify', {projectID:project.ID(),feeRateID:socketObject.roomInfo.feeRate,userID:userID});
                         });
                     }else {
@@ -352,11 +353,10 @@ var FeeRate = {
                     if(newVal==feeRate.libID){//如果是本身，则是恢复标准值，设置回旧的树节点折叠属性
                        let oldRates =  me.datas.rates;
                        for(let i =0;i< oldRates.length;i++){
-                           data.rates[i].collapsed = oldRates[i].collapsed;
+                            if(data.rates[i] && data.rates[i].ID == oldRates[i].ID) data.rates[i].collapsed = oldRates[i].collapsed;
                        }
                     }
                     me.datas.rates=data.rates;
-                    projectObj.project.markUpdateProject({projectID:projectObj.project.ID(),feeRateID:me.getActivateFeeRateFileID()},'feeRate');
                     me.onFeeRateFileChange();
                     callback();
                 }

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

@@ -750,7 +750,6 @@ var feeRateObject={
         $.bootstrapLoading.start();
         var callback=function () {
             feeRateObject.reFreshRateViews();
-            projectObj.project.FeeRate.onFeeRateFileChange();
             $.bootstrapLoading.end();
         };
         projectObj.project.FeeRate.changeFeeRateStandard(newVal,callback);

web/building_saas/main/js/views/material_calc_view.js

@@ -14,7 +14,7 @@ materialCalcObj = {
             {headerName: "供应地点", headerWidth: 75, dataCode: "supplyLocation", hAlign: "left", dataType: "String"},
             {headerName: "原价", headerWidth: 60, dataCode: "originalPrice", hAlign: "right", dataType: "String"},
             {headerName: "单位运费", headerWidth: 60, dataCode: "unitFreight", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'glj.unitPrice'
-            {headerName: "单位毛重（吨）", headerWidth: 65, dataCode: "grossWeightCoe_n", hAlign: "right", dataType: "Number"},//,decimalField:"glj.unitPrice"
+            {headerName: "单位毛重（吨）", headerWidth: 65, dataCode: "grossWeightCoe_n", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
             {headerName: "装卸总次数", headerWidth: 53, dataCode: "totalLoadingTimes", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
             {headerName: "每增加一次装卸损耗率", headerWidth: 80, dataCode: "handlingLossRate_n", hAlign: "right", dataType: "Number",validator:"number"},
             {headerName: "场外运输损耗率", headerWidth: 60, dataCode: "offSiteTransportLossRate_n", hAlign: "right", dataType: "Number"},//,decimalField:"glj.unitPrice"

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

@@ -681,7 +681,7 @@ var projectObj = {
         };
 
         let colName = projectObj.project.projSetting.main_tree_col.cols[info.cellRange.col].data.field;
-        if (colName == 'code'){
+        if (node.sourceType === projectObj.project.Ration.getSourceType()&& colName == 'code'){
             info.cancel = true;
 
             function getNodeType(node) {

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

@@ -149,10 +149,11 @@ let zmhs_obj = {
         let coeList = [];
         if(selected&&selected.sourceType == "ration"){
             let ration = selected.data;
+            let assList = this.getAssList(node); //2019-01-23 新需求，将辅助定额合并到一个表显示  -- 20191206
+            // this.assFirstIndex = coeList.length;//没改前这里要记录辅助定额的起始下标，现在调整顺序后，默认就是0
             coeList = ration_coe.getCoeByRationID(ration.ID);
             _.remove(coeList,{"coeID":-1})//2018-12-24 新需求，把自定义乘系数分离出来，这里排除自定义乘系数行
-            this.assFirstIndex = coeList.length;//辅助定额的起始下标
-            coeList = coeList.concat(this.getAssList(node))  //2019-01-23 新需求，将辅助定额合并到一个表显示
+            coeList = assList.concat(coeList)
         }
         this.coeSheet.setRowCount(0);
         sheetCommonObj.showData(this.coeSheet, this.coeSetting,coeList);