定额库消除getSessionCache相关

modules/ration_repository/controllers/repository_views_controller.js

@@ -80,7 +80,8 @@ class ViewsController extends BaseController{
                 redirectCoe: redirectCoe,
                 redirectInstallation: redirectInstallation,
                 LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
-                priceProperties: JSON.stringify(priceProperties)
+                priceProperties: JSON.stringify(priceProperties),
+                rationLib: stdRationLib
             });
     }
     redirectCoeList(req, res){
@@ -98,11 +99,12 @@ class ViewsController extends BaseController{
                 LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
             });
     }
-    redirectInstallation(req, res){
+    async redirectInstallation(req, res){
         const repId = req.query.repository;
         const redirectGlj = `/rationRepository/lmm?repository=${repId}`;
         const redirectCoe = `/rationRepository/coeList?repository=${repId}`;
         const redirectRation = `/rationRepository/ration?repository=${repId}`;
+        let stdRationLib = await rationLibModel.findOne({ID: repId});
         res.render('maintain/ration_repository/anzhuang.html',
             {
                 userAccount: req.session.managerData.username,
@@ -110,7 +112,8 @@ class ViewsController extends BaseController{
                 redirectGlj: redirectGlj,
                 redirectCoe: redirectCoe,
                 redirectRation: redirectRation,
-                LicenseKey:config.getLicenseKey(process.env.NODE_ENV)
+                LicenseKey:config.getLicenseKey(process.env.NODE_ENV),
+                rationLib: stdRationLib
             });
     }
 }

web/maintain/ration_repository/anzhuang.html

@@ -17,7 +17,7 @@
     <div class="header">
         <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
             <span class="header-logo px-2">Smartcost</span>
-            <div class="navbar-text" id="rationname"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
+            <div class="navbar-text" id="rationname"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i><%= rationLib.dispName %></div>
         </nav>
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">

web/maintain/ration_repository/gongliao.html

@@ -25,7 +25,7 @@
     <div class="header">
         <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
             <span class="header-logo px-2">Smartcost</span>
-            <div id="rationname" class="navbar-text"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i>XXX定额库</div>
+            <div id="rationname" gljLib="<%= rationLib.gljLib %>" class="navbar-text"><a href="main">定额库</a><i class="fa fa-angle-right fa-fw"></i><%= rationLib.dispName %></div>
         </nav>
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
               <ul class="nav nav-tabs" role="tablist">

web/maintain/ration_repository/js/coe.js

@@ -168,18 +168,7 @@ function loadZmhsAdjSize(resizeObj) {
     });
 }
 var pageObj = {
-    libID: null,
-    gljLibID: null,
     initPage: function (){
-        var libID = getQueryString("repository");
-        var libName = storageUtil.getSessionCache("RationGrp","repositoryID_" + libID);
-        if (libName) {
-            var html = $("#rationname")[0].outerHTML;
-            html = html.replace("XXX定额库", libName);
-            $("#rationname")[0].outerHTML = html;
-        };
-        this.gljLibID = storageUtil.getSessionCache("gljLib", "repositoryID_" + libID);
-        this.libID = libID;
         coeOprObj.buildSheet($('#mainSpread')[0]);
         gljAdjOprObj.buildSheet($('#contentSpread')[0]);
         coeOprObj.getCoeList();
@@ -302,7 +291,7 @@ let coeOprObj = {
             //insert
             else{
                 let newCoe = {};
-                newCoe.libID = pageObj.libID;
+                newCoe.libID = pageOprObj.rationLibId;
                 if(dataCode === 'serialNo'){
                     if(me.isInt(inputT) && !me.hasTisNo(me.currentCoeList, inputT)){
                         me.currentMaxNo = me.currentMaxNo >= inputT ? me.currentMaxNo : inputT;
@@ -381,7 +370,7 @@ let coeOprObj = {
                 else {
                     uniqItems[i].serialNo = ++me.currentMaxNo;
                 }
-                uniqItems[i].libID = pageObj.libID;
+                uniqItems[i].libID = pageOprObj.rationLibId;
                 addArr.push(uniqItems[i]);
             }
         }
@@ -482,7 +471,7 @@ let coeOprObj = {
         $.ajax({
             type: 'post',
             url: '/rationRepository/api/getCoeList',
-            data: {libID: pageObj.libID},
+            data: {libID: pageOprObj.rationLibId},
             dataType: 'json',
             timeout:20000,
             success: function (result) {
@@ -831,7 +820,7 @@ let gljAdjOprObj = {
         $.ajax({
             type: 'post',
             url: '/stdGljRepository/api/getGljItemsOccupied',
-            data: {repId: pageObj.gljLibID, occupation: '-_id code name specs'},
+            data: {repId: pageOprObj.gljLibId, occupation: '-_id code name specs'},
             dataType: 'json',
             timeout: 5000,
             success:function(result){

web/maintain/ration_repository/js/installation.js

@@ -153,12 +153,6 @@ let feeItemObj = {
             this.sheet.options.clipBoardOptions = GC.Spread.Sheets.ClipboardPasteOptions.values;
             this.bindEvents(this.sheet);
             this.rationRepId = parseInt(getQueryString("repository"));
-            let libName = storageUtil.getSessionCache("RationGrp","repositoryID_" + this.rationRepId);
-            if (libName) {
-                let html = $("#rationname")[0].outerHTML;
-                html = html.replace("XXX定额库", libName);
-                $("#rationname")[0].outerHTML = html;
-            }
             //init combo
             this.setCombo(this.sheet, 1, this.setting.comboItems.feeType);
             //init sectionSpread
@@ -1154,9 +1148,6 @@ let batchSectionObj = {
         let url = 'api/getRationTree';
         let postData = {rationLibId: repId};
         let sucFunc = function (rstData) {
-            if(rstData.length > 0){
-                storageUtil.setSessionCache("RationGrp","repositoryID",rstData[0].rationRepId);
-            }
             //init
             me.buildSheet();
             me.initTree(rstData);

web/maintain/ration_repository/js/ration_assist.js

@@ -23,7 +23,6 @@ var rationAssistOprObj = {
     buildSheet: function(sheet) {
         var me = this;
         me.sheet = sheet;
-        //me.libID = storageUtil.getSessionCache("RationGrp","repositoryID"); // 不可靠，有时取不到
         me.libID = pageOprObj.rationLibId; // 不可靠，有时取不到
         if (me.libID == undefined){me.libID = getQueryString('repository')};
 

web/maintain/ration_repository/js/ration_coe.js

@@ -23,7 +23,6 @@ var rationCoeOprObj = {
     buildSheet: function(sheet) {
         var me = this;
         me.sheet = sheet;
-        //me.libID = storageUtil.getSessionCache("RationGrp","repositoryID"); // 不可靠，有时取不到
         me.libID = pageOprObj.rationLibId; // 不可靠，有时取不到
         if (me.libID == undefined){me.libID = getQueryString('repository')};
         sheetCommonObj.initSheet(me.sheet, me.setting, 30);
@@ -31,8 +30,6 @@ var rationCoeOprObj = {
         me.sheet.bind(GC.Spread.Sheets.Events.ClipboardPasted, me.onClipboardPasted);
         me.sheet.bind(GC.Spread.Sheets.Events.EditStarting, me.onEditStarting);
         me.sheet.bind(GC.Spread.Sheets.Events.EditEnded, me.onEditEnded);
-        //右键
-        //me.onContextmenuOpr();
     },
 
     isDef: function (v) {

web/maintain/ration_repository/js/repository_glj.js

@@ -3,24 +3,18 @@
  */
 
 var pageOprObj = {
-    rationLibName : null,
-    rationLibId: null,
     initPage : function(container) {
-        var me = this, rationLibId = getQueryString("repository"),//获取定额库参数
-            rationLibName = storageUtil.getSessionCache("RationGrp","repositoryID_" + rationLibId);
-        me.rationLibId = rationLibId;
-        if (rationLibName) {
-            var html = $("#rationname")[0].outerHTML;
-            html = html.replace("XXX定额库", rationLibName);
-            $("#rationname")[0].outerHTML = html;
-            me.rationLibName = rationLibName;
+        this.libID = parseInt(getQueryString("repository"));
+        var me = this;
+        if (this.libID) {
             repositoryGljObj.buildSheet(container);
-            repositoryGljObj.getRationGljIds(rationLibId);
+            repositoryGljObj.getRationGljIds(me.libID);
             repositoryGljObj.getGljDistType(function () {
-                repositoryGljObj.currentRepositoryId = parseInt(rationLibId);
+                repositoryGljObj.currentRepositoryId = parseInt(me.libID);
                 //引用的工料机库
-                let gljLibID = storageUtil.getSessionCache("gljLib", "repositoryID_" + rationLibId);
+                let gljLibID = $('#rationname').attr('gljLib');
                 if(gljLibID && typeof gljLibID !== 'undefined'){
+                    gljLibID = parseInt(gljLibID);
                     repositoryGljObj.getGljTree(gljLibID, function () {
                         repositoryGljObj.getGljItems(gljLibID);
                     });
@@ -669,7 +663,7 @@ repositoryGljObj = {
         $.ajax({
             type: 'post',
             url: 'api/updateRationBasePrc',
-            data:{data: JSON.stringify({repId: pageOprObj.rationLibId, lastOpr: userAccount, basePrcArr: basePrcArr})},
+            data:{data: JSON.stringify({repId: pageOprObj.libID, lastOpr: userAccount, basePrcArr: basePrcArr})},
             dataType: 'json',
             success: function (result) {
                 if(result.error){
@@ -855,7 +849,7 @@ var gljTypeTreeOprObj = {
         $.ajax({
             type:"POST",
             url:"api/deleteGljNodes",
-            data:{"repId": pageOprObj.rationLibId, "lastOpr": userAccount, "nodes": JSON.stringify(nodeIds), "preNodeId": preNodeId, "preNodeNextId": treeNode.NextSiblingID},
+            data:{"repId": pageOprObj.libID, "lastOpr": userAccount, "nodes": JSON.stringify(nodeIds), "preNodeId": preNodeId, "preNodeNextId": treeNode.NextSiblingID},
             dataType:"json",
             cache:false,
             timeout:5000,
@@ -894,7 +888,7 @@ var gljTypeTreeOprObj = {
             $.ajax({
                 type:"POST",
                 url:"api/updateGljNodes",
-                data:{"repId": pageOprObj.rationLibId, "lastOpr": userAccount, "nodes": JSON.stringify(reqData)},
+                data:{"repId": pageOprObj.libID, "lastOpr": userAccount, "nodes": JSON.stringify(reqData)},
                 dataType:"json",
                 cache:false,
                 timeout:5000,

web/maintain/ration_repository/js/section_tree.js

@@ -248,9 +248,6 @@ let sectionTreeObj = {
         let url = 'api/getRationTree';
         let postData = {rationLibId: repId};
         let sucFunc = function (rstData) {
-            if(rstData.length > 0){
-                storageUtil.setSessionCache("RationGrp","repositoryID",rstData[0].rationRepId);
-            }
             //init
             me.buildSheet();
             me.initTree(rstData);