费用定额 增加估算tab

modules/all_models/compilation.js

@@ -58,6 +58,11 @@ let modelSchema = {
         type: [childrenSchema],
         default: []
     },
+    //估算
+    estimation_valuation: {
+        type: [childrenSchema],
+        default: []
+    },
     // 名称
     name: String,
     // 创建时间

modules/users/models/compilation_model.js

@@ -16,7 +16,7 @@ class CompilationModel extends BaseModel {
      *
      * @var {Array}
      */
-    sectionList = ['suggestion', 'feasibility', 'rough', 'bill', 'ration'];
+    sectionList = ['suggestion', 'feasibility', 'rough', 'bill', 'ration', 'estimation'];
 
     /**
      * 构造函数
@@ -36,11 +36,14 @@ class CompilationModel extends BaseModel {
      */
     async getCompilationList(fields = null) {
         // 筛选字段
-        let field = fields == null ?{_id: 1, name: 1, is_release: 1,release_time:1, defaultLocation:1,categoryID: 1, description: 1,overWriteUrl: 1,example: 1, "ration_valuation.id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
+        let field = fields == null ? {_id: 1, name: 1, is_release: 1,release_time:1, defaultLocation:1,categoryID: 1, description: 1,overWriteUrl: 1,example: 1,
+            "ration_valuation.id": 1, "ration_valuation.name": 1, "ration_valuation.enable": 1,
             "suggestion_valuation.id": 1, "suggestion_valuation.name": 1, "suggestion_valuation.enable": 1,
             "feasibility_valuation.id": 1, "feasibility_valuation.name": 1, "feasibility_valuation.enable": 1,
             "rough_valuation.id": 1, "rough_valuation.name": 1, "rough_valuation.enable": 1,
-            "bill_valuation.id": 1, "bill_valuation.name": 1, "bill_valuation.enable": 1}:fields;
+            "bill_valuation.id": 1, "bill_valuation.name": 1, "bill_valuation.enable": 1,
+            "estimation_valuation.id": 1, "estimation_valuation.name": 1, "estimation_valuation.enable": 1
+            } : fields;
         let compilationData = await this.findDataByCondition({name: {$ne: ''}}, field, false);
 
         return compilationData === null ? [] : compilationData;
@@ -189,6 +192,7 @@ class CompilationModel extends BaseModel {
         let insertData = {};
         data.id = uuidV1();
         insertData[section + '_valuation'] = data;
+        console.log(insertData);
         let result = await this.db.addToSet(condition, insertData);
         return result.ok === undefined ? false : data.id;
     }

web/users/views/compilation/index.html

@@ -23,6 +23,9 @@
                 <% } %>
                 <li role="presentation" class=<%= selectedCompilation.name.includes('公路造价') ? '' : 'active' %>><a href="#bill" aria-controls="bill" role="tab" data-toggle="tab">预算</a></li>
                 <li role="presentation"><a href="#ration" aria-controls="ration" role="tab" data-toggle="tab">工程量清单</a></li>
+                <!--
+                -->
+                <li role="presentation"><a href="#estimation" aria-controls="estimation" role="tab" data-toggle="tab">估算</a></li>
             </ul>
         </div>
         <div class="c-body tab-content">
@@ -220,6 +223,44 @@
                     </tbody>
                 </table>
             </div>
+            <div class="tab-pane" role="tabpanel" id="estimation">
+                <a class="btn btn-default btn-sm" href="javascript:void(0)" data-toggle="modal" data-target="#valuation-dialog"><span class="glyphicon glyphicon-plus"></span> 添加计价规则</a>
+                <table class="table">
+                    <thead>
+                    <tr>
+                        <th>计价规则</th>
+                        <th>启用/禁用</th>
+                        <th>操作</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <% if (selectedCompilation.estimation_valuation && selectedCompilation.estimation_valuation.length > 0) { %>
+                    <% selectedCompilation.estimation_valuation.forEach(function(estimation) { %>
+                    <tr>
+                        <td><%= estimation.name %></td>
+                        <td>
+                            <% if (estimation.enable) { %>
+                            <div class="btn-group enable" data-id="<%= estimation.id %>">
+                                <button class="btn btn-success  disabled" disabled="disabled">已开启</button>
+                                <button class="btn btn-default" title="禁用">禁用</button>
+                            </div>
+                            <% }else { %>
+                            <div class="btn-group enable" data-id="<%= estimation.id %>">
+                                <button class="btn btn-default" title="开启">开启</button>
+                                <button class="btn btn-danger disabled" disabled="disabled">已禁用</button>
+                            </div>
+                            <% } %>
+                        </td>
+                        <td>
+                            <a href="/compilation/valuation/estimation/<%= estimation.id %>" class="btn btn-sm">编辑</a>
+                            <a href="/compilation/valuation/estimation/delete/<%= estimation.id %>" class="btn btn-sm text-danger">删除</a>
+                        </td>
+                    </tr>
+                    <% }) %>
+                    <% } %>
+                    </tbody>
+                </table>
+            </div>
             <table class="table">
                 <tr><td><p>软件版本介绍</p><textarea id="description" class="form-control" placeholder="请简要描述改版本"><%= selectedCompilation.description%></textarea></td></tr>
                 <tr><td><span>重写路径:</span><input class="form-control" type="text" id="overWriteUrl" value="<%= selectedCompilation.overWriteUrl%>"></td></tr>