章节合计调整

app/public/js/ledger_gather.js

@@ -80,6 +80,11 @@ $(document).ready(() => {
         const html = [];
         if (data) {
             for (const d of data) {
+                if (['1000', '1100', '1200', '1300'].indexOf(d.code) >= 0) {
+                    if (checkZero(d.total_price) && checkZero(d.deal_bills_tp)) {
+                        continue;
+                    }
+                }
                 html.push('<tr>');
                 if (d.code) {
                     html.push('<td>', d.code, '</td>');

app/public/js/stage_gather.js

@@ -12,6 +12,14 @@ function generateChapterHtml(data) {
     const html = [];
     if (data) {
         for (const d of data) {
+            if (['1000', '1100', '1200', '1300'].indexOf(d.code) >= 0) {
+                if (checkZero(d.total_price) && checkZero(d.deal_bills_tp) &&
+                    checkZero(d.contract_tp) && checkZero(d.qc_tp) && checkZero(d.gather_tp) &&
+                    checkZero(d.end_contract_tp) && checkZero(d.end_qc_tp) && checkZero(d.end_gather_tp) &&
+                    checkZero(d.end_final_tp)) {
+                    continue;
+                }
+            }
             html.push('<tr>');
             if (d.code) {
                 html.push('<td>', d.code, '</td>');

app/view/stage/gather.ejs

@@ -4,33 +4,34 @@
         <div class="title-main d-flex">
             <% include ./stage_sub_mini_menu.ejs %>
             <div>
-                <div class="dropdown">
-                    <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                        超计显示
-                    </button>
-                    <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="width:290px">
-                        <span class="dropdown-item-text text-danger">累计完成合同计量 大于</span>
-                        <form class="px-4 py-3">
-                            <div class="form-group">
-                                <div class="custom-control custom-radio">
-                                    <input type="radio" id="customRadio1" name="customRadio" class="custom-control-input" checked="">
-                                    <label class="custom-control-label" for="customRadio1">台账数量</label>
+                <div class="d-inline-block">
+                    <div class="dropdown">
+                        <button class="btn btn-sm btn-light dropdown-toggle text-primary" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            超计显示
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" style="width:290px">
+                            <span class="dropdown-item-text text-danger">累计完成合同计量 大于</span>
+                            <form class="px-4 py-3">
+                                <div class="form-group">
+                                    <div class="custom-control custom-radio">
+                                        <input type="radio" id="customRadio1" name="customRadio" class="custom-control-input" checked="">
+                                        <label class="custom-control-label" for="customRadio1">台账数量</label>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="form-group">
-                                <div class="custom-control custom-radio">
-                                    <input type="radio" id="customRadio2" name="customRadio" class="custom-control-input">
-                                    <label class="custom-control-label" for="customRadio2">签约清单数量</label>
+                                <div class="form-group">
+                                    <div class="custom-control custom-radio">
+                                        <input type="radio" id="customRadio2" name="customRadio" class="custom-control-input">
+                                        <label class="custom-control-label" for="customRadio2">签约清单数量</label>
+                                    </div>
                                 </div>
-                            </div>
-                            <div class="form-group mb-0">
-                                <div class="custom-control custom-radio">
-                                    <input type="radio" id="customRadio3" name="customRadio" class="custom-control-input">
-                                    <label class="custom-control-label" for="customRadio3">台账数量 或 签约清单数量</label>
+                                <div class="form-group mb-0">
+                                    <div class="custom-control custom-radio">
+                                        <input type="radio" id="customRadio3" name="customRadio" class="custom-control-input">
+                                        <label class="custom-control-label" for="customRadio3">台账数量 或 签约清单数量</label>
+                                    </div>
                                 </div>
-                            </div>
-                        </form>
-                        <span class="dropdown-item-text text-danger">
+                            </form>
+                            <span class="dropdown-item-text text-danger">
                             <div class="input-group input-group-sm">
                                 <input type="number" step="5" class="form-control form-control-sm m-0" placeholder="100" max="100" min="50" id="over-percent" value="100">
                                 <div class="input-group-append">
@@ -38,70 +39,49 @@
                                 </div>
                             </div>
                         </span>
+                        </div>
                     </div>
                 </div>
+                <div class="d-inline-block">
+                    <button href="#zjhj" class="btn btn-sm btn-light text-primary" data-toggle="modal" data-target="#zjhj">章节合计</button>
+                </div>
             </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" id="left-view" style="width: 100%">
-                <div class="sjs-height-1" id="gcl-spread">
+    <div class="content-wrap">
+        <div class="c-header p-0"></div>
+        <div class="c-body">
+            <div class="sjs-height-1" id="gcl-spread">
+            </div>
+            <div class="bcontent-wrap" id="main-bottom">
+                <div id="main-resize" class="resize-y" r-Type="height" div1="#gcl-spread" div2="#main-bottom" store-id="stage-gather" store-version="1.0.0" min="100"></div>
+                <div class="bc-bar mb-1">
+                    <ul class="nav nav-tabs">
+                        <li class="nav-item">
+                            <a class="nav-link active" data-toggle="tab" href="#xmujie" role="tab">所属项目节</a>
+                        </li>
+                        <!--<li class="nav-item">-->
+                        <!--<a class="nav-link " data-toggle="tab" href="#biangeng" role="tab">相关变更令</a>-->
+                        <!--</li>-->
+                    </ul>
                 </div>
-                <div class="bcontent-wrap" id="main-bottom">
-                    <div id="main-resize" class="resize-y" r-Type="height" div1="#gcl-spread" div2="#main-bottom" store-id="stage-gather" store-version="1.0.0" min="100"></div>
-                    <div class="bc-bar mb-1">
-                        <ul class="nav nav-tabs">
-                            <li class="nav-item">
-                                <a class="nav-link active" data-toggle="tab" href="#xmujie" role="tab">所属项目节</a>
-                            </li>
-                            <!--<li class="nav-item">-->
-                            <!--<a class="nav-link " data-toggle="tab" href="#biangeng" role="tab">相关变更令</a>-->
-                            <!--</li>-->
-                        </ul>
-                    </div>
-                    <div class="tab-content">
-                        <div class="tab-pane active" id="xmujie">
-                            <div class="sp-wrap" id="leaf-xmj-spread">
-                            </div>
-                        </div>
-                        <div class="tab-pane" id="biangeng">
-                            <div class="sp-wrap">
-                                <table class="table table-sm table-bordered">
-                                    <tr><th>变更令</th><th>名称</th><th>批复文号</th><th>变更图号</th><th>数量</th></tr>
-                                    <tr><td>BGL01</td><td>XX变更令</td><td></td><td></td><td>100</td></tr>
-                                    <tr><td>BGL02</td><td>YY变更令</td><td></td><td></td><td>80</td></tr>
-                                </table>
-                            </div>
+                <div class="tab-content">
+                    <div class="tab-pane active" id="xmujie">
+                        <div class="sp-wrap" id="leaf-xmj-spread">
                         </div>
                     </div>
-                </div>
-            </div>
-            <div class="c-body" id="right-view" style="display: none; width: 33%;">
-                <div class="resize-x" id="right-spr" r-Type="width" div1="#left-view" div2="#right-view" title="调整大小" a-type="percent"><!--调整左右高度条--></div>
-                <div class="tab-content">
-                    <div id="chapter" class="tab-pane active">
-                        <div class="side-bar-1"></div>
-                        <div class="sjs-sh-1" style="overflow: auto">
-                            <table class="table table-bordered" style="width: 1048px">
-                                <tr class="text-center"><th>章节</th><th>章节名称</th><th>签约清单</th><th>台帐金额</th><th>本期合同计量</th><th>本期数量变更</th><th>本期完成计量</th><th>截止本期合同计量</th><th>截止本期数量变更</th><th>截止本期完成计量</th><th>台账+变更令</th></tr>
-                                <tbody id="chapter-list"></tbody>
+                    <div class="tab-pane" id="biangeng">
+                        <div class="sp-wrap">
+                            <table class="table table-sm table-bordered">
+                                <tr><th>变更令</th><th>名称</th><th>批复文号</th><th>变更图号</th><th>数量</th></tr>
+                                <tr><td>BGL01</td><td>XX变更令</td><td></td><td></td><td>100</td></tr>
+                                <tr><td>BGL02</td><td>YY变更令</td><td></td><td></td><td>80</td></tr>
                             </table>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
-        <!--右侧菜单-->
-        <div class="side-menu">
-            <!--右侧菜单-->
-            <ul class="nav flex-column right-nav" id="side-menu">
-                <li class="nav-item">
-                    <a class="nav-link" content="#chapter" href="javascript: void(0);">章节合计</a>
-                </li>
-            </ul>
-        </div>
     </div>
 </div>
 <script>

app/view/stage/gather_modal.ejs

@@ -1 +1,20 @@
-<% include ./audit_modal.ejs %>
+<% include ./audit_modal.ejs %>
+<!--章节合计-->
+<div class="modal fade" id="zjhj" data-backdrop="static">
+    <div class="modal-dialog modal-xl" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title">列显示</h5>
+            </div>
+            <div class="modal-body">
+                <table class="table table-bordered table-sm">
+                    <thead class="text-center"><tr><th>章节</th><th>章节名称</th><th>签约金额</th><th>台帐金额</th><th>本期合同计量金额</th><th>本期数量变更金额</th><th>本期完成计量金额</th><th>截止本期合同计量金额</th><th>截止本期数量变更金额</th><th>截止本期完成计量金额</th><th>完成率（%）</th></tr></thead>
+                    <tbody id="chapter-list"></tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>