修复冲突

modules/ration_repository/controllers/ration_repository_controller.js

@@ -76,10 +76,10 @@ class RationRepositoryController extends baseController {
             }
         })
     }
-
-    getRationLib(req, res) {
-        let libId = req.body.libId;
-        rationRepository.getRationLib(libId, function (err, data) {
+    getRationLib(req, res){
+        let data = JSON.parse(req.body.data);
+        let libId = data.libId;
+        rationRepository.getRationLib(libId, function(err, data){
             if (data) {
                 callback(req, res, err, "has data", data);
             } else {

modules/ration_repository/models/repository_map.js

@@ -156,7 +156,7 @@ rationRepositoryDao.prototype.getRationLib = function(libId, callback) {
         if (err) {
             callback( 'Error', null);
         } else {
-            callback( false, data);
+            callback(0, data);
         }
     });
 };

web/maintain/ration_repository/js/ration.js

@@ -47,11 +47,6 @@ let rationOprObj = {
     buildSheet: function(container) {
         let rationRepId = getQueryString("repository");
         let me = rationOprObj;
-        let gljLibID = storageUtil.getSessionCache("gljLib", "repositoryID_" + rationRepId);
-        if(!gljLibID || typeof gljLibID === 'undefined' || gljLibID == -1){
-            alert("没有引用工料机库！");
-            window.location.href = "/rationRepository/main";
-        }
         me.workBook = sheetCommonObj.buildSheet(container, me.setting, 30);
         me.getRationsCodes(rationRepId);
         me.rationDelOpr();

web/maintain/ration_repository/js/section_tree.js

@@ -4,27 +4,39 @@
 let pageOprObj = {
     rationLibName : null,
     rationLibId : null,
+    gljLibId: null,
     initPage : function() {
-        var me = this, rationLibId = getQueryString("repository"),//获取定额库参数
-            rationLibName = storageUtil.getSessionCache("RationGrp","repositoryID_" + rationLibId);
-        if (rationLibName) {
-            var html = $("#rationname")[0].outerHTML;
-            html = html.replace("XXX定额库", rationLibName);
-            $("#rationname")[0].outerHTML = html;
-            me.rationLibName = rationLibName;
-            me.rationLibId = rationLibId;
-            sectionTreeObj.getSectionTree(rationLibId);
-            //job
-            jobContentOprObj.radiosChange(jobContentOprObj.radios, jobContentOprObj.tableAll, jobContentOprObj.tablePartial);
-            $('#addConBtn').click(jobContentOprObj.bindAddConBtn());
-            $('#updateConBtn').click(jobContentOprObj.bindUpdateConBtn());
-            jobContentOprObj.bindAllEvents($('#txtareaAll'));
-            //fz
-            annotationOprObj.radiosChange(annotationOprObj.radios, annotationOprObj.fzTableAll, annotationOprObj.fzTablePartial);
-            $('#fzAddConBtn').click(annotationOprObj.bindAddConBtn());
-            $('#fzUpdateConBtn').click(annotationOprObj.bindUpdateConBtn());
-            annotationOprObj.bindAllEvents($('#fzTxtareaAll'));
-        }
+        let me = this, rationLibId = getQueryString("repository");
+        me.getRationLibInfo(rationLibId, function (rstData) {
+            if(rstData.length > 0){
+                me.rationLibName = rstData[0].dispName;
+                me.gljLibId = rstData[0].gljLib;
+                if(!me.gljLibId || typeof me.gljLibId === 'undefined' || me.gljLibId == -1){
+                    alert("没有引用工料机库！");
+                    window.location.href = "/rationRepository/main";
+                }
+                if (me.rationLibName) {
+                    var html = $("#rationname")[0].outerHTML;
+                    html = html.replace("XXX定额库", me.rationLibName);
+                    $("#rationname")[0].outerHTML = html;
+                    me.rationLibId = rationLibId;
+                    sectionTreeObj.getSectionTree(rationLibId);
+                    //job
+                    jobContentOprObj.radiosChange(jobContentOprObj.radios, jobContentOprObj.tableAll, jobContentOprObj.tablePartial);
+                    $('#addConBtn').click(jobContentOprObj.bindAddConBtn());
+                    $('#updateConBtn').click(jobContentOprObj.bindUpdateConBtn());
+                    jobContentOprObj.bindAllEvents($('#txtareaAll'));
+                    //fz
+                    annotationOprObj.radiosChange(annotationOprObj.radios, annotationOprObj.fzTableAll, annotationOprObj.fzTablePartial);
+                    $('#fzAddConBtn').click(annotationOprObj.bindAddConBtn());
+                    $('#fzUpdateConBtn').click(annotationOprObj.bindUpdateConBtn());
+                    annotationOprObj.bindAllEvents($('#fzTxtareaAll'));
+                }
+            }
+        });
+    },
+    getRationLibInfo: function (rationLibId, callback) {
+        CommonAjax.post('api/getRationLib', {libId: rationLibId}, callback);
     }
 }