update adjust state

modules/ration_glj/facade/glj_calculate_facade.js

@@ -43,7 +43,7 @@ async function calculateQuantity(query,isMarkPriceAjust){
                  if(times!=0){
                      assRation = await  std_ration_lib_ration_items.findOne({rationRepId:impactRation.libID,code:impactRation.rationAssList[i].assistCode});
                      assList.push({times:times,assRation:assRation})
-                     adjustState.push({index:stateSeq.ass,content:"+"+impactRation.rationAssList[i].assistCode+"x"+times});
+                     adjustState.push({index:stateSeq.ass,content:rationAssList[i].name+" "+rationAssList[i].actualValue+" : +"+impactRation.rationAssList[i].assistCode+"x"+times});
                      }
                  }
          }
@@ -140,7 +140,7 @@ function generateAdjustState(glj,coeList,adjustState) {
             if(i==coeList.length-1){
                 adjustState.push({index:stateSeq.cusCoe,content:coeList[i].content});
             }else {
-                adjustState.push({index:stateSeq.coe,content:coeList[i].content});
+                adjustState.push({index:stateSeq.coe,content:"调 : "+coeList[i].content});
             }
         }
     }

modules/ration_glj/facade/ration_coe_facade.js

@@ -215,13 +215,11 @@ function generationContent(coes) {
     if(_.every(coes,'amount',rationAmount)){
         string = coes[0].coeType + 'x'+rationAmount;
     }else {
+        let context_arr =[];
         for(let i =1;i<coes.length;i++){
-            if(i==1){
-                string = coes[i].coeType + 'x'+coes[i].amount;
-            }else {
-                string +=', '+coes[i].coeType + 'x'+coes[i].amount;
-            }
+            context_arr.push( coes[i].coeType + 'x'+coes[i].amount);
         }
+        string = context_arr.join(',');
 
     }
     return string;

modules/users/routes/boot_route.js

@@ -8,10 +8,11 @@
 import express from "express";
 import BootController from "../controllers/boot_controller";
 
-let router = express.Router();
-let bootController = new BootController();
+module.exports=function (app){
+    let router = express.Router();
+    let bootController = new BootController();
 
 // 引导页面
-router.get('/:area', bootController.boot);
-
-module.exports = router;
+    router.get('/:area', bootController.boot);
+    app.use('/boot', router);
+};

modules/users/routes/login_route.js

@@ -8,19 +8,20 @@
 import express from "express";
 import LoginController from "../controllers/login_controller";
 
-let router = express.Router();
-let loginController = new LoginController();
 
-// 登录页面action
-router.get('/login', loginController.index);
-router.get('/', loginController.index);
+module.exports = function (app) {
+    let  router = express.Router();
+    let loginController = new LoginController();
+    // 登录页面action
+    router.get('/login', loginController.index);
+    router.get('/', loginController.index);
 
 // 登录操作
-router.post('/login', loginController.login);
+    router.post('/login', loginController.login);
 
-router.get("/logout", function (req, res) {
-    delete req.session.sessionUser;
-    res.redirect("/");
-});
-
-module.exports = router;
+    router.get("/logout", function (req, res) {
+        delete req.session.sessionUser;
+        res.redirect("/");
+    });
+    app.use('/',router)
+};

modules/users/routes/user_route.js

@@ -8,12 +8,14 @@
 import Express from "express";
 import UserController from "../controllers/user_controller";
 
-const router = Express.Router();
-const userController = new UserController();
+module.exports = function (app) {
 
-// action定义区域
-router.get('/info', userController.info);
-router.get('/safe', userController.safe);
-router.post('/info', userController.saveData);
+    const router = Express.Router();
+    const userController = new UserController();
 
-module.exports = router;
+// action定义区域
+    router.get('/info', userController.info);
+    router.get('/safe', userController.safe);
+    router.post('/info', userController.saveData);
+    app.use('/user',router);
+};

server.js

@@ -73,9 +73,16 @@ app.use(function (req, res, next) {
 });
 
 // 用户相关路由区域
-app.use('/', require("./modules/users/routes/login_route"));
-app.use('/boot', require("./modules/users/routes/boot_route"));
-app.use('/user', require("./modules/users/routes/user_route"));
+//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);
+
+
+
+
+
 
 // 项目工料机相关
 app.use('/glj', require("./modules/glj/routes/glj_router"));