debug

web/maintain/billsGuidance_lib/js/billsGuidance.js

@@ -841,14 +841,24 @@ const billsGuidance = (function () {
         if(selected.nextSibling && selected.children.length > 0){
             //更新选中节点最末子节点
             let lastChild = selected.children[selected.children.length - 1];
-            updateDatas.push({updateType: updateType.update, findData: {ID: lastChild.getID()}, updateData: {NextSiblingID: selected.getNextSiblingID()}});
+            updateDatas.push({updateType: updateType.update, findData: {ID: lastChild.getID()}, updateData: {NextSiblingID: -1}});
+        }
+        //选中节点的所有后兄弟节点成为选中节点的子项
+        let selectedNextIDs = [];
+        let sNext = selected.nextSibling;
+        while(sNext){
+            selectedNextIDs.push(sNext.getID());
+            sNext = sNext.nextSibling;
+        }
+        for(let sID of selectedNextIDs){
+            updateDatas.push({updateType: updateType.update, findData: {ID: sID}, updateData: {ParentID: selected.getID()}});
         }
         updateGuideItems(updateDatas, function () {
             controller.upLevel();
             refreshBtn(bills.tree.selected.guidance.tree.selected);
             setNodesColor(guideItem.workBook.getActiveSheet(), bills.tree.selected.guidance.tree.items);
             $.bootstrapLoading.end();
-            guideItem.workBook.focus(true)
+            guideItem.workBook.focus(true)//31574
         });
     }
     //项目指引降级

web/maintain/bills_lib/html/qingdan.html

@@ -375,6 +375,7 @@
 
     function showBillsSheet(datas, jobsSheet, itemsSheet, setting) {
         let billsSpread = new GC.Spread.Sheets.Workbook($('#spreadBills')[0], {sheetCount: 1});
+        let billsSheet = billsSpread.getSheet(0);
         sheetCommonObj.bindEscKey(billsSpread, [{sheet: billsSpread.getSheet(0), editStarting: dbController.onEditStart, editEnded: dbController.onEditEnded}]);
         billsSpread.focus(true);
         setSheet.initSheet(billsSpread, setting, true);
@@ -624,6 +625,9 @@
 
     function bindSheet(controller, sheet, field, setting){
         controller.sheet.bind(GC.Spread.Sheets.Events.SelectionChanged, function(sender, args){
+            if(args.newSelections[0]){
+                controller.tree.selected = controller.tree.items[args.newSelections[0].row] ? controller.tree.items[args.newSelections[0].row] : null;
+            }
             if(controller.tree.selected  && args.oldSelections[0].row !== args.newSelections[0].row|| controller.tree.selected && args.oldSelections[0].row === 0){
                 //rechargeArea
                 $('#exampleTextarea').val(controller.tree.selected.data.recharge);
@@ -700,7 +704,6 @@
                 }
             }
             sheet.resumePaint();
-            console.log(controller.tree.selected);
             billsAjax.pasteBills(userAccount, billsLibId, validDatas);
             for(let vData of validDatas){
                 let node  = controller.tree.nodes['id_' + vData.ID];
@@ -722,7 +725,6 @@
             }
         });
         sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, function(sender, args){
-            console.log(args);
             if(controller.tree.selected){
                 let orgRow = args.cellRange.row, orgCol = args.cellRange.col, rowCount = args.cellRange.rowCount, colCount = args.cellRange.colCount;
                 let maxRow = orgRow + rowCount - 1, maxCol = orgCol + colCount -1;
@@ -769,12 +771,7 @@
                         crossedDatas.push(crossedData);
                     }
                 }
-                console.log(`uncrossedDatas`);
-                console.log(uncrossedDatas);
-                console.log(`crossedDatas`);
-                console.log(crossedDatas);
                 let pasteDatas = tools.encapData(uncrossedDatas, crossedDatas, controller, totalJobs);
-                console.log(pasteDatas);
                 if(pasteDatas.updateDatas.length > 0 || pasteDatas.createDatas.length > 0){
                     billsAjax.pasteRel(userAccount, billsLibId, pasteDatas.updateDatas, pasteDatas.createDatas, 'jobs', function(datas){
                         pasteController.frontOperator(sheet, setting, controller, totalJobs, datas);

web/maintain/bills_lib/scripts/db_controller.js

@@ -113,7 +113,6 @@ var dbController = {
                     //nextSibling children
                 }
                 //更新选中节点
-                console.log(selNodes);
                 for(let i = 0; i < selNodes.length; i++){
                     let selNode = selNodes[i];
                     let oprSectionInfo = tools.getSectionInfo(firstParent);
@@ -355,7 +354,7 @@ var dbController = {
     },
     onEditEnded: function (sender, args) {
         let controller = dbController.controller;
-        var node = controller.tree.selected, updateId, field;
+        var node = controller.tree.items[args.row], updateId, field;
         if(node){
             updateId = node.getID();
             field = billsLibSetting.cols[args.col].data.field;
@@ -1032,8 +1031,6 @@ var tools = {
         let updateDatas = [];
         let createDatas = [];
         let nodeId = controller.tree.selected.getID();
-        console.log(`totalJobs`);
-        console.log(totalJobs);
         uncrossedDatas.forEach(obj => {
             let cnDataObj, ceDataObj, content, jobId;
             let isExisit = tools.isExist(totalJobs.jobsArr, 'content', obj.data, null);