git提交出问题

public/web/idTree.js

@@ -66,11 +66,8 @@ var idTree = {
                     nodes[i].nextSibling = (i === nodes.length - 1) ? null : nodes[i + 1];
                 }
             },
-<<<<<<< HEAD
             // ��nodes�У���iIndex����������ʼȫ���Ƴ�
-=======
             // 在nodes中，从iIndex（包括）开始全部移除
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
             removeNodes: function (tree, parent, iIndex, count) {
                 var children = parent ? parent.children : tree.roots;
                 var pre = (iIndex < 0 || iIndex >= children.length) ? null : children[iIndex].preSibling;
@@ -88,11 +85,8 @@ var idTree = {
                     children.splice(iIndex, children.length - iIndex);
                 }
             },
-<<<<<<< HEAD
             // ��nodes������addNodes, λ�ô�index��ʼ
-=======
             // 在parent.children/tree.roots中增加nodes, 位置从index开始
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
             addNodes: function (tree, parent, nodes, iIndex) {
                 var children = parent ? parent.children : tree.roots;
                 var pre, next, i;
@@ -145,11 +139,8 @@ var idTree = {
         };
 
         var Node = function (tree, data) {
-<<<<<<< HEAD
             // ���µ����ԣ�����Ԫ�������ֱ���޸�
-=======
             // 以下的属性，本单元外均不可直接修改
->>>>>>> bc0f5d2858a5b09273a8d6ed5620a4deb05293b2
             this.tree = tree;
             this.data = data;
             this.children = [];

web/billsLib/html/qingdan.html

@@ -287,6 +287,8 @@
         //刷新节点可进行操作的按钮
         refreshBtn(controller);
         controller.setTreeSelected(controller.tree.findNode(controller.sheet.getTag(0, 0)));
+       // console.log(controller.sheet.getTag(0, 0));
+        //console.log(controller.tree.selected.getID());
         /*//节点操作
         nodeOpration(controller, totalJobs, totalItems);*/
         //补注内容改变

web/billsLib/scripts/dbController.js

@@ -6,6 +6,8 @@ var dbController = {
         if(controller.tree.items.length === 0){
             controller.tree.maxNodeID(0);
             controller.insert();
+            controller.tree.selected.jobs = new Array();
+            controller.tree.selected.items = new Array();
             billsAjax.createBills(billsLibId, controller.tree.selected.getID(), -1 , -1);
         }
         else {
@@ -13,6 +15,8 @@ var dbController = {
             if(node){
                 var updateId = node.getID(), createpid = node.getParentID(), createnid = node.getNextSiblingID();
                 controller.insert();
+                controller.tree.selected.jobs = new Array();
+                controller.tree.selected.items = new Array();
                 billsAjax.createBills(billsLibId, node.getNextSiblingID(), createpid, createnid, function(){
                     billsAjax.updatePNId(billsLibId, [{ID: updateId, NextSiblingID: node.getNextSiblingID()}]);
                     rechargeController.createRecharge(controller.tree.selected);
@@ -22,6 +26,8 @@ var dbController = {
                 var updateNode = controller.tree.roots[controller.tree.roots.length - 1];
                 var updateId = updateNode.getID();
                 controller.insert();
+                controller.tree.selected.jobs = new Array();
+                controller.tree.selected.items = new Array();
                 billsAjax.createBills(billsLibId, updateNode.getNextSiblingID(), -1, -1, function(){
                     billsAjax.updatePNId(billsLibId, [{ID: updateId, NextSiblingID: updateNode.getNextSiblingID()}]);
                     rechargeController.createRecharge(controller.tree.selected);
@@ -237,7 +243,7 @@ var createObj = {
             });
             if(nodes){
                 nodes.forEach(function(node){
-                    tools.addAttr(node.jobs);
+                    node.jobs = new Array();
                     node.data.jobs.forEach(function(jobId){
                         if(me.jobs[me.prefix + jobId]){
                             node.jobs.push(me.jobs[me.prefix + jobId]);
@@ -294,7 +300,7 @@ var createObj = {
             });
             if(nodes){
                 nodes.forEach(function(node){
-                    tools.addAttr(node.items);
+                    node.items = new Array();
                     node.data.items.forEach(function(itemID){
                         if(me.items[me.prefix + itemID]){
                             node.items.push(me.items[me.prefix + itemID]);
@@ -442,7 +448,6 @@ var tools = {
        }
        arr.sort(compare(attr));
     },
-
     reshowData: function(sheet, arr, setting, isResort){
         tools.clearData(sheet);
         if(isResort){
@@ -586,7 +591,7 @@ var jobsController = {
                 totalJobs.jobs[totalJobs.prefix + id] = newJob;
                 totalJobs.jobsArr.push(newJob);
                 billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'jobs', id);
-                tools.addAttr(controller.tree.selected.jobs);
+                //tools.addAttr(controller.tree.selected.jobs);
                 controller.tree.selected.jobs.push(newJob);
                 tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);
             });
@@ -603,7 +608,7 @@ var jobsController = {
                 //isExist = true;
                 billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'jobs', job.data.id);
                 //整合
-                tools.addAttr(controller.tree.selected.jobs);
+               // tools.addAttr(controller.tree.selected.jobs);
                 job.count++;
                 controller.tree.selected.jobs.push(job);
                 tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);
@@ -611,7 +616,7 @@ var jobsController = {
             else if(field == 'code' && newData == job.data.code){
                 //isExist = true;
                 billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'jobs', job.data.id);
-                tools.addAttr(controller.tree.selected.jobs);
+                //tools.addAttr(controller.tree.selected.jobs);
                 job.count++;
                 controller.tree.selected.jobs.push(job);
                 tools.reshowData(sheet, controller.tree.selected.jobs, setting, true);
@@ -653,7 +658,7 @@ var jobsController = {
                     totalJobs.jobs[totalJobs.prefix + newId] = newJob;
                     totalJobs.jobsArr.push(newJob);
                     billsAjax.updateBillsArr(billsLibId, controller.tree.selected.getID(), id, newId, 'update', 'jobs');
-                    tools.addAttr(controller.tree.selected.jobs);
+                   // tools.addAttr(controller.tree.selected.jobs);
                     var index = tools.getIndex(controller.tree.selected.jobs, id);
                     controller.tree.selected.jobs.splice(index, 1);
                     controller.tree.selected.jobs.splice(index, 0, newJob);
@@ -724,7 +729,7 @@ var itemsController = {
                 totalItems.items[totalItems.prefix + id] = newItem;
                 totalItems.itemsArr.push(newItem);
                 billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'items', id);
-                tools.addAttr(controller.tree.selected.items);
+               // tools.addAttr(controller.tree.selected.items);
                 controller.tree.selected.items.push(newItem);
                 tools.reshowData(sheet, controller.tree.selected.items, setting, true);
             });
@@ -741,7 +746,7 @@ var itemsController = {
                 //isExist = true;
                 billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'items', item.data.id);
                 //整合
-                tools.addAttr(controller.tree.selected.items);
+                //tools.addAttr(controller.tree.selected.items);
                 item.count++;
                 controller.tree.selected.items.push(item);
                 tools.reshowData(sheet, controller.tree.selected.items, setting, true);
@@ -749,7 +754,7 @@ var itemsController = {
             else if(field == 'code' && newData == item.data.code){
                 //isExist = true;
                 billsAjax.updateBills(billsLibId, controller.tree.selected.getID(), 'items', item.data.id);
-                tools.addAttr(controller.tree.selected.items);
+               // tools.addAttr(controller.tree.selected.items);
                 item.count++;
                 controller.tree.selected.items.push(item);
                 tools.reshowData(sheet, controller.tree.selected.items, setting, true);
@@ -791,7 +796,7 @@ var itemsController = {
                     totalItems.items[totalItems.prefix + newId] = newItem;
                     totalItems.itemsArr.push(newItem);
                     billsAjax.updateBillsArr(billsLibId, controller.tree.selected.getID(), id, newId, 'update', 'items');
-                    tools.addAttr(controller.tree.selected.items);
+                 //   tools.addAttr(controller.tree.selected.items);
                     var index = tools.getIndex(controller.tree.selected.items, id);
                     controller.tree.selected.items.splice(index, 1);
                     controller.tree.selected.items.splice(index, 0, newItem);