Просмотр исходного кода

1. 资料归集,展开收起记住调整
2. 造价对比,汇总数据调整

MaiXinRong 3 дней назад
Родитель
Сommit
7498c003b3
3 измененных файлов с 32 добавлено и 2 удалено
  1. 1 1
      app/lib/budget_final.js
  2. 1 1
      app/public/js/file_detail.js
  3. 30 0
      app/view/safe_calc/compare.ejs

+ 1 - 1
app/lib/budget_final.js

@@ -158,7 +158,7 @@ class BudgetFinal {
     async _loadTender(id) {
         const helper = this.ctx.helper;
         const bills = await this.ctx.service.ledger.getFinalData(id, ['id', 'ledger_id', 'ledger_pid', 'level', 'order', 'full_path', 'is_leaf',
-            'code', 'b_code', 'name', 'unit', 'dgn_qty1', 'dgn_qty2', 'total_price']);
+            'code', 'b_code', 'name', 'unit', 'unit_price', 'dgn_qty1', 'dgn_qty2', 'total_price']);
 
         const dgnData = await this.ctx.service.stageBillsDgn.getDgnData(id);
         // 使用最新一期对比

+ 1 - 1
app/public/js/file_detail.js

@@ -74,7 +74,7 @@ $(document).ready(function() {
                     spid: x.spid,
                     tips: x.tips || '',
                 };
-                if (x.is_folder || x.is_fixed) result.open = self.expandCache.indexOf(result.id) >= 0;
+                result.open = self.expandCache.indexOf(result.id) >= 0;
                 return result;
             });
             this.filingTree = $.fn.zTree.init($('#filing'), this.setting, sortNodes);

+ 30 - 0
app/view/safe_calc/compare.ejs

@@ -0,0 +1,30 @@
+<% include ./sub_menu.ejs %>
+<div class="panel-content">
+    <div class="panel-title">
+        <div class="title-main d-flex">
+            <% include ./sub_mini_menu.ejs %>
+            <div>
+                <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">
+                            <i class="fa fa-list-ol"></i> 显示层级
+                        </button>
+                        <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
+                            <a class="dropdown-item" name="showLevel" tag="1" href="javascript: void(0);">第一层</a>
+                            <a class="dropdown-item" name="showLevel" tag="2" href="javascript: void(0);">第二层</a>
+                            <a class="dropdown-item" name="showLevel" tag="3" href="javascript: void(0);">第三层</a>
+                            <a class="dropdown-item" name="showLevel" tag="4" href="javascript: void(0);">第四层</a>
+                            <a class="dropdown-item" name="showLevel" tag="last" href="javascript: void(0);">最底层</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="content-wrap">
+        <div class="c-header p-0"></div>
+        <div class="c-body" style="width: 100%">
+            <div id="bills-spread" class="sjs-height-1"></div>
+        </div>
+    </div>
+</div>