Strona główna Odkrywaj Pomoc
Zaloguj się
SmartCost
/
ConstructionOperation
2
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

开放清单规则给 财审一 账号使用

lishihao 3 lat temu
rodzic
7f00c6fc83
commit
e18d821bd9
6 zmienionych plików z 77 dodań i 8 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 2 2
      modules/bills_lib/controllers/bills_lib_controllers.js
  2. 13 1
      modules/bills_lib/models/bills_lib_interfaces.js
  3. 1 1
      modules/users/controllers/login_controller.js
  4. 8 0
      web/maintain/billsGuidance_lib/html/main.html
  5. 49 4
      web/maintain/bills_lib/html/main.html
  6. 4 0
      web/maintain/bills_lib/scripts/bills_lib_ajax.js

+ 2 - 2
modules/bills_lib/controllers/bills_lib_controllers.js
Wyświetl plik 

@@ -36,8 +36,8 @@ module.exports = {
 
     },
 
     getStdBillsLib: function(req, res){
 
         billsLibDao.getStdBillsLib(function(err, message, stdBillsLib){
 
-            callback(req, res, err, message, stdBillsLib );
 
-        });
 
+            callback(req, res, err, message, stdBillsLib);
 
+        },req.session.managerData.isTemporary);
 
     },
 
     createStdBillsLib: function(req, res){
 
         let data = JSON.parse(req.body.data);

+ 13 - 1
modules/bills_lib/models/bills_lib_interfaces.js
Wyświetl plik 

@@ -138,8 +138,18 @@ billsLibDao.prototype.getABillsLib = function(data, callback){
 
 };
 
 
 
-billsLibDao.prototype.getStdBillsLib = function(callback){
 
+billsLibDao.prototype.getStdBillsLib = function(callback,isTemporary){
 
    // let userId = data.userId;
 
+   if(isTemporary){
 
+    StdBillsLib.find({deleted: false,billsLibId:590}, "-_id", function(err, data){
 
+        if(err){
 
+            callback(1, "Error", null);
 
+        }
 
+        else{
 
+            callback(0, "", data);
 
+        }
 
+    });
 
+   }else{
 
     StdBillsLib.find({deleted: false}, "-_id", function(err, data){
 
         if(err){
 
             callback(1, "Error", null);
 
@@ -148,6 +158,8 @@ billsLibDao.prototype.getStdBillsLib = function(callback){
 
             callback(0, "", data);
 
         }
 
     });
 
+   }
 
+    
 };
 
 
 billsLibDao.prototype.createStdBillsLibSync = async function (userName, libName ,libType) {

+ 1 - 1
modules/users/controllers/login_controller.js
Wyświetl plik 

@@ -216,7 +216,7 @@ class LoginController extends BaseController {
 
                 loginTime: currentTime,
 
                 sessionToken: sessionToken,
 
                 userID: managerData.id,
 
-                toolPermission: managerData.isTemporary ? 'billsGuidance' : toolPermissionController.join(','),
 
+                toolPermission: managerData.isTemporary ? 'billsGuidance,stdBillsmain,stdBills,stdBillsEditor' : toolPermissionController.join(','),
 
                 toolMenuData: toolMenuData,
 
                 toolAllPermission: toolAllPermission.join(','),
 
                 menuData: menuData,

+ 8 - 0
web/maintain/billsGuidance_lib/html/main.html
Wyświetl plik 

@@ -41,6 +41,14 @@
 
     <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 " style="display: flex; justify-content: space-between;">
 
       <span class="header-logo px-2"><%= manager.isTemporary ? '清单精灵编辑器' : '清单指引编辑器' %></span>
 
       <% if (manager.isTemporary)  { %>
 
+        <div style="cursor: pointer;">
 
+          <a href="/stdBillsmain">
 
+            <span>切换到清单规则编辑器</span>
 
+        </a>
 
+          
+        </div>
 
+      <% } %>
 
+      <% if (manager.isTemporary)  { %>
 
               <div class="avatar btn-group">
 
                   <a class="dropdown-toggle" data-toggle="dropdown">
 
                       <span><%= manager.username %></span>

+ 49 - 4
web/maintain/bills_lib/html/main.html
Wyświetl plik 

@@ -9,14 +9,57 @@
 
     <link rel="stylesheet" href="/lib/bootstrap/css/bootstrap.min.css">
 
     <link rel="stylesheet" href="/web/maintain/bills_lib/css/main.css">
 
     <link rel="stylesheet" href="/lib/font-awesome/font-awesome.min.css">
 
+    <style>
 
+        .avatar {
 
+          display: flex;
 
+          align-items: center;
 
+          height: 38px;
 
+          cursor: pointer;
 
+          padding: 0 20px;
 
+        }
 
+        .avatar:hover {
 
+          text-decoration: none;
 
+          box-shadow: inset 0 3px 5px rgb(0 0 0 / 13%);
 
+        }
 
+        .avatar .dropdown-menu a {
 
+          display: block;
 
+          padding: 3px 20px;
 
+          clear: both;
 
+          font-weight: 400;
 
+          line-height: 1.42857143;
 
+          color: #333;
 
+          white-space: nowrap;
 
+        }
 
+      </style>
 
+    <script>
 
+        const isTemporary = '<%- manager.isTemporary %>';
 
+      </script>
 
 </head>
 
 
 <body>
 
     <div class="header">
 
-        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 ">
 
+        <nav class="navbar navbar-toggleable-lg navbar-light bg-faded p-0 "  style="display: flex; justify-content: space-between;">
 
             <span class="header-logo px-2">清单规则编辑器</span>
 
-            <div class="navbar-text"></div>
 
+            <% if (manager.isTemporary)  { %>
 
+                <div style="cursor: pointer;">
 
+                    <a href="/billsGuidance/main">
 
+                        <span>切换到清单精灵编辑器</span>
 
+                    </a>
 
+                </div>
 
+            <% } %>
 
+            <% if (manager.isTemporary)  { %>
 
+                <div class="avatar btn-group">
 
+                    <a class="dropdown-toggle" data-toggle="dropdown">
 
+                        <span><%= manager.username %></span>
 
+                    </a>
 
+                    <ul class="dropdown-menu dropdown-menu-right">
 
+                        <li><a href="/login/logout">退出登录</a></li>
 
+                    </ul>
 
+                </div>
 
+            <% } %>
 
         </nav>
 
+       
+        <% if (!manager.isTemporary)  { %>
 
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
 
           <ul class="nav navbar-nav px-1">
 
                           <li class="nav-item">
 
@@ -24,7 +67,9 @@
 
                           </li>
 
                       </ul>
 
         </nav>
 
+        <% } %>
 
     </div>
 
+   
     <div class="main">
 
         <div class="content">
 
             <div class="container-fluid">
 
@@ -38,8 +83,8 @@
 
                                 <th>清单规则类型</th>
 
                                 <th width="160">添加时间</th>
 
                                 <th width="70">操作</th>
 
-                                <th width="90">导入</th>
 
-                                <th width="90">复制</th>
 
+                                <% if (!manager.isTemporary)  { %><th width="90" >导入</th> <% } %>
 
+                                <% if (!manager.isTemporary)  { %><th width="90">复制</th><% } %>
 
                             </tr>
 
                         </thead>
 
                         <tbody id="showArea">

+ 4 - 0
web/maintain/bills_lib/scripts/bills_lib_ajax.js
Wyświetl plik 

@@ -63,16 +63,20 @@ var mainAjax = {
 
                     <td>${libTypeName}</td>
 
                     <td>${createDateFmt}</td>
 
                     <td>
 
+                    ${ isTemporary !== 'true' ? `
 
                         <a class="lock-btn-control disabled" data-toggle="modal" data-target="#edit" href="javascript:void(0);" title="编辑"><i class="fa fa-pencil-square-o"></i></a>
 
                         <a class="text-danger lock-btn-control disabled" data-toggle="modal" data-target="#del" href="javascript:void(0);" title="删除"><i class="fa fa-remove"></i></a>
 
+                    ` : '' }
 
                         <a class="lock" data-locked="true" href="javascript:void(0);" title="解锁"><i class="fa fa-unlock-alt"></i></a>
 
                     </td>
 
+                    ${ isTemporary !== 'true' ? `
 
                     <td>
 
                         <a class="btn btn-secondary btn-sm import-data lock-btn-control disabled" data-id="${id}" href="javascript:void(0);" title="导入数据"><i class="fa fa-sign-in fa-rotate-90"></i>导入</a>
 
                     </td>
 
                     <td>
 
                         <a class="btn btn-secondary btn-sm copy-data lock-btn-control disabled" data-id="${id}" data-type="${libType}" href="javascript:void(0);" title="复制数据"><i class="fa fa-clone"></i>复制</a>
 
                     </td>
 
+                    ` : '' }
 
                  </tr>`;
 
             return acc += html;
 
         }, '');