ソースを参照

调用变更令,展开收起侧栏

MaiXinRong 6 年 前
コミット
102be3a9b4

+ 4 - 1
app/public/css/main.css

@@ -630,8 +630,11 @@ font-size: .875rem;
 }
 .m-close-side{
   position: absolute;
-  left:-6px;
+  right:-1px;
   top:250px;
   background: #f2f2f2;
   padding:30px 3px;
+}
+.m-close-side:hover{
+  background:#eae9e9;
 }

BIN
app/public/images/icon-ok.png


+ 17 - 1
app/public/js/stage.js

@@ -171,7 +171,23 @@ $(document).ready(() => {
             // 过滤可变更数量为0
             $('#customCheckDisabled').click(function () {
                 self._filterEmptyChange(!this.checked);
-            })
+            });
+            $('#show-bgl-detail').bind('click', function () {
+                const detail = $('#bgl-detail'), bgl=$('#bgl'), obj=$(this);
+                if (detail.hasClass('col-4')) {
+                    detail.attr('class', 'col').hide();
+                    bgl.attr('class', 'col-12');
+                    $('a', obj).attr('title', '展开侧栏');
+                    $('i', obj).attr('class', 'fa fa-chevron-left');
+                    self.spread.refresh();
+                } else {
+                    detail.attr('class', 'col-4').show();
+                    bgl.attr('class', 'col-8');
+                    $('a', obj).attr('title', '收起侧栏');
+                    $('i', obj).attr('class', 'fa fa-chevron-right');
+                    self.spread.refresh();
+                }
+            });
         }
         _loadChangeDetail(change) {
             if (change) {

+ 1 - 0
app/public/js/stage_detail.js

@@ -236,6 +236,7 @@ $(document).ready(() => {
                 }
             });
             const gsTree = stageIm.getGsTree();
+            SpreadJsObj.loadSheetData(gsSpread.getActiveSheet(), SpreadJsObj.DataType.Tree, gsTree);
             const gatherNodes = stage.im_gather_node ? _.map(stage.im_gather_node.split(','), _.toNumber) : [];
             for (const node of gsTree.datas) {
                 node.check = gatherNodes.indexOf(node.id) !== -1;

+ 0 - 4
app/view/stage/gather.ejs

@@ -32,10 +32,6 @@
                     </div>
                 </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="#sub-sp2" data-toggle="modal" data-target="#sub-sp2" class="btn btn-primary btn-sm pull-right">重新上报</a>
-            </div>
         </div>
     </div>
     <div class="content-wrap">

+ 8 - 4
app/view/stage/modal.ejs

@@ -41,7 +41,7 @@
             </div>
             <div class="modal-body">
                 <div class="row">
-                    <div class="col-7">
+                    <div id="bgl" class="col-8">
                         <ul class="nav nav-tabs">
                             <li class="nav-item">
                                 <div class="custom-control custom-checkbox my-2">
@@ -52,14 +52,17 @@
                         </ul>
                         <div class="modal-height-500" id="change-spread">
                         </div>
+                        <div class="m-close-side" id="show-bgl-detail">
+                            <a href="javascript: void(0);" title="收起侧栏" class="text-primary"><i class="fa fa-chevron-right"></i></a>
+                        </div>
                     </div>
-                    <div class="col-5">
+                    <div id="bgl-detail" class="col-4">
                         <ul class="nav nav-tabs">
                             <li class="nav-item">
-                                <a class="nav-link active" data-toggle="tab" href="#bgsm" role="tab">工程变更理由及内容</a>
+                                <a class="nav-link active" data-toggle="tab" href="#bgsm" role="tab">变更理由及内容</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link" data-toggle="tab" href="#detail" role="tab">更多变更信息</a>
+                                <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="#bg-fujian" role="tab">附件</a>
@@ -234,4 +237,5 @@
         </div>
     </div>
 </div>
+<img src="/public/images/icon-ok.png" id="icon-ok" />
 <% include ./audit_modal.ejs %>