Browse Source

1. 本期计量台账,默认收起附件,可展开
2. 本期计量台账、清单汇总、审核比较,可调整上下界面高度

MaiXinRong 6 years ago
parent
commit
636733869a
4 changed files with 25 additions and 25 deletions
  1. 19 0
      app/public/js/stage.js
  2. 1 1
      app/view/stage/compare.ejs
  3. 1 1
      app/view/stage/gather.ejs
  4. 4 23
      app/view/stage/index.ejs

+ 19 - 0
app/public/js/stage.js

@@ -824,4 +824,23 @@ $(document).ready(() => {
         Cookies.set('stage-col-visible', JSON.stringify(customDisplay), 7*24*60*60*1000);
         $('#row-view').modal('hide');
     });
+    // 展开收起附件
+    $('#fujianTab').click(function () {
+        const obj = $(this), main = $('#main-view'), tool = $('#tools-view'), fujian = $('#fujian');
+        if (obj.hasClass('active')) {
+            main.attr('class', 'c-body col-12');
+            tool.hide();
+            slSpread.refresh();
+            spSpread.refresh();
+            obj.removeClass('active');
+            fujian.removeClass('active');
+        } else {
+            main.attr('class', 'c-body col-8');
+            tool.show();
+            slSpread.refresh();
+            spSpread.refresh();
+            obj.addClass('active');
+            fujian.addClass('active');
+        }
+    });
 });

+ 1 - 1
app/view/stage/compare.ejs

@@ -20,8 +20,8 @@
         <div class="c-body">
             <div class="sjs-height-1" id="ledger-spread">
             </div>
-            <div id="main-resize" r-Type="height" div1="#ledger-spread" div2="#main-bottom" store-id="stage-compare" min="100"></div>
             <div class="bcontent-wrap" id="main-bottom">
+                <div id="main-resize" class="resize-y" r-Type="height" div1="#ledger-spread" div2="#main-bottom" store-id="stage-compare" min="100"></div>
                 <div class="bc-bar mb-1">
                     <ul class="nav nav-tabs">
                         <li class="nav-item">

+ 1 - 1
app/view/stage/gather.ejs

@@ -39,8 +39,8 @@
         <div class="c-body">
             <div class="sjs-height-1" id="gcl-spread">
             </div>
-            <div id="main-resize" r-Type="height" div1="#gcl-spread" div2="#main-bottom" store-id="stage-gather" min="100"></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" min="100"></div>
                 <div class="bc-bar mb-1">
                     <ul class="nav nav-tabs">
                         <li class="nav-item">

+ 4 - 23
app/view/stage/index.ejs

@@ -20,13 +20,13 @@
         <div class="c-header p-0">
         </div>
         <div class="row w-100 sub-content">
-            <div class="c-body col-8">
+            <div id="main-view" class="c-body col-12">
                 <!--上部分-->
                 <div class="sjs-height-1" id="stage-ledger">
                 </div>
-                <div id="main-resize" r-Type="height" div1="#stage-ledger" div2="#main-bottom" store-id="stage-main" min="100"></div>
                 <!--下部分-->
                 <div class="bcontent-wrap" id="main-bottom">
+                    <div id="main-resize" class="resize-y" r-Type="height" div1="#stage-ledger" div2="#main-bottom" store-id="stage-main" min="100"></div>
                     <div class="bc-bar mb-1">
                         <ul class="nav nav-tabs">
                             <li class="nav-item">
@@ -52,24 +52,8 @@
                     </div>
                 </div>
             </div>
-            <div class="c-body col">
+            <div id="tools-view" class="c-body col" style="display: none;">
                 <div class="tab-content">
-                    <!--中间审批记录-->
-                    <div id="spjilu" class="tab-pane active">
-                        <div class="sjs-bar-1">
-                            <table class="table table-bordered m-0">
-                                <tr><th>清单编号</th><th>清单名称</th><th>上报数量</th></tr>
-                                <tr><td>201-1</td><td>清理现场</td><td>10</td></tr>
-                            </table>
-                        </div>
-                        <div class="sjs-sh-1">
-                            <table class="table table-bordered">
-                                <tr><th>审批人</th><th>审批数量</th><th>审批意见</th></tr>
-                                <tr><td>张三</td><td>15</td><td>审批意见文本</td></tr>
-                                <tr><td>王五</td><td>20</td><td>审批意见文本</td></tr>
-                            </table>
-                        </div>
-                    </div>
                     <!--附件-->
                     <div id="fujian" class="tab-pane">
                         <div class="sjs-bar">
@@ -255,10 +239,7 @@
             <!--右侧菜单-->
             <ul class="nav flex-column right-nav">
                 <li class="nav-item">
-                    <a class="nav-link active" data-toggle="tab" href="#spjilu" role="tab">审批记录</a>
-                </li>
-                <li class="nav-item">
-                    <a class="nav-link" data-toggle="tab" href="#fujian" role="tab">附件</a>
+                    <a id="fujianTab" class="nav-link" content="#fujian" role="tab">附件</a>
                 </li>
             </ul>
         </div>