bug fixed

modules/main/controllers/ration_controller.js

@@ -92,7 +92,7 @@ async function addMultiRation(req,res) {
 async function replaceRations(req,res) {
     let result={
         error:0
-    }
+    };
     try {
         let data = req.body.data;
         data = JSON.parse(data);

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

@@ -189,9 +189,7 @@ var ration_glj = {
                 if (this.needShowToTree(data)) {
                     gljOprObj.setGLJPrice(data);
                     this.transferToNodeData(data);
-                    let parentNode = _.find(projectObj.project.mainTree.items, function (n) {//找父节点
-                        return n.sourceType == ModuleNames.ration && n.data.ID == data.rationID;
-                    });
+                    let parentNode = projectObj.project.mainTree.findNode(data.rationID);
                     if (parentNode) {
                         let nextNodeID = null;
                         if (parentNode.children.length > 0) {

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

@@ -106,12 +106,29 @@ var gljOprObj = {
         subSpread.bind(GC.Spread.Sheets.Events.ButtonClicked, me.onButtonClick);
         if(!projectReadOnly){
             gljContextMenu.loadGLJSpreadContextMenu();
+            //me.bindGLJEnterKey(subSpread,sheet);
         }
         sheet.bind(GC.Spread.Sheets.Events.SelectionChanged,function (sender,args) {
             let selected = args.newSelections[0] ? args.newSelections[0] : {row: 0, col: 0};
             me.sheetInitSelection(selected);
         });
     },
+
+    bindGLJEnterKey:function (spread,sheet) {
+        let me = this;
+        subSpread.commandManager().register('myEnter', enterKeyAction);
+        subSpread.commandManager().setShortcutKey(null, GC.Spread.Commands.Key.enter, false, false, false, false);
+        subSpread.commandManager().setShortcutKey('myEnter', GC.Spread.Commands.Key.enter, false, false, false, false);
+
+        function enterKeyAction(spd,sheeName) {
+            let editRow = sheet.getActiveRowIndex(),orgCol = sheet.getActiveColumnIndex();
+            if(sheet.isEditing()) sheet.endEdit();
+             //GC.Spread.Sheets.Commands.commitInputNavigationDown.execute(spd,sheeName);
+            //sheet.setSelection(editRow,orgCol+1,1,1);
+            GC.Spread.Sheets.Commands.navigationRight.execute(spd,sheeName);
+            //sheet.setActiveCell(editRow, orgCol+1)
+        }
+    },
     sheetInitSelection: function (selected) {
         let me = gljOprObj;
         if(selected.row < me.sheetData.length){
@@ -686,11 +703,13 @@ var gljOprObj = {
         let decimalObj = projectInfoObj.projectInfo.property.decimal;
         let labourCoeDatas =  projectObj.project.labourCoe.datas;
         glj = glj?glj:_.find(proGLJ.datas.gljList, {'id': data.projectGLJID});
-        let result = gljUtil.getGLJPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
-        data.marketPrice = result.marketPrice;
-        data.basePrice =  result.basePrice;
-        data.adjustPrice = result.adjustPrice;
-        data.marketUnitFee = data.marketPrice;//更新树节点市场单价列的值
+        if(glj){
+            let result = gljUtil.getGLJPrice(glj,proGLJ.datas,calcOptions,labourCoeDatas,decimalObj,isRadio,_,scMathUtil);
+            data.marketPrice = result.marketPrice;
+            data.basePrice =  result.basePrice;
+            data.adjustPrice = result.adjustPrice;
+            data.marketUnitFee = data.marketPrice;//更新树节点市场单价列的值
+        }
         return data;
 
     },