Trang chủ Khám phá Trợ giúp
Đăng nhập
SmartCost
/
ConstructionCost
2
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

customize config

TonyKang 7 năm trước cách đây
mục cha
4ba6b0da70
commit
ac3182cb40
7 tập tin đã thay đổi với 44 bổ sung và 3 xóa
Split View Hiển thị tình trạng sai khác
  1. 1 1
      modules/reports/controllers/rpt_controller.js
  2. 1 1
      modules/reports/facade/rpt_cust_cfg_facade.js
  3. 14 0
      modules/reports/routes/rpt_tpl_router_fe.js
  4. 1 0
      web/building_saas/main/html/main.html
  5. 1 1
      web/building_saas/report/html/rpt_main.html
  6. 10 0
      web/building_saas/report/html/rpt_print.html
  7. 16 0
      web/building_saas/report/js/rpt_print.js

+ 1 - 1
modules/reports/controllers/rpt_controller.js
Xem Tập Tin 

@@ -231,7 +231,7 @@ function getAllPagesCommon(user_id, prj_id, rpt_id, pageSize, orientation, custo
 
                     let maxPages = printCom.totalPages;
 
                     let pageRst = printCom.outputAsSimpleJSONPageArray(rptTpl, tplData, 1, maxPages, defProperties);
 
                     if (pageRst) {
 
-                        fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/testBuiltPageResult.jsp");
 
+                        // fsUtil.writeObjToFile(pageRst, "D:/GitHome/ConstructionCost/tmp/testBuiltPageResult.jsp");
 
                         cb(null, pageRst);
 
                     } else {
 
                         cb('Have errors while on going...', null);

+ 1 - 1
modules/reports/facade/rpt_cust_cfg_facade.js
Xem Tập Tin 

@@ -20,5 +20,5 @@ async function getCustomizeCfg(userIds) {
 
 
 async function saveCustomizeCfg(custCfg) {
 
     let filter = {"userId": custCfg.userId};
 
-    return await rpt_customize_cfg_mdl.update(filter, custCfg);
 
+    return await rpt_customize_cfg_mdl.update(filter, custCfg, {upsert: true});
 
 }

+ 14 - 0
modules/reports/routes/rpt_tpl_router_fe.js
Xem Tập Tin 

@@ -7,6 +7,20 @@ let rptTplRouter = express.Router();
 
 import reportTplController from "./../controllers/rpt_tpl_controller";
 
 
 module.exports = function (app) {
 
+    app.get('/rpt_print',  function(req, res) {
 
+        if (!req.session.sessionUser.id) {
 
+            res.redirect('/login');
 
+        }
 
+        else {
 
+            res.render('building_saas//report/html/rpt_print.html',
 
+                {
 
+                    userAccount: req.session.userAccount,
 
+                    userID: req.session.sessionUser.id
 
+                }
 
+            );
 
+        }
 
+    });
 
+
 
     rptTplRouter.post('/getRptTplTree', reportTplController.getRptTplTree);
 
 
     app.use("/report_tpl_api", rptTplRouter);

+ 1 - 0
web/building_saas/main/html/main.html
Xem Tập Tin 

@@ -1166,6 +1166,7 @@
 
         <script type="text/javascript" src="/web/building_saas/report/js/rpt_cfg_const.js"></script>
 
         <script type="text/javascript" src="/web/building_saas/report/js/jpc_output_value_define.js"></script>
 
         <script type="text/javascript" src="/web/building_saas/report/js/jpc_output.js"></script>
 
+        <script type="text/javascript" src="/web/building_saas/report/js/rpt_print.js"></script>
 
         <script type="text/javascript" src="/web/building_saas/main/js/views/character_content_view.js"></script>
 
         <script type="text/javascript" src="/web/building_saas/main/js/views/glj_view.js"></script>
 
         <script type="text/javascript" src="/web/building_saas/main/js/views/sub_view.js"></script>

+ 1 - 1
web/building_saas/report/html/rpt_main.html
Xem Tập Tin 

@@ -16,7 +16,7 @@
 
                 <div class="print-toolsbar">
 
                     <div class="panel">
 
                         <div class="panel-body">
 
-                            <button class="btn btn-secondary btn-sm" type="button" onclick="">
 
+                            <button class="btn btn-secondary btn-sm" type="button" onclick="rptPrintHelper.preview()">
 
                                 <i class="fa fa-print"></i><br>打印
 
                             </button>
 
                             <button class="btn btn-secondary btn-sm" type="button"  href="#export" data-toggle="modal" data-target="#export">

+ 10 - 0
web/building_saas/report/html/rpt_print.html
Xem Tập Tin 

@@ -0,0 +1,10 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <title>PrintPreview</title>
 
+</head>
 
+<body>
 
+
 
+</body>
 
+</html>

+ 16 - 0
web/building_saas/report/js/rpt_print.js
Xem Tập Tin 

@@ -0,0 +1,16 @@
 
+/**
 
+ * Created by Tony on 2018/4/24.
 
+ */
 
+
 
+let rptPrintHelper = {
 
+    preview: function () {
 
+        if (zTreeOprObj.currentRptPageRst) {
 
+            window.location.href = '/rpt_print';
 
+        } else {
 
+            //
 
+        }
 
+    },
 
+    print: function () {
 
+        //
 
+    }
 
+};