瀏覽代碼

定额章节树ID改成唯一ID

zhongzewei 7 年之前
父節點
當前提交
8d73d70052

+ 6 - 0
modules/ration_repository/controllers/ration_section_tree_controller.js

@@ -23,6 +23,12 @@ class RationChapterTreeController extends BaseController{
             })
             })
         }
         }
     }
     }
+    getNewRationTreeID(req, res){
+        rationChapterTreeData.getNewRationTreeID(function (err, data) {
+            callback(req, res, err, '', data);
+        });
+
+    }
     createNewNode(req, res){
     createNewNode(req, res){
         var libId = req.body.rationLibId;
         var libId = req.body.rationLibId;
         var lastNodeId = req.body.lastNodeId;
         var lastNodeId = req.body.lastNodeId;

+ 11 - 0
modules/ration_repository/models/ration_section_tree.js

@@ -18,6 +18,17 @@ rationChapterTreeDAO.prototype.getRationChapterTree = function(rationLibId,callb
     })
     })
 }
 }
 
 
+rationChapterTreeDAO.prototype.getNewRationTreeID = function (callback) {
+    counter.counterDAO.getIDAfterCount(counter.moduleName.rationTree, 1, function(err, result){
+        if(err){
+            callback(err, null);
+        }
+        else{
+            callback(0, result.value.sequence_value);
+        }
+    });
+};
+
 rationChapterTreeDAO.prototype.getRationChapterTreeByRepId = function(repId,callback){
 rationChapterTreeDAO.prototype.getRationChapterTreeByRepId = function(repId,callback){
     rationChapterTreeModel.find({"rationRepId": repId, "$or": [{"isDeleted": null}, {"isDeleted": false} ]},function(err,data){
     rationChapterTreeModel.find({"rationRepId": repId, "$or": [{"isDeleted": null}, {"isDeleted": false} ]},function(err,data){
         if(data.length) callback(0,data);
         if(data.length) callback(0,data);

+ 1 - 0
modules/ration_repository/routes/ration_rep_routes.js

@@ -38,6 +38,7 @@ module.exports =  function (app) {
     apiRouter.post("/getLibIDByName",rationRepositoryController.auth, rationRepositoryController.init, rationRepositoryController.getLibIDByName);
     apiRouter.post("/getLibIDByName",rationRepositoryController.auth, rationRepositoryController.init, rationRepositoryController.getLibIDByName);
 
 
     apiRouter.post("/getRationTree",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.getRationChapterTree);
     apiRouter.post("/getRationTree",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.getRationChapterTree);
+    apiRouter.post("/getNewRationTreeID",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.getNewRationTreeID);
     apiRouter.post("/createNewNode",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.createNewNode);
     apiRouter.post("/createNewNode",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.createNewNode);
     apiRouter.post("/updateNodes",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.updateNodes);
     apiRouter.post("/updateNodes",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.updateNodes);
     apiRouter.post("/deleteNodes",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.deleteNodes);
     apiRouter.post("/deleteNodes",rationChapterTreeController.auth, rationChapterTreeController.init, rationChapterTreeController.deleteNodes);

+ 25 - 20
web/maintain/ration_repository/js/section_tree.js

@@ -277,27 +277,32 @@ let sectionTreeObj = {
         let me = this;
         let me = this;
         me.insertBtn.addClass('disabled');
         me.insertBtn.addClass('disabled');
         let postData = [];
         let postData = [];
-        let newID = me.tree.newNodeID();
-        let selected = me.tree.selected;
-        let insertObj = me.getUpdateObj(me.updateType.new, newID, -1, -1, '', null);
-        if(me.isDef(selected)) {
-            let updateObj = me.getUpdateObj(me.updateType.update, selected.getID(), newID, null, null, null);
-            postData.push(updateObj);
-            insertObj.updateData.ParentID = selected.getParentID();
-            if(me.isDef(selected.nextSibling)){
-                insertObj.updateData.NextSiblingID = selected.getNextSiblingID();
+        CommonAjax.post('api/getNewRationTreeID', {}, function (newID) {
+            if(!me.isDef(newID)){
+                return;
             }
             }
-        }
-        postData.push(insertObj);
-        if(postData.length > 0){
-            //ajax
-            me.sectionTreeAjax(postData, function (rstData) {
-                me.controller.insert();
-                me.refreshBtn(me.tree.selected);
-                //fresh tools
-                me.initTools(me.tree.selected);
-            });
-        }
+            me.tree.maxNodeID(newID - 1);
+            let selected = me.tree.selected;
+            let insertObj = me.getUpdateObj(me.updateType.new, newID, -1, -1, '', null);
+            if(me.isDef(selected)) {
+                let updateObj = me.getUpdateObj(me.updateType.update, selected.getID(), newID, null, null, null);
+                postData.push(updateObj);
+                insertObj.updateData.ParentID = selected.getParentID();
+                if(me.isDef(selected.nextSibling)){
+                    insertObj.updateData.NextSiblingID = selected.getNextSiblingID();
+                }
+            }
+            postData.push(insertObj);
+            if(postData.length > 0){
+                //ajax
+                me.sectionTreeAjax(postData, function (rstData) {
+                    me.controller.insert();
+                    me.refreshBtn(me.tree.selected);
+                    //fresh tools
+                    me.initTools(me.tree.selected);
+                });
+            }
+        });
     },
     },
     remove: function (selected) {
     remove: function (selected) {
         let me = this;
         let me = this;