中间计量、期计量静态页面调整

app/controller/measure_controller.js

@@ -26,47 +26,26 @@ module.exports = app => {
         }
 
         /**
-         * 中间计量页面
+         * 中间计量--计量编制 页面
          *
          * @param {Object} ctx - egg全局变量
          * @return {void}
          */
-        async middle(ctx) {
+        async work(ctx) {
             const renderData = {};
-            await this.layout('measure/middle.ejs', renderData);
+            await this.layout('measure/work.ejs', renderData, 'measure/work_modal.ejs');
         }
 
         /**
-         * 期计量页面
+         * 中间计量--计量审批 页面
          *
          * @param {Object} ctx - egg全局变量
          * @return {void}
          */
-        async stage(ctx) {
-            if (ctx.request.query.tenderId) {
-                const tenderId = parseInt(ctx.request.query.tenderId);
-                const tender = await ctx.service.tender.getDataById(tenderId);
-                ctx.session.sessionUser.tenderId = tender.id;
-                ctx.session.sessionUser.tenderName = tender.name;
-
-                ctx.redirect('/measure/stage');
-            } else {
-                let tenderId = ctx.session.sessionUser.tenderId;
-                const tenderInfo = await ctx.service.tender.getDataById(tenderId);
-                const tenderList = await ctx.service.tender.getList();
-                for (const tender of tenderList) {
-                    tender.url = ctx.menuList.measure.children.stage.url + '?tenderId=' + tender.id;
-                }
-                const renderData = {
-                    tenderInfo,
-                    tenderList
-                };
-
-                await this.layout('measure/stage.ejs', renderData, 'measure/stage-modal.ejs');
-            }
-
+        async list(ctx) {
+            const renderData = {};
+            await this.layout('measure/list.ejs', renderData);
         }
-
     }
 
     return MeasureController;

app/controller/stage_controller.js

@@ -0,0 +1,70 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Mai
+ * @date 2018/6/20
+ * @version
+ */
+
+module.exports = app => {
+    class StageController extends app.BaseController {
+        /**
+         * 构造函数
+         *
+         * @param {Object} ctx - egg全局变量
+         * @return {void}
+         */
+        constructor(ctx) {
+            super(ctx);
+            ctx.showProject = true;
+            ctx.showTender = true;
+            ctx.showTitle = true;
+        }
+
+        /**
+         * 期计量页面
+         *
+         @param {Object} ctx - egg全局变量
+         * @returns {Promise<void>}
+         */
+        async index(ctx) {
+            if (ctx.request.query.tenderId) {
+                const tenderId = parseInt(ctx.request.query.tenderId);
+                const tender = await ctx.service.tender.getDataById(tenderId);
+                ctx.session.sessionUser.tenderId = tender.id;
+                ctx.session.sessionUser.tenderName = tender.name;
+
+                ctx.redirect('/stage');
+            } else {
+                let tenderId = ctx.session.sessionUser.tenderId;
+                const tenderList = await ctx.service.tender.getList();
+                for (const tender of tenderList) {
+                    tender.url = ctx.menuList.stage.url + '?tenderId=' + tender.id;
+                }
+
+                if (!tenderId) {
+                    // 根据标段列表获取默认tenderId
+                    if (tenderList && tenderList.length > 0) {
+                        tenderId = tenderList[0].id;
+                        ctx.session.sessionUser.tenderId = tenderId;
+                        ctx.session.sessionUser.tenderName = tenderList[0].name;
+                    } else {
+                        throw '项目无标段数据';
+                    }
+                }
+                const tender = await ctx.service.tender.getDataById(tenderId);
+
+                const renderData = {
+                    tender,
+                    tenderList
+                };
+
+                await this.layout('stage/index.ejs', renderData, 'stage/modal.ejs');
+            }
+        }
+    }
+
+    return StageController;
+};

app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -37,6 +37,7 @@ const SpreadJsObj = {
 
         sheet.options.protectionOptions = option;
         sheet.options.isProtected = true;
+        sheet.options.allowCellOverflow = false;
     },
     /**
      * sheet批量操作优化(sheet操作大批量数据时, 屏蔽数据刷新, 可优化大量时间)
@@ -548,7 +549,8 @@ const SpreadJsObj = {
                             }
                         };
                         // 重定位x
-                        x = x + (node.level + 1) * indent +  (node.level) * levelIndent;
+                        x = x + (node.level + 1) * indent + (node.level) * levelIndent;
+                        w = w - (node.level - 1) * indent - (node.level) * levelIndent;
                     }
                 }
                 // Drawing Text

app/router.js

@@ -72,9 +72,12 @@ module.exports = app => {
     app.post('/tender/save', sessionAuth, datetimeFill, 'tenderController.save');
     app.post('/tender/delete', sessionAuth, datetimeFill, 'tenderController.delete');
 
-    // 计量管理相关
-    app.get('/measure/middle', sessionAuth, 'measureController.middle');
-    app.get('/measure/stage', sessionAuth, 'measureController.stage');
+    // 中间计量管理相关
+    app.get('/measure/work', sessionAuth, 'measureController.work');
+    app.get('/measure/list', sessionAuth, 'measureController.list');
+
+    // 期计量管理相关
+    app.get('/stage', sessionAuth, 'stageController.index');
 
     //标准库相关
     app.post('/std/bills/get-data', sessionAuth, 'stdBillsController.getData');

app/view/ledger/change.ejs

@@ -2,22 +2,14 @@
     <div class="panel-title fluid">
         <div class="title-main  d-flex justify-content-between"><!--工具-->
             <div>
-                <div class="btn-group">
+                <div class="d-inline-block">
                     <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 class="d-inline-block">
+                    <a href="#add-bg" data-toggle="modal" data-target="#add-bg" class="btn btn-primary btn-sm pull-right">新建修订</a>
+                </div>
             </div>
         </div>
     </div>
@@ -36,47 +28,44 @@
                 </tr>
                 </thead>
                 <tr>
-                    <td>0001</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏1</a></td>
+                    <td>0006</td>
+                    <td><a href="taizhang-bg-detail.html">编写错漏6（待修订）</a></td>
                     <td>2017-11-23</td>
                     <td>张三</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>0005</td>
+                    <td><a href="taizhang-bg-detail-shenpi.html">编写错漏5（审批&审批中）</a></td>
                     <td>2017-11-23</td>
                     <td>张三</td>
                     <td>王五 审批中</td>
                     <td></td>
-                    <td></td>
+                    <td><a href="taizhang-bg-detail-shenpi.html" class="btn btn-success btn-sm">审批</a></td>
                 </tr>
                 <tr>
-                    <td>0003</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏3</a></td>
+                    <td>0004</td>
+                    <td><a href="">编写错漏4</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>
+                    <td><a href="taizhang-bg-detail.html" class="btn btn-primary btn-sm">重新上报</a> <a href="#remove"  data-toggle="modal" data-target="#remove" class="btn btn-secondary btn-sm">作废</a></td>
                 </tr>
                 <tr>
-                    <td>0004</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏4</a></td>
+                    <td>0003</td>
+                    <td><a href="taizhang-bg-detail-done.html">编写错漏3(完成)</a></td>
                     <td>2017-11-23</td>
                     <td>张三</td>
-                    <td>草稿</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>0002</td>
+                    <td><a href="">编写错漏2</a></td>
                     <td>2017-11-23</td>
                     <td>张三</td>
                     <td>张三 作废</td>
@@ -84,8 +73,8 @@
                     <td></td>
                 </tr>
                 <tr>
-                    <td>0005</td>
-                    <td><a href="taizhang-bg-detail.html">编写错漏6</a></td>
+                    <td>0001</td>
+                    <td><a href="">编写错漏1</a></td>
                     <td>2017-11-23</td>
                     <td>张三</td>
                     <td></td>

app/view/ledger/change_modal.ejs

@@ -0,0 +1,48 @@
+<!--弹出新建台帐变更-->
+<div class="modal fade" id="add-bg" data-backdrop="static">
+    <div class="modal-dialog" role="document">
+        <form class="modal-content" action="/ledger/change/add" method="post">
+            <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" value="20180525 15:27 修订">
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                <button type="submit" class="btn btn-primary">确定新建</button>
+            </div>
+        </form>
+    </div>
+</div>
+<!--弹出作废-->
+<div class="modal fade" id="remove" 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="alert alert-danger">
+                    编写错漏3 已有审批数据，请谨慎操作；
+                    <br>作废后，审批无法恢复，请谨慎操作；
+                    <br>确认作废，请在以下输入框输入"&nbsp;&nbsp;&nbsp;<b>变更作废</b>&nbsp;&nbsp;&nbsp;"，再点击“确认作废”按钮。
+                </div>
+                <div class="form-group">
+                    <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-danger">确认作废</button>
+            </div>
+        </div>
+    </div>
+</div>

app/view/measure/list.ejs

@@ -0,0 +1,32 @@
+<div class="panel-content">
+    <div class="panel-title fluid">
+        <div class="title-main d-flex justify-content-between">
+            <div>
+                <div class="btn-group" role="group" aria-label="Basic example">
+                    <button type="button" class="btn btn-secondary btn-sm">全部</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm">待上报</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm">审批中</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm">待审批</button>
+                    <button type="button" class="btn btn-outline-secondary btn-sm">审批完成</button>
+                </div>
+            </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-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-muted">待上报</span></td><td>监理-张三</td></tr>
+                    <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><span class="text-warning">审批中</span></td><td>监理-张三</td></tr>
+                    <tr><td><a href="jiliang-approval.html">WWUJ-2-201710</a></td><td>34234234.00</td><td>201710</td><td>第 15 期</td><td><a href="jiliang-approval.html" class="btn-primary btn-sm">审批</a></td><td>监理-张三</td></tr>
+                    <tr><td><a href="jiliang-approval.html">WWUJ-2-201709</a></td><td>34234234.00</td><td>201710</td><td>第 14 期</td><td><span class="text-success">审批完成</span></td><td>业主-王五</td></tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>

app/view/measure/middle.ejs

@@ -1,45 +0,0 @@
-<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>

app/view/measure/work.ejs

@@ -0,0 +1,304 @@
+<div class="panel-content">
+    <div class="panel-title fluid">
+        <div class="title-main d-flex justify-content-between">
+            <div>
+                <div class="btn-group">
+                    <a href="#add-mj" data-toggle="modal" data-target="#add-mj" class="btn btn-primary btn-sm">添加中间计量</a>
+                </div>
+                <div class="btn-group">
+                    <select class="form-control form-control-sm mt-0">
+                        <option>WJQR1-201710</option>
+                        <option>WJQR1-201709</option>
+                        <option>WJQR1-201708(第14期)</option>
+                        <option>WJQR1-201707(第14期)</option>
+                        <option>WJQR1-201706(第13期)</option>
+                        <option>WJQR1-201705(第12期)</option>
+                    </select>
+                </div>
+                <div class="btn-group">
+                    <a href="#setting" data-toggle="modal" data-target="#setting" class="btn btn-outline-primary btn-sm"><i class="fa fa-cog"></i></a>
+                </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 class="form-check-inline">
+                        <label class="form-check-label">
+                            <input class="form-check-input" type="checkbox">
+                            变更令
+                        </label>
+                    </div>
+                </div>
+                <div class="btn-group">
+                    <a href="#add-qd" data-toggle="modal" data-target="#add-qd" class="btn btn-success btn-sm">添加计量清单</a>
+                </div>
+            </div>
+            <div>
+                <a href="#sub-sp" data-toggle="modal" data-target="#sub-sp" class="btn btn-primary btn-sm pull-right">上报审批</a>
+                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-success btn-sm pull-right">审批完成</a>
+                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-secondary btn-sm pull-right">审批中</a>
+                <a href="#sp-list" data-toggle="modal" data-target="#sp-list" class="btn btn-outline-warning btn-sm pull-right text-muted">审批退回</a>
+            </div>
+        </div>
+    </div>
+    <div class="content-wrap row pr-46">
+        <div class="c-header p-0 col-12"></div>
+        <div class="row w-100 sub-content">
+            <div class="c-body col-8">
+                <div class="sjs-height-1">
+                    <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">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>
+                </div>
+            </div>
+            <div class="c-body col">
+                <div class="tab-content">
+                    <div id="biangeng" class="tab-pane active">
+                        <div class="sjs-bar row">
+                            <div class="col-auto">
+                                <select class="form-control form-control-sm">
+                                    <option>全部</option>
+                                    <option>可用变更令</option>
+                                    <option>本次计量已用</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="sjs-height-3">
+                            <table class="table table-bordered">
+                                <tr><th></th><th>批复编号</th><th>名称</th><th>金额</th><th>已执行(%)</th></tr>
+                            </table>
+                        </div>
+                        <div class="sjs-bottom">
+                            <ul class="nav nav-tabs">
+                                <li class="nav-item">
+                                    <a class="nav-link active" data-toggle="tab" href="#qingdan" role="tab">变更清单</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a class="nav-link" data-toggle="tab" href="#detail" role="tab">变更信息</a>
+                                </li>
+                                <li class="nav-item">
+                                    <a class="nav-link" data-toggle="tab" href="#fujian" role="tab">附件</a>
+                                </li>
+                            </ul>
+                            <div class="tab-content">
+                                <div id="qingdan" class="tab-pane active">
+                                    <div class="sjs-bottom-2">
+                                        <table class="table table-bordered">
+                                            <tr><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>数量</th><th>金额</th><th>已变更</th></tr>
+                                        </table>
+                                    </div>
+                                </div>
+                                <div id="detail" class="tab-pane">
+                                    <div class="sjs-bottom-2">
+                                        <div class="form-group">
+                                            <label>批复编号</label>
+                                            <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>申请编号</label>
+                                            <input class="form-control form-control-sm" value="LZTJ-1标项目部发变更(2015)001号" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>工程名称</label>
+                                            <input class="form-control form-control-sm" value="收费站出口右侧加宽段及K0+532基底换填" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>桩号</label>
+                                            <input class="form-control form-control-sm" value="K0+532" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>原设计图名称</label>
+                                            <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>原图号</label>
+                                            <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>变更设计图名称</label>
+                                            <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>变更图号</label>
+                                            <input class="form-control form-control-sm" placeholder="" type="text" readonly>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>工程变更理由及内容</label>
+                                            <textarea class="form-control form-control-sm" rows="6" readonly>由于K0+532涵洞基底土质天然含水率为25%、收费站出口右侧加宽段K0+120-K0+190段基底土质天然含水率为28.8%。含水率较大形成过湿土，地基松软，无法满足承载力要求。经处项目办、设计、监理、施工单位四方勘察，采用抛石挤淤、砂砾换填以达到地基承载力。
+        												</textarea>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>工程变更合同依据</label>
+                                            <textarea class="form-control form-control-sm" rows="6" readonly></textarea>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>备注</label>
+                                            <textarea class="form-control form-control-sm" rows="3" readonly></textarea>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>变更类型</label>
+                                            <div class="checkbox">
+                                                <label class="checkbox-inline">
+                                                    <input id="inlineCheckbox1" value="option1" checked="" type="checkbox" disabled>A.位置
+                                                </label>
+                                                <!-- <label class="checkbox-inline">
+                                                  <input id="inlineCheckbox2" value="option2" type="checkbox">B.数量
+                                                </label>
+                                                <label class="checkbox-inline">
+                                                  <input id="inlineCheckbox3" value="option3" type="checkbox">C.结构
+                                                </label>
+                                                <label class="checkbox-inline">
+                                                  <input id="inlineCheckbox3" value="option3" checked="" type="checkbox">D.新增
+                                                </label>
+                                                <label class="checkbox-inline">
+                                                  <input id="inlineCheckbox3" value="option3" type="checkbox">E.取消
+                                                </label>
+                                                <label class="checkbox-inline">
+                                                  <input id="inlineCheckbox3" value="option3" type="checkbox">F.纠错
+                                                </label> -->
+                                            </div>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>变更类别 </label>
+                                            <select class="form-control form-control-sm" disabled><option>A类变更（设计变更）</option><option>B类变更（施工措施变）</option><option>C类变更（计划变更）</option><option>D类变更（条件变更）</option><option>E类变更（新增工程）</option></select>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>变更性质 </label>
+                                            <select class="form-control form-control-sm" disabled><option>一般设计变更</option><option>较大设计变更</option><option>重大设计变更</option></select>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>变更提出单位</label>
+                                            <!-- <a href="#editcompany" style="float:right;" class="" data-toggle="modal">编辑</a> -->
+                                            <select class="form-control form-control-sm" disabled><option>AA公司</option><option>BB公司</option></select>
+                                        </div>
+                                        <div class="form-group">
+                                            <label>费用承担方</label>
+                                            <div class="radio">
+                                                <label class="radio-inline">
+                                                    <input id="inlineCheckbox1" value="option1" checked="" type="radio" disabled> 业主
+                                                </label>
+                                                <!-- <label class="radio-inline">
+                                                  <input id="inlineCheckbox2" value="option2" type="radio"> 承包人
+                                                </label> -->
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div id="fujian" class="tab-pane">
+                                    <table class="table table-bordered">
+                                        <tr><th>名称</th><th>上传者</th></tr>
+                                        <tr><td><a href="">合同段工程变更现场办公会议纪要的通知.rar</a></td><th>张三</th></tr>
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="jlbiao" class="tab-pane">
+                        <div class="sjs-bar row">
+                            <div class="col-auto"><a href="#" class="btn btn-outline-primary btn-sm">自动生成</a></div>
+                            <div class="col">
+                                <div class="input-group input-group-sm">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text" id="basic-addon3">表号前缀</span>
+                                    </div>
+                                    <input type="text" class="form-control" id="basic-url" aria-describedby="basic-addon3">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="sjs-height-3">
+                            <table class="table table-bordered">
+                                <tr><th>编号</th><th>中间计量表号</th><th>交工证书/凭证表</th></tr>
+                            </table>
+                        </div>
+                        <div class="sjs-bottom">
+                            <div class="form-group">
+                                <label>变更令号：</label>
+                                <input class="form-control form-control-sm" type="text">
+                            </div>
+                            <div class="form-group">
+                                <label>部位：</label>
+                                <input class="form-control form-control-sm" type="text">
+                            </div>
+                            <div class="form-group">
+                                <label>起始桩号：</label>
+                                <input class="form-control form-control-sm" type="text">
+                            </div>
+                            <div class="form-group">
+                                <label>分部分项工程：</label>
+                                <input class="form-control form-control-sm" type="text">
+                            </div>
+                            <div class="form-group">
+                                <label>计量单元：</label>
+                                <input class="form-control form-control-sm" type="text">
+                            </div>
+                            <div class="form-group">
+                                <label>图号：</label>
+                                <input class="form-control form-control-sm" type="text">
+                            </div>
+                            <div class="form-group">
+                                <label>计算式说明：</label>
+                                <textarea class="form-control"></textarea>
+                            </div>
+                            <div class="form-group">
+                                <a href="#edit-img" data-toggle="modal" data-target="#edit-img"  class="pull-right">添加草图</a>
+                                <label>计算草图：</label>
+                                <p class="form-control"><img src="img/sketch/2.png" class="d-100"></p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="side-menu">
+            <!--右侧菜单-->
+            <ul class="nav flex-column right-nav">
+                <li class="nav-item">
+                    <a class="nav-link active" data-toggle="tab" href="#biangeng" role="tab">变更令</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" data-toggle="tab" href="#jlbiao" role="tab">中间计量表</a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</div>

app/view/measure/work_modal.ejs

@@ -0,0 +1,336 @@
+<!--弹出添加中间计量-->
+<div class="modal fade" id="add-mj" 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>
+                    <div class="input-group">
+                        <input type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                        <div class="input-group-append">
+                            <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label>中间计量编号<b class="text-danger">*</b></label>
+                    <div class="input-group">
+                        <input type="text" class="form-control is-invalid" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                        <div class="input-group-append">
+                            <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
+                        </div>
+                        <div class="invalid-feedback">您输入的编号已存在</div>
+                    </div>
+                </div>
+                <div class="form-group">
+                    <label>计量月份</label>
+                    <input data-view="months" data-min-view="months" class="datepicker-here form-control" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh">
+                </div>
+                <div class="form-group">
+                    <label>计量期</label>
+                    <select class="form-control">
+                        <option>选填</option>
+                        <option>15</option>
+                        <option>14</option>
+                    </select>
+                </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>
+<!--弹出添加计量清单-->
+<div class="modal fade" id="add-qd" data-backdrop="static">
+    <div class="modal-dialog modal-lgx" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">添加计量清单</h5>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-3">
+                        <div class="modal-height-500">
+                            侧栏
+                        </div>
+                    </div>
+                    <div class="col-9">
+                        <div class="modal-height-500">
+                            <table class="table table-bordered">
+                                <tr><th>1</th><th>项目节编号</th><th>清单编号</th><th>名称</th><th>单位</th><th>单价</th><th>操作</th></tr>
+                            </table>
+                        </div>
+                    </div>
+                </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>
+<!--审批流程/结果-->
+<div class="modal fade" id="sp-list" 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="card mt-3">
+                    <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                            <span class="text-success pull-right">审批通过</span>
+                            <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                            <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                            <span class="text-warning pull-right">审批中</span>
+                            <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                            <p class="card-text"></p>
+                        </li>
+                        <li class="list-group-item">
+                            <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--首次使用-->
+<div class="modal" id="first">
+    <div class="modal-dialog" role="document" >
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">设置中间计量编号规则</h5>
+            </div>
+            <div class="modal-body">
+                <h5>当前规则：WWUJ2018030001</h5>
+                <h5>
+                    <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                    <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                    <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                </h5>
+                <h5>添加新规则组件</h5>
+                <div class="form-group">
+                    <select class="form-control">
+                        <option>请选择组件</option>
+                        <option>标段名</option>
+                        <option>文本</option>
+                        <option>当前年月</option>
+                        <option>自增编号</option>
+                    </select>
+                </div>
+                <div class="form-group">
+                    <label>自动编号位数</label>
+                    <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                </div>
+                <div class="form-group">
+                    <label>起始编号</label>
+                    <input class="form-control" value="001" type="text">
+                </div>
+                <button class="btn btn-primary">添加组件</button>
+            </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>
+<!--设置-->
+<div class="modal fade" id="setting" 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">
+                <ul class="nav nav-tabs mb-3" role="tablist">
+                    <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href="#profile" role="tab">信息设置</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" data-toggle="tab" href="#rule" role="tab">编号规则</a>
+                    </li>
+                </ul>
+                <div class="tab-content" >
+                    <div class="tab-pane fade show active" id="profile" role="tabpanel">
+                        <div class="form-group">
+                            <label>中间计量编号<b class="text-danger">*</b></label>
+                            <div class="input-group">
+                                <input type="text" class="form-control" placeholder="请输入中间计量编号" value="WJQR1-201711">
+                                <div class="input-group-append">
+                                    <button class="btn btn-outline-secondary" type="button" title="自动编号"><i class="fa fa-repeat"></i></button>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label>计量月份</label>
+                            <input data-view="months" data-min-view="months" class="datepicker-here form-control" placeholder="按时间筛选" type="text" data-date-format="yyyy MM " data-language="zh">
+                        </div>
+                        <div class="form-group">
+                            <label>计量期</label>
+                            <select class="form-control">
+                                <option>选填</option>
+                                <option>15</option>
+                                <option>14</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="tab-pane fade" id="rule" role="tabpanel">
+                        <h5>当前规则：WWUJ2018030001</h5>
+                        <h5>
+                            <span class="badge badge-light" title="标段名">WWUJ-1 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                            <span class="badge badge-light" title="当前年月">201803 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                            <span class="badge badge-light" title="自动编号">0000 <a href="#" class="text-danger" title="移除"><i class="fa fa-remove"></i></a></span>
+                        </h5>
+                        <h5>添加新规则组件</h5>
+                        <div class="form-group">
+                            <select class="form-control">
+                                <option>请选择组件</option>
+                                <option>标段名</option>
+                                <option>文本</option>
+                                <option>当前年月</option>
+                                <option>自增编号</option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label>自动编号位数</label>
+                            <input min="3" class="form-control" step="1" max="6" value="3" type="number">
+                        </div>
+                        <div class="form-group">
+                            <label>起始编号</label>
+                            <input class="form-control" value="001" type="text">
+                        </div>
+                        <button class="btn btn-primary">添加组件</button>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer d-flex justify-content-between">
+                <button type="button" class="btn btn-outline-danger text-truncate" style="max-width: 200px;" title="删除 WJQR1-201710">删除 WJQR1-201710</button>
+                <div>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                    <button type="button" class="btn btn-primary">确定</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<!--上报审批-->
+<div class="modal fade" id="sub-sp" 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>搜索审批人</label>
+                    <div class="input-group">
+                        <input class="form-control" placeholder="请输入姓名进行检索" type="text">
+                        <div class="input-group-append">
+                            <button class="btn btn-outline-secondary" type="button"><i class="fa fa-search"></i></button>
+                        </div>
+                    </div>
+                </div>
+                <div class="card border-primary">
+                    <div class="card-body">
+                        <h5 class="card-title">
+                            <a href="#" class="btn btn-primary btn-sm pull-right">添加</a>张三
+                        </h5>
+                        <h6 class="card-subtitle mb-2 text-muted">监理</h6>
+                        <p class="card-text">XXXXX公司</p>
+                    </div>
+                </div>
+                <div class="card mt-3">
+                    <div class="card-header">
+                        审批流程
+                    </div>
+                    <ul class="list-group list-group-flush">
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>1 张三  <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>2 王五 <small class="text-muted">监理</small></li>
+                        <li class="list-group-item"><a href="" class="text-danger pull-right">移除</a>3 李四 <small class="text-muted">监理</small></li>
+                    </ul>
+                </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>
+<!--审批流程/结果-->
+<div class="modal fade" id="sp-list" 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="card mt-3">
+                    <ul class="list-group list-group-flush">
+                        <li class="list-group-item">
+                            <span class="text-success pull-right">审批通过</span>
+                            <h5 class="card-title">1 张三 <small class="text-muted">监理</small></h5>
+                            <p class="card-text">审批意见。2018-01-01</p>
+                        </li>
+                        <li class="list-group-item">
+                            <span class="text-warning pull-right">审批中</span>
+                            <h5 class="card-title">2 王五 <small class="text-muted">监理</small></h5>
+                            <p class="card-text"></p>
+                        </li>
+                        <li class="list-group-item">
+                            <h5 class="card-title">3 李四 <small class="text-muted">监理</small></h5>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
+<!--添加草图-->
+<div class="modal fade" id="edit-img" data-backdrop="static">
+    <div class="modal-dialog modal-lgx" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">添加草图</h5>
+            </div>
+            <div class="modal-body">
+                <p><a href="" class="btn btn-outline-primary btn-sm">上传图片</a></p>
+                <div class="img-view">
+                    <div class="img-item">
+                        <div class="img-bar">
+                            <a href="" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
+                        </div>
+                        <img src="img/sketch/1.png" id="draggable">
+                    </div>
+                    <div class="img-item" style="left:300px;">
+                        <div class="img-bar">
+                            <a href="" class="text-danger" title="删除"><i class="fa fa-remove"></i></a>
+                        </div>
+                        <img src="img/sketch/2.png" id="draggable">
+                    </div>
+                </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>

config/menu.js

@@ -63,25 +63,28 @@ const menu = {
         },
     },
     measure: {
-        name: '计量管理',
+        name: '中间计量',
         icon: 'fa-calendar-check-o',
         display: true,
         url: '',
         children: {
             middle: {
-                name: '中间计量',
-                url: '/measure/middle',
+                name: '计量编制',
+                url: '/measure/work',
             },
             list: {
                 name: '计量审批',
                 url: '/measure/list',
-            },
-            stage: {
-                name: '期计量',
-                url: '/measure/stage',
-            },
+            }
         },
     },
+    stage: {
+        name: '期计量',
+        icon: 'fa-calendar-check-o',
+        display: true,
+        children: null,
+        url: '/stage',
+    },
     change: {
         name: '变更管理',
         icon: 'fa-retweet',