提交页面

app/base/base_controller.js

@@ -25,6 +25,14 @@ class BaseController extends Controller {
         this.jsValidator = this.app.jsValidator;
         // 当前菜单
         ctx.menu = menuList[ctx.controllerName] === undefined ? {} : menuList[ctx.controllerName];
+        ctx.title = '';
+        if (ctx.menu.children !== undefined) {
+            for (const index in ctx.menu.children) {
+                if (index === ctx.actionName) {
+                    ctx.title = ctx.menu.children[index].name;
+                }
+            }
+        }
         // 菜单列表
         ctx.menuList = menuList;
         ctx.showProject = false;

app/controller/ledger_controller.js

@@ -75,6 +75,28 @@ module.exports = app => {
 
             ctx.body = responseData;
         }
+
+        /**
+         * 台账变更页面
+         *
+         * @param {object} ctx - egg全局变量
+         * @return {void}
+         */
+        async change(ctx) {
+            const renderData = {};
+            await this.layout('ledger/change.ejs', renderData);
+        }
+
+        /**
+         * 计量台账页面
+         *
+         * @param {object} ctx - egg全局变量
+         * @return {void}
+         */
+        async index(ctx) {
+            const renderData = {};
+            await this.layout('ledger/index.ejs', renderData);
+        }
     }
 
     return LedgerController;

app/controller/measure_controller.js

@@ -0,0 +1,42 @@
+'use strict';
+
+/**
+ * 计量相关控制器
+ *
+ * @author olym
+ * @date 2018/2/11
+ * @version
+ */
+
+module.exports = app => {
+
+    class MeasureController extends app.BaseController {
+
+        /**
+         * 构造函数
+         *
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        constructor(ctx) {
+            super(ctx);
+            ctx.showProject = true;
+            ctx.showTender = true;
+            ctx.showTitle = false;
+        }
+
+        /**
+         * 中间计量页面
+         *
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        async middle(ctx) {
+            const renderData = {};
+            await this.layout('measure/middle.ejs', renderData);
+        }
+
+    }
+
+    return MeasureController;
+};

app/router.js

@@ -34,6 +34,8 @@ module.exports = app => {
     // 台账管理相关
     app.get('/ledger/explode', sessionAuth, 'ledgerController.explode');
     app.post('/ledger/get-children', sessionAuth, 'ledgerController.getChildren');
+    app.get('/ledger/change', sessionAuth, 'ledgerController.change');
+    app.get('/ledger/index', sessionAuth, 'ledgerController.index');
 
     // 个人账号相关
     app.get('/profile/info', sessionAuth, 'profileController.info');
@@ -45,4 +47,7 @@ module.exports = app => {
     // 标段管理相关
     app.get('/tender', sessionAuth, 'tenderController.index');
     app.post('/tender/add', sessionAuth, datetimeFill, 'tenderController.add');
+
+    // 计量管理相关
+    app.get('/measure/middle', sessionAuth, 'measureController.middle');
 };

app/view/layout/layout.ejs

@@ -33,7 +33,7 @@
     <% } %>
     <% if(ctx.showTitle) { %>
     <div class="poj-name">
-        <span class="name"><%= ctx.menu.name %></span>
+        <span class="name"><%= ctx.title %></span>
     </div>
     <% } %>
     <div class="header-box">

app/view/layout/menu.ejs

@@ -12,7 +12,7 @@
                     <% } %>
                 </a>
                 <% if (ctx.menuList[index].children !== null) { %>
-                <ul class="sub-menu">
+                <ul class="sub-menu" <% if(ctx.controllerName === index) { %>style="display: block;"<% }%>>
                     <% for (const childIndex in ctx.menuList[index].children) { %>
                     <li><a href="<%= ctx.menuList[index].children[childIndex].url %>"><%= ctx.menuList[index].children[childIndex].name %></a></li>
                     <% } %>

app/view/layout/modal.ejs

@@ -45,4 +45,29 @@
             </div>
         </div>
     </div>
+</div>
+
+<!--弹出新建台帐变更-->
+<div class="modal fade" id="add-bg" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">新建变更</h5>
+            </div>
+            <div class="modal-body">
+                <div class="form-group">
+                    <label>变更编号<b class="text-danger">*</b></label>
+                    <input class="form-control"  value="0006" type="text" readonly>
+                </div>
+                <div class="form-group">
+                    <label>变更名称<b class="text-danger">*</b></label>
+                    <input class="form-control"  placeholder="输入标段名称" type="text">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="button" class="btn btn-primary">确定新建</button>
+            </div>
+        </div>
+    </div>
 </div>

app/view/ledger/change.ejs

@@ -0,0 +1,98 @@
+<div class="panel-content">
+    <div class="panel-title fluid">
+        <div class="title-main  d-flex justify-content-between"><!--工具-->
+            <div>
+                <div class="btn-group">
+                    <input type="month" class="form-control form-control-sm mt-0">
+                </div>
+                <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                        <option>全部</option>
+                        <option>草稿</option>
+                        <option>审批中</option>
+                        <option>退回</option>
+                        <option>完成</option>
+                        <option>作废</option>
+                    </select>
+                </div>
+            </div>
+            <div>
+                <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm">新建变更</a>
+            </div>
+        </div>
+    </div>
+    <div class="content-wrap">
+        <div class="c-body">
+            <table class="table table-bordered">
+                <thead>
+                <tr>
+                    <th>编号</th>
+                    <th>变更名称</th>
+                    <th>创建时间</th>
+                    <th>提交人</th>
+                    <th>状态</th>
+                    <th>处理时间</th>
+                    <th>操作</th>
+                </tr>
+                </thead>
+                <tr>
+                    <td>0001</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏1</a></td>
+                    <td>2017-11-23</td>
+                    <td>张三</td>
+                    <td>完成</td>
+                    <td>2017-11-25</td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td>0002</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏2</a></td>
+                    <td>2017-11-23</td>
+                    <td>张三</td>
+                    <td>王五 审批中</td>
+                    <td></td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td>0003</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏3</a></td>
+                    <td>2017-11-23</td>
+                    <td>张三</td>
+                    <td>退回</td>
+                    <td>2017-12-06</td>
+                    <td><a href="#" class="btn btn-primary btn-sm">重新上报</a> <a href="#"
+                                                                               class="btn btn-secondary btn-sm">作废</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>0004</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏4</a></td>
+                    <td>2017-11-23</td>
+                    <td>张三</td>
+                    <td>草稿</td>
+                    <td></td>
+                    <td><a href="#" class="btn btn-primary btn-sm">发起审批</a> <a href="#" class="btn btn-primary btn-sm">完成变更</a>
+                    </td>
+                </tr>
+                <tr>
+                    <td>0005</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏5</a></td>
+                    <td>2017-11-23</td>
+                    <td>张三</td>
+                    <td>张三 作废</td>
+                    <td>2017-11-24</td>
+                    <td></td>
+                </tr>
+                <tr>
+                    <td>0005</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏6</a></td>
+                    <td>2017-11-23</td>
+                    <td>张三</td>
+                    <td></td>
+                    <td></td>
+                    <td><a href="#" class="btn btn-danger btn-sm">删除</a></td>
+                </tr>
+            </table>
+        </div>
+    </div>
+</div>

app/view/ledger/index.ejs

@@ -1,105 +1,104 @@
-<div class="panel-sidebar">
-    <div class="panel-title">
-        <div class="title-bar d-flex justify-content-between">
-            <h2>标段列表</h2>
-            <div class="mr-3">
-                <a href="#add-bd" data-toggle="modal" data-target="#add-bd" class="btn btn-sm btn-outline-primary">添加</a>
-            </div>
-        </div>
-    </div>
-    <div class="scrollbar-auto">
-        <div class="nav-box">
-            <ul class="nav-list list-unstyled">
-                <% tenderList.forEach(function(tender) {%>
-                <li <% if (currentTender === tender.id) { %>class="active"<% } %>><a href="/ledger?tender=<%= tender.id %>"><span><%= tender.name %></span></a></li>
-                <% }) %>
-            </ul>
-        </div>
-    </div>
-</div>
 <div class="panel-content">
-    <div class="panel-title">
-        <div class="title-main">
-            <h2>WWUJ-2 台帐
-                <a href="#" class="btn btn-primary btn-sm pull-right">上报审批</a>
-                <a href="#" class="btn btn-outline-secondary btn-sm pull-right disabled">已报审</a>
-                <a href="#" class="btn btn-outline-danger btn-sm pull-right">删除标段</a></h2>
-        </div>
-    </div>
-    <div class="content-wrap row">
-        <div class="c-header p-0 col-12 d-flex justify-content-between">
-            <!--工具-->
+    <div class="panel-title fluid">
+        <div class="title-main  d-flex justify-content-between"><!--工具-->
             <div>
-                <div class="form-check">
-                    <label class="form-check-label">
-                        <input type="checkbox" class="form-check-input">
-                        查看审批过程
-                    </label>
+                <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                        <option>第 15 期</option>
+                        <option>第 14 期</option>
+                        <option>第 13 期</option>
+                        <option>第 12 期</option>
+                        <option>第 11 期</option>
+                    </select>
+                </div>
+                <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                        <option>终审 王五</option>
+                        <option>2审 赵四</option>
+                        <option>1审 张三</option>
+                    </select>
+                </div>
+                <div class="btn-group">
+                    <div class="form-check-inline">
+                        <label class="form-check-label">
+                            <input class="form-check-input" type="checkbox">
+                            审批结果比较
+                        </label>
+                    </div>
                 </div>
             </div>
-            <!--标准清单-->
-            <ul class="nav nav-tabs">
-                <li class="nav-item">
-                    <a class="nav-link active" data-toggle="tab" href="#xiangmujie" role="tab">项目节</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="tab" href="#qingdan" role="tab">工程量清单</a>
-                </li>
-            </ul>
+            <div>
+            </div>
         </div>
-        <div class="c-body col-8">
+    </div>
+    <div class="content-wrap">
+        <div class="c-body">
             <table class="table table-bordered">
+                <thead>
                 <tr>
-                    <th></th>
-                    <th>项目节编号</th>
-                    <th>清单编号</th>
-                    <th>名称</th>
-                    <th>单位</th>
-                    <th>单价</th>
-                    <th>施工图原设计</th>
-                    <th>图（册）号</th>
-                    <th>备注</th>
+                    <th rowspan="2">1</th>
+                    <th rowspan="2">项目节编号</th>
+                    <th rowspan="2">清单编号</th>
+                    <th rowspan="2">名称</th>
+                    <th rowspan="2">单位</th>
+                    <th rowspan="2">单价</th>
+                    <th colspan="2">0号台帐合同</th>
+                    <th colspan="2">本期合同计量</th>
+                    <th colspan="3">本期数量变更计量</th>
+                    <th colspan="2">本期完成计量</th>
+                    <th colspan="2">截止本期合同计量</th>
+                    <th colspan="2">截止本期数量变更</th>
+                    <th colspan="2">截止本期完成计量</th>
+                    <th rowspan="2">图（册）号</th>
+                    <th rowspan="2">累计完成率(%)</th>
+                    <th rowspan="2">备注</th>
                 </tr>
+                <tr>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>变更令</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                </tr>
+                </thead>
+            </table>
+            <!--审批结果比较-->
+            <table class="table table-bordered">
+                <thead>
+                <tr>
+                    <th rowspan="2">1</th>
+                    <th rowspan="2">项目节编号</th>
+                    <th rowspan="2">清单编号</th>
+                    <th rowspan="2">名称</th>
+                    <th rowspan="2">单位</th>
+                    <th rowspan="2">单价</th>
+                    <th colspan="2">上报</th>
+                    <th colspan="2">1审 张三</th>
+                    <th colspan="2">2审 赵四</th>
+                    <th colspan="2">终审 王五</th>
+                </tr>
+                <tr>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                    <th>数量</th>
+                    <th>金额</th>
+                </tr>
+                </thead>
             </table>
-        </div>
-        <div class="c-body col-4">
-            <div class="tab-content">
-                <div id="xiangmujie" class="tab-pane active">
-                    <select class="form-control form-control-sm">
-                        <option>0号计量台帐部位参考(项目节)</option>
-                    </select>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th></th>
-                            <th>项目节编号</th>
-                            <th>名称</th>
-                            <th>单位</th>
-                        </tr>
-                    </table>
-                </div>
-                <div id="qingdan" class="tab-pane">
-                    <select class="form-control form-control-sm">
-                        <option>0号计量台帐部位参考(项目节)</option>
-                    </select>
-                    <table class="table table-bordered">
-                        <tr>
-                            <th></th>
-                            <th>清单编号</th>
-                            <th>名称</th>
-                            <th>单位</th>
-                        </tr>
-                    </table>
-                </div>
-            </div>
         </div>
     </div>
-</div>
-<script type="text/javascript">
-    let rule = '<%- rule %>';
-    rule = JSON.parse(rule);
-
-    let message = {
-    };
-</script>
-<script src="/public/js/form_validate.js"></script>
-<script src="/public/js/validate.extend.js"></script>
+</div>

app/view/measure/middle.ejs

@@ -0,0 +1,45 @@
+<div class="panel-content">
+    <div class="panel-title fluid">
+        <div class="title-main d-flex justify-content-between">
+            <div>
+                <select class="form-control form-control-sm">
+                    <option>全部</option>
+                    <option>编制中</option>
+                    <option>审批中</option>
+                    <option>审批完成</option>
+                </select>
+            </div>
+            <div>
+                <a href="#" class="btn btn-primary btn-sm pull-right">添加计量</a>
+            </div>
+        </div>
+    </div>
+    <div class="content-wrap">
+        <div class="c-body">
+            <div class="tab-content">
+                <table class="table table-bordered">
+                    <thead>
+                    <tr>
+                        <th>计量编号</th>
+                        <th>计量金额</th>
+                        <th>计量月份</th>
+                        <th>计量期数</th>
+                        <th>状态</th>
+                        <th>当前处理人</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td><a href="jiliang-detail.html">WWUJ-2-201710</a></td>
+                        <td>34234234.00</td>
+                        <td>201710</td>
+                        <td>15</td>
+                        <td>审批中</td>
+                        <td>监理-张三</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>

package-lock.json

@@ -2753,9 +2753,9 @@
       }
     },
     "egg-js-validator": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/egg-js-validator/-/egg-js-validator-1.0.0.tgz",
-      "integrity": "sha512-jH2FfhNiVfkHHBuWKpZ2zzjktaXSVKlJ9jrQH3i2mkCho1hpeaoRmpuELRu/gjVsYm99tKwNJSFywwDLt7SoZA=="
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/egg-js-validator/-/egg-js-validator-1.0.2.tgz",
+      "integrity": "sha512-Gs1wpAONFsfgXENP6ZrMx3yRFJ8cJf4RyFxUChgAJSxzVsNc/ba4RHbroSpyGrp2TvZDoUDVHtR94yBmr2mukw=="
     },
     "egg-jsonp": {
       "version": "1.2.2",

package.json

@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "egg": "^1.13.0",
-    "egg-js-validator": "^1.0.0",
+    "egg-js-validator": "^1.0.2",
     "egg-mysql": "^3.0.0",
     "egg-redis": "^1.0.2",
     "egg-scripts": "^1.0.0",