bugs

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);