zhangweicheng 8 gadi atpakaļ
vecāks
revīzija
c71cab0cd6

+ 33 - 28
modules/bills_lib/routes/bills_lib_routes.js

@@ -1,33 +1,38 @@
 /**
  * Created by vian on 2017/3/17.
  */
-var express = require("express");
-var billsController = require("./../controllers/bills_lib_controllers");
-var billsRouter =express.Router();
+let express = require("express");
+module.exports = function (app) {
+    let billsController = require("./../controllers/bills_lib_controllers");
+    let billsRouter =express.Router();
+
+    billsRouter.post('/getMaxNumber', billsController.getMaxNumber);
+    billsRouter.post('/getABillsLib', billsController.getABillsLib);
+    billsRouter.post("/getStdBillsLib", billsController.getStdBillsLib);
+    billsRouter.post("/createStdBillsLib", billsController.createStdBillsLib);
+    billsRouter.post("/deleteStdBillsLib", billsController.deleteStdBillsLib);
+    billsRouter.post("/renameStdBillsLib", billsController.renameStdBillsLib);
+    billsRouter.post("/getStdBillsLibName", billsController.getStdBillsLibName);
+    billsRouter.post("/getBills", billsController.getBills);
+    billsRouter.post("/createBills", billsController.createBills);
+    billsRouter.post("/updatePNId", billsController.updatePNId);
+    billsRouter.post("/updateBills", billsController.updateBills);
+    billsRouter.post("/updateBillsArr", billsController.updateBillsArr);
+    billsRouter.post("/pasteBills", billsController.pasteBills);
+    billsRouter.post('/updateRecharge', billsController.updateRecharge);
+    billsRouter.post("/deleteBills", billsController.deleteBills);
+    billsRouter.post("/getJobContent", billsController.getJobContent);
+    billsRouter.post("/createJobContent", billsController.createJobContent);
+    billsRouter.post("/updateJobContent", billsController.updateJobContent);
+    billsRouter.post("/deleteJobContent", billsController.deleteJobContent);
+    billsRouter.post("/getItemCharacter", billsController.getItemCharacter);
+    billsRouter.post("/createItemCharacter", billsController.createItemCharacter);
+    billsRouter.post("/updateItemCharacter", billsController.updateItemCharacter);
+    billsRouter.post("/updateValue", billsController.updateValue);
+    billsRouter.post("/deleteItemCharacter", billsController.deleteItemCharacter);
+
+    app.use("/stdBillsEditor", billsRouter);
+};
+
 
-billsRouter.post('/getMaxNumber', billsController.getMaxNumber);
-billsRouter.post('/getABillsLib', billsController.getABillsLib);
-billsRouter.post("/getStdBillsLib", billsController.getStdBillsLib);
-billsRouter.post("/createStdBillsLib", billsController.createStdBillsLib);
-billsRouter.post("/deleteStdBillsLib", billsController.deleteStdBillsLib);
-billsRouter.post("/renameStdBillsLib", billsController.renameStdBillsLib);
-billsRouter.post("/getStdBillsLibName", billsController.getStdBillsLibName);
-billsRouter.post("/getBills", billsController.getBills);
-billsRouter.post("/createBills", billsController.createBills);
-billsRouter.post("/updatePNId", billsController.updatePNId);
-billsRouter.post("/updateBills", billsController.updateBills);
-billsRouter.post("/updateBillsArr", billsController.updateBillsArr);
-billsRouter.post("/pasteBills", billsController.pasteBills);
-billsRouter.post('/updateRecharge', billsController.updateRecharge);
-billsRouter.post("/deleteBills", billsController.deleteBills);
-billsRouter.post("/getJobContent", billsController.getJobContent);
-billsRouter.post("/createJobContent", billsController.createJobContent);
-billsRouter.post("/updateJobContent", billsController.updateJobContent);
-billsRouter.post("/deleteJobContent", billsController.deleteJobContent);
-billsRouter.post("/getItemCharacter", billsController.getItemCharacter);
-billsRouter.post("/createItemCharacter", billsController.createItemCharacter);
-billsRouter.post("/updateItemCharacter", billsController.updateItemCharacter);
-billsRouter.post("/updateValue", billsController.updateValue);
-billsRouter.post("/deleteItemCharacter", billsController.deleteItemCharacter);
 
-module.exports = billsRouter;

+ 28 - 0
modules/bills_lib/routes/maintain_bills_routes.js

@@ -0,0 +1,28 @@
+/**
+ * Created by chen on 2017/7/17.
+ */
+
+let express = require("express");
+
+
+module.exports = function (app) {
+    app.get("/stdBillsmain", function(req, res){
+        if(!req.session.sessionUser){
+            res.redirect('/login');
+        }
+        else {
+            res.render("maintain/bills_lib/html/main.html",
+                {userAccount: req.session.userAccount,
+                    userID: req.session.sessionUser.ssoId});
+        }
+    });
+    app.get("/stdBills", function(req, res){
+        res.render("maintain/bills_lib/html/qingdan.html");
+    });
+    app.get('/stdJobs', function(req, res){
+        res.render('maintain/bills_lib/html/neirong.html');
+    });
+    app.get('/stdItems', function(req, res){
+        res.render('maintain/bills_lib/html/tezheng.html');
+    });
+};

+ 10 - 7
modules/main/routes/GLJ_route.js

@@ -1,12 +1,15 @@
 /**
  * Created by jimiz on 2017/4/17.
  */
-var express = require('express');
-var GLJRouter = express.Router();
-var GLJController = require('../controllers/GLJ_controller');
+let express = require('express');
 
-GLJRouter.post('/getData', GLJController.getData);
-GLJRouter.post('/getItemTemplate', GLJController.getItemTemplate);
-GLJRouter.post('/allocIDs', GLJController.allocIDs);
+module.exports = function (app) {
+    let GLJRouter = express.Router();
+    let GLJController = require('../controllers/GLJ_controller');
 
-module.exports = GLJRouter;
+    GLJRouter.post('/getData', GLJController.getData);
+    GLJRouter.post('/getItemTemplate', GLJController.getItemTemplate);
+    GLJRouter.post('/allocIDs', GLJController.allocIDs);
+
+    app.use('/glj_bak', GLJRouter);
+};

+ 11 - 7
modules/main/routes/bills_route.js

@@ -1,12 +1,16 @@
 /**
  * Created by jimiz on 2017/4/7.
  */
-var express = require('express');
-var billsRouter = express.Router();
-var billsController = require('../controllers/bills_controller');
+let express = require('express');
+let billsController = require('../controllers/bills_controller');
+
+module.exports = function (app) {
+    let billsRouter = express.Router();
+    billsRouter.post('/getData', billsController.getData);
+    billsRouter.post('/getItemTemplate', billsController.getItemTemplate);
+    billsRouter.post('/allocIDs', billsController.allocIDs);
+    app.use('/bills', billsRouter);
+};
+
 
-billsRouter.post('/getData', billsController.getData);
-billsRouter.post('/getItemTemplate', billsController.getItemTemplate);
-billsRouter.post('/allocIDs', billsController.allocIDs);
 
-module.exports = billsRouter;

+ 10 - 7
modules/main/routes/ration_route.js

@@ -1,12 +1,15 @@
 /**
  * Created by jimiz on 2017/4/7.
  */
-var express = require('express');
-var rationRouter = express.Router();
-var rationController = require('../controllers/ration_controller');
+let express = require('express');
 
-rationRouter.post('/getData', rationController.getData);
-rationRouter.post('/getItemTemplate', rationController.getItemTemplate);
-rationRouter.post('/allocIDs', rationController.allocIDs);
+module.exports = function (app) {
+    let rationRouter = express.Router();
+    let rationController = require('../controllers/ration_controller');
 
-module.exports = rationRouter;
+    rationRouter.post('/getData', rationController.getData);
+    rationRouter.post('/getItemTemplate', rationController.getItemTemplate);
+    rationRouter.post('/allocIDs', rationController.allocIDs);
+
+    app.use('/ration', rationRouter);
+};

+ 27 - 21
modules/ration_repository/routes/ration_front_end_routes.js

@@ -1,33 +1,39 @@
 /**
  * Created by Tony on 2017/6/15.
  */
-var express = require("express");
-var apiRouter =express.Router();
+let express = require("express");
+
+module.exports = function (app) {
+    let apiRouter =express.Router();
 //var _rootDir = __dirname;
 
-var rationRepositoryController = require("../controllers/ration_repository_controller");
-var rationChapterTreeController = require("../controllers/ration_section_tree_controller");
-var rationController = require("../controllers/ration_controller");
-var repositoryGljController = require("../controllers/repository_glj_controller");
-var coeListController = require("../controllers/coe_controller");
-var searchController = require('../controllers/search_controller');
+    var rationRepositoryController = require("../controllers/ration_repository_controller");
+    var rationChapterTreeController = require("../controllers/ration_section_tree_controller");
+    var rationController = require("../controllers/ration_controller");
+    var repositoryGljController = require("../controllers/repository_glj_controller");
+    var coeListController = require("../controllers/coe_controller");
+    var searchController = require('../controllers/search_controller');
+
+    apiRouter.post("/getRationDisplayNames",rationRepositoryController.getDisPlayRationLibs);
+    apiRouter.post("/getRealLibName",rationRepositoryController.getRealLibName);
+    apiRouter.post("/getLibIDByName",rationRepositoryController.getLibIDByName);
+
+    apiRouter.post("/getRationTree",rationChapterTreeController.getRationChapterTree);
+
+    apiRouter.post("/getRationItems",rationController.getRationItemsBySection);
 
-apiRouter.post("/getRationDisplayNames",rationRepositoryController.getDisPlayRationLibs);
-apiRouter.post("/getRealLibName",rationRepositoryController.getRealLibName);
-apiRouter.post("/getLibIDByName",rationRepositoryController.getLibIDByName);
+    apiRouter.post("/getGljTree",repositoryGljController.getGljTree);
+    apiRouter.post("/getGljItems",repositoryGljController.getGljItems);
+    apiRouter.post("/getGljItemsByIds",repositoryGljController.getGljItemsByIds);
+    apiRouter.post("/getGljItemsByCodes",repositoryGljController.getGljItemsByCodes);
 
-apiRouter.post("/getRationTree",rationChapterTreeController.getRationChapterTree);
+    apiRouter.post("/getCoeList",coeListController.getCoeList);
 
-apiRouter.post("/getRationItems",rationController.getRationItemsBySection);
+    apiRouter.post('/getRationItem', searchController.getRationItem);
+    apiRouter.post('/findRation', searchController.findRation);
 
-apiRouter.post("/getGljTree",repositoryGljController.getGljTree);
-apiRouter.post("/getGljItems",repositoryGljController.getGljItems);
-apiRouter.post("/getGljItemsByIds",repositoryGljController.getGljItemsByIds);
-apiRouter.post("/getGljItemsByCodes",repositoryGljController.getGljItemsByCodes);
+    app.use("/rationRepository/api", apiRouter);
+};
 
-apiRouter.post("/getCoeList",coeListController.getCoeList);
 
-apiRouter.post('/getRationItem', searchController.getRationItem);
-apiRouter.post('/findRation', searchController.findRation);
 
-module.exports = apiRouter;

+ 44 - 41
modules/ration_repository/routes/ration_rep_routes.js

@@ -1,46 +1,49 @@
 /**
  * Created by Tony on 2017/4/20.
  */
-var express = require("express");
-var apiRouter =express.Router();
+let express = require("express");
+let apiRouter =express.Router();
 //var _rootDir = __dirname;
+module.exports = function (app) {
+    let rationRepositoryController = require("../controllers/ration_repository_controller");
+    let rationChapterTreeController = require("../controllers/ration_section_tree_controller");
+    let rationController = require("../controllers/ration_controller");
+    let repositoryGljController = require("../controllers/repository_glj_controller");
+    let coeListController = require("../controllers/coe_controller");
+    let searchController = require('../controllers/search_controller');
+
+    apiRouter.post("/getRationDisplayNames",rationRepositoryController.getDisPlayRationLibs);
+    apiRouter.post("/editRationLibs",rationRepositoryController.updateRationRepositoryName);
+    apiRouter.post("/addRationRepository",rationRepositoryController.addRationRepository);
+    apiRouter.post("/deleteRationLibs",rationRepositoryController.deleteRationLib);
+    apiRouter.post("/getRealLibName",rationRepositoryController.getRealLibName);
+    apiRouter.post("/getLibIDByName",rationRepositoryController.getLibIDByName);
+
+    apiRouter.post("/getRationTree",rationChapterTreeController.getRationChapterTree);
+    apiRouter.post("/createNewNode",rationChapterTreeController.createNewNode);
+    apiRouter.post("/updateNodes",rationChapterTreeController.updateNodes);
+    apiRouter.post("/deleteNodes",rationChapterTreeController.deleteNodes);
+
+    apiRouter.post("/getRationItems",rationController.getRationItemsBySection);
+    apiRouter.post("/mixUpdateRationItems",rationController.mixUpdateRationItems);
+
+    apiRouter.post("/createNewGljTypeNode",repositoryGljController.createNewGljTypeNode);
+    apiRouter.post("/updateGljNodes",repositoryGljController.updateGljNodes);
+    apiRouter.post("/deleteGljNodes",repositoryGljController.deleteGljNodes);
+    apiRouter.post("/getGljTree",repositoryGljController.getGljTree);
+    apiRouter.post("/getGljItems",repositoryGljController.getGljItems);
+    apiRouter.post("/mixUpdateGljItems",repositoryGljController.mixUpdateGljItems);
+    apiRouter.post("/getGljItemsByIds",repositoryGljController.getGljItemsByIds);
+    apiRouter.post("/getGljItemsByCodes",repositoryGljController.getGljItemsByCodes);
+
+    apiRouter.post("/getCoeList",coeListController.getCoeList);
+    apiRouter.post("/saveCoeList",coeListController.saveCoeList);
+    apiRouter.post("/getCoeItemsByIDs",coeListController.getCoeItemsByIDs);
+
+    apiRouter.post('/getRationItem', searchController.getRationItem);
+    apiRouter.post('/findRation', searchController.findRation);
+
+
+};
+
 
-var rationRepositoryController = require("../controllers/ration_repository_controller");
-var rationChapterTreeController = require("../controllers/ration_section_tree_controller");
-var rationController = require("../controllers/ration_controller");
-var repositoryGljController = require("../controllers/repository_glj_controller");
-var coeListController = require("../controllers/coe_controller");
-var searchController = require('../controllers/search_controller');
-
-apiRouter.post("/getRationDisplayNames",rationRepositoryController.getDisPlayRationLibs);
-apiRouter.post("/editRationLibs",rationRepositoryController.updateRationRepositoryName);
-apiRouter.post("/addRationRepository",rationRepositoryController.addRationRepository);
-apiRouter.post("/deleteRationLibs",rationRepositoryController.deleteRationLib);
-apiRouter.post("/getRealLibName",rationRepositoryController.getRealLibName);
-apiRouter.post("/getLibIDByName",rationRepositoryController.getLibIDByName);
-
-apiRouter.post("/getRationTree",rationChapterTreeController.getRationChapterTree);
-apiRouter.post("/createNewNode",rationChapterTreeController.createNewNode);
-apiRouter.post("/updateNodes",rationChapterTreeController.updateNodes);
-apiRouter.post("/deleteNodes",rationChapterTreeController.deleteNodes);
-
-apiRouter.post("/getRationItems",rationController.getRationItemsBySection);
-apiRouter.post("/mixUpdateRationItems",rationController.mixUpdateRationItems);
-
-apiRouter.post("/createNewGljTypeNode",repositoryGljController.createNewGljTypeNode);
-apiRouter.post("/updateGljNodes",repositoryGljController.updateGljNodes);
-apiRouter.post("/deleteGljNodes",repositoryGljController.deleteGljNodes);
-apiRouter.post("/getGljTree",repositoryGljController.getGljTree);
-apiRouter.post("/getGljItems",repositoryGljController.getGljItems);
-apiRouter.post("/mixUpdateGljItems",repositoryGljController.mixUpdateGljItems);
-apiRouter.post("/getGljItemsByIds",repositoryGljController.getGljItemsByIds);
-apiRouter.post("/getGljItemsByCodes",repositoryGljController.getGljItemsByCodes);
-
-apiRouter.post("/getCoeList",coeListController.getCoeList);
-apiRouter.post("/saveCoeList",coeListController.saveCoeList);
-apiRouter.post("/getCoeItemsByIDs",coeListController.getCoeItemsByIDs);
-
-apiRouter.post('/getRationItem', searchController.getRationItem);
-apiRouter.post('/findRation', searchController.findRation);
-
-module.exports = apiRouter;

+ 11 - 5
modules/reports/routes/report_router.js

@@ -3,10 +3,16 @@
  */
 
 let express = require('express');
-let rptRouter = express.Router();
-let reportController = require('./../controllers/rpt_controller');
 
-rptRouter.post('/getReport', reportController.getReportAllPages);
-rptRouter.get('/getExcel/:id/:size/:rptName', reportController.getExcel);
+module.exports = function (app) {
+    let rptRouter = express.Router();
+    let reportController = require('./../controllers/rpt_controller');
+
+    rptRouter.post('/getReport', reportController.getReportAllPages);
+    rptRouter.get('/getExcel/:id/:size/:rptName', reportController.getExcel);
+
+    app.use("/report_api", rptRouter);
+};
+
+
 
-module.exports = rptRouter;

+ 16 - 13
modules/reports/routes/rpt_tpl_router.js

@@ -1,17 +1,20 @@
 let express = require("express");
-let rptTplRouter = express.Router();
-let reportTplController = require('./../controllers/rpt_tpl_controller');
-let reportCfgController = require('./../controllers/rpt_cfg_controller');
+module.exports = function (app) {
+    let rptTplRouter = express.Router();
+    let reportTplController = require('./../controllers/rpt_tpl_controller');
 
-rptTplRouter.post('/createTplTreeNode', reportTplController.createTplTreeNode);
-rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
-rptTplRouter.post('/updateRptTplNodes', reportTplController.updateTreeNodes);
-rptTplRouter.post('/deleteRptTplNodes', reportTplController.deleteRptTplNodes);
-rptTplRouter.post('/createDftRptTpl', reportTplController.createDftRptTpl);
-rptTplRouter.post('/getRefRptTpl', reportTplController.getRefRptTpl);
-rptTplRouter.post('/updateRptTpl', reportTplController.updateRptTpl);
+//let reportCfgController = require('./../controllers/rpt_controller');
+
+    rptTplRouter.post('/createTplTreeNode', reportTplController.createTplTreeNode);
+    rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
+    rptTplRouter.post('/updateRptTplNodes', reportTplController.updateTreeNodes);
+    rptTplRouter.post('/deleteRptTplNodes', reportTplController.deleteRptTplNodes);
+    rptTplRouter.post('/createDftRptTpl', reportTplController.createDftRptTpl);
+    rptTplRouter.post('/getRefRptTpl', reportTplController.getRefRptTpl);
+    rptTplRouter.post('/updateRptTpl', reportTplController.updateRptTpl);
+
+//rptTplRouter.post('/getUserRptCfg', reportCfgController.getReportUserCfg);
+//rptTplRouter.post('/getMappingFields', reportCfgController.getAllMappingFields);
+};
 
-rptTplRouter.post('/getUserRptCfg', reportCfgController.getReportUserCfg);
-rptTplRouter.post('/getMappingFields', reportCfgController.getAllMappingFields);
 
-module.exports = rptTplRouter;

+ 6 - 5
modules/reports/routes/rpt_tpl_router_fe.js

@@ -3,9 +3,10 @@
  * 报表模板路由 - 前台专用(无任何update)
  */
 let express = require("express");
-let rptTplRouter = express.Router();
-let reportTplController = require('./../controllers/rpt_tpl_controller');
+module.exports = function (app) {
+    let rptTplRouter = express.Router();
+    let reportTplController = require('./../controllers/rpt_tpl_controller');
+    rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
 
-rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
-
-module.exports = rptTplRouter;
+    app.use("/report_tpl_api", rptTplRouter);
+};

+ 1 - 1
public/web/sheet/sheet_common.js

@@ -110,7 +110,7 @@ var sheetCommonObj = {
                 //sheet.setStyle(row,col,style,GC.Spread.Sheets.SheetArea.viewport);
                 sheet.setFormatter(-1, col, setting.header[col].formatter, GC.Spread.Sheets.SheetArea.viewport);
             }
-            if(setting.header[col].cellType === "checkBox"){//clear and reset
+            if(setting.header[col].cellType === "checkBox"||setting.header[col].cellType === "button"){//clear and reset
                 var me = this, header = GC.Spread.Sheets.SheetArea.colHeader;
                 sheet.deleteColumns(col,1);
                 sheet.addColumns(col, 1);

+ 4 - 61
server.js

@@ -72,73 +72,16 @@ app.use(function (req, res, next) {
     }
 });
 
-// 用户相关路由区域
-//app.use('/', require("./modules/users/routes/login_route"));
-
-require("./modules/users/routes/login_route")(app);
-require("./modules/users/routes/boot_route")(app);
-require("./modules/users/routes/user_route")(app);
-
-
-// 项目工料机相关
-require("./modules/glj/routes/glj_router")(app);
-
-require('./modules/fee_rates/routes/fee_rates_route')(app);
-
-
-require('./modules/templates/routes/bills_template_router')(app);
-
-
-require('./modules/pm/routes/pm_route')(app);
-
-require('./modules/main/routes/main_route')(app);
-
-require('./modules/main/routes/project_route')(app);
-
-
-let bills_Router = require('./modules/main/routes/bills_route');
-let ration_Router = require('./modules/main/routes/ration_route');
-let GLJ_Router = require('./modules/main/routes/GLJ_route');
-
-app.use('/bills', bills_Router);
-app.use('/ration', ration_Router);
-app.use('/glj_bak', GLJ_Router);
+//加载路由文件
+fileUtils.getGlobbedFiles('./modules/**/routes/*.js').forEach(function(modelPath) {
+    require(path.resolve(modelPath))(app);
+})
 
 //app.use(express.static(_rootDir+"/web"));
 //app.use(express.static(_rootDir+"/lib"));
 //let rations_Router = require("./modules/rationLibEditor/routes/rationLibEditor_route");
 //app.use("/rationLibEditor",rations_Router);
 
-app.get("/stdBillsmain", function(req, res){
-    if(!req.session.sessionUser){
-        res.redirect('/login');
-    }
-    else {
-        res.render("maintain/bills_lib/html/main.html",
-            {userAccount: req.session.userAccount,
-                userID: req.session.sessionUser.ssoId});
-    }
-});
-app.get("/stdBills", function(req, res){
-    res.render("maintain/bills_lib/html/qingdan.html");
-});
-app.get('/stdJobs', function(req, res){
-    res.render('maintain/bills_lib/html/neirong.html');
-});
-app.get('/stdItems', function(req, res){
-    res.render('maintain/bills_lib/html/tezheng.html');
-});
-let billsLibRouter = require("./modules/bills_lib/routes/bills_lib_routes");
-app.use("/stdBillsEditor", billsLibRouter);
-
-let rationRouter = require("./modules/ration_repository/routes/ration_front_end_routes");
-app.use("/rationRepository/api", rationRouter);
-
-let rpt_Router = require("./modules/reports/routes/report_router");
-app.use("/report_api", rpt_Router);
-let rptTpl_Router = require("./modules/reports/routes/rpt_tpl_router_fe");
-app.use("/report_tpl_api", rptTpl_Router);
-
 //-----------------
 
 app.use(function(req, res, next) {

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
web/building_saas/main/html/main.html


+ 3 - 3
web/building_saas/main/js/models/ration_coe.js

@@ -42,7 +42,7 @@ var ration_coe = {
             }else {
                 projectObj.project.ration_coe.datas = data;
             }
-            sheetCommonObj.showData(gljOprObj.coeSheet,gljOprObj.coeSetting,data);
+            gljOprObj.showCoeData(gljOprObj.coeSheet,gljOprObj.coeSetting,data);
             gljOprObj.coeSheetData=data;
             // SheetDataHelper.loadSheetData(setting, rationLibObj.sectionRationsSpread.getActiveSheet(), datas);
         };
@@ -57,13 +57,13 @@ var ration_coe = {
 
             var showList = _.filter(coe_list,{'projectID':data.query.projectID,'rationID':coe_list[coe_index].rationID});
             gljOprObj.coeSheetData=showList;
-           sheetCommonObj.showData(gljOprObj.coeSheet,gljOprObj.coeSetting,showList);
+            gljOprObj.showCoeData(gljOprObj.coeSheet,gljOprObj.coeSetting,showList);
         };
         ration_coe.prototype.refreshAfterDelete=function(data){
             var glj_list = projectObj.project.ration_coe.datas;
             _.remove(glj_list,data.query);
             _.remove(gljOprObj.sheetData,data.query);
-            sheetCommonObj.showData(gljOprObj.coeSheet,gljOprObj.coeSetting,gljOprObj.sheetData);
+            gljOprObj.showCoeData(gljOprObj.coeSheet,gljOprObj.coeSetting,gljOprObj.sheetData);
         };
 
         ration_coe.prototype.getRationCoedata=function(newRation,data){

+ 1 - 0
web/building_saas/main/js/models/ration_glj.js

@@ -74,6 +74,7 @@ var ration_glj = {
             }else {
                 rationID= me.refreshEachItme(data.doc,data.query);
             }
+            //to do   ---refresh by selected ration id
             var showList = _.filter(projectObj.project.ration_glj.datas,{'rationID':rationID});
             gljOprObj.sheetData=showList;
             sheetCommonObj.showData(gljOprObj.sheet,gljOprObj.setting,showList);

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 82 - 40
web/building_saas/main/js/views/glj_view.js