显示debug

web/maintain/std_glj_lib/js/glj.js

@@ -233,10 +233,11 @@ let repositoryGljObj = {
     },
     reshowGljBasePrc: function (glj) {
         let me = repositoryGljObj;
+
         for(let i = 0; i < me.gljList.length; i++){
             if(glj.ID === me.gljList[i].ID){
                 me.gljList[i].basePrice = glj.basePrice;
-                me.workBook.getSheet(0).setValue(i, 4, glj.basePrice);
+                me.workBook.getSheet(0).setValue(me.activeRow, 4, glj.basePrice);
                 break;
             }
         }
@@ -246,6 +247,7 @@ let repositoryGljObj = {
         //混凝土202、砂浆203、配合比204、机械3
         if(info.oldSelections.length === 0 && info.newSelections.length > 0 || info.oldSelections[0].row !== info.newSelections[0].row){
             let row = info.newSelections[0].row;
+            me.activeRow = row;
             sheetCommonObj.lockCells(that.workBook.getSheet(0), that.setting);
             that.workBook.getSheet(0).getRange(-1, 0 , -1, 1, GC.Spread.Sheets.SheetArea.viewport).locked(true);
             that.workBook.getSheet(0).getRange(-1, 4 , -1, 1, GC.Spread.Sheets.SheetArea.viewport).locked(true);
@@ -377,14 +379,15 @@ let repositoryGljObj = {
                 if(me.currentEditingGlj[me.setting.header[col].dataCode] !== rObj[me.setting.header[col].dataCode]){
                     me.addGljObj = rObj;
                     if(rObj[me.setting.header[0].dataCode] && rObj[me.setting.header[1].dataCode] && rObj[me.setting.header[5].dataCode]){
-                        if(me.currentGlj){
-                            rObj.component = me.currentGlj.component;
-                        }
-                        if(me.allowComponent.indexOf(rObj.gljType) !== -1){
-                            rObj.basePrice = 0;
+                        if(rObj.gljType !== me.currentEditingGlj.gljType){//修改了工料机类型，组成物清空
+                            if(me.currentGlj){
+                                me.currentGlj.component = [];
+                            }
+                            if(me.allowComponent.indexOf(rObj.gljType) !== -1){
+                                rObj.basePrice = 0;
+                            }
                         }
-                        console.log(me.currentGlj);
-                        console.log(rObj);
+                        rObj.component = me.currentGlj.component;
                         updateArr.push(rObj);
                         break;
                     }