增加单位工程取费专业

modules/all_models/engineering_lib.js

@@ -72,6 +72,8 @@ let modelSchema = {
     visible:{type: Boolean, default: false},
     //取费专业
     engineering:Number,
+    //单位工程取费专业
+    projectEngineering:Number,
     //是否计算安装增加费
     isInstall:{type: Boolean, default: false}
 };

web/users/js/compilation.js

@@ -366,10 +366,12 @@ $(document).ready(function() {
             $("#engineeringError").show();
             return;
         }
+        if($('#projectEngineering').val() == ''){
+            $("#projectError").show();
+            return;
+        }
         $("#addEngineerConfirm").attr("disabled",true);//防止重复提交
         $("#addEngineerForm").submit();
-
-
     });
     //
 

web/users/views/compilation/add.html

@@ -37,6 +37,7 @@
                                 <th>工程专业</th>
                                 <th>费用标准</th>
                                 <th>定额取费专业</th>
+                                <th>单位工程取费专业</th>
                                 <th>标准清单</th>
                                 <th>定额库</th>
                                 <th>人材机库</th>
@@ -57,7 +58,8 @@
                                             </div>
                                         </div>
                                     </td>
-                                    <td><div><span><%= engineering.feeName %></span> <a onclick='editEngineer(this)'><i class="glyphicon glyphicon-pencil"></i></a></div>
+                                    <td>
+                                        <div><span><%= engineering.feeName %></span> <a onclick='editEngineer(this)'><i class="glyphicon glyphicon-pencil"></i></a></div>
                                         <div class="input-group input-group-sm input_group_div" style="width:200px;display: none">
                                             <input class="form-control" name="feeName">
                                             <div class="input-group-btn">
@@ -65,14 +67,25 @@
                                                     <span class="glyphicon glyphicon-ok"></span></button>
                                             </div>
                                         </div></td>
-                                    <td><div><span><%= engineering.engineering %></span> <a onclick='editEngineer(this)'><i class="glyphicon glyphicon-pencil"></i></a></div>
+                                    <td>
+                                        <div><span><%= engineering.engineering %></span> <a onclick='editEngineer(this)'><i class="glyphicon glyphicon-pencil"></i></a></div>
                                         <div class="input-group input-group-sm input_group_div" style="width:200px;display: none">
                                             <input class="form-control engineeringInput" type="number" name="engineering">
                                             <div class="input-group-btn">
                                                 <button type="button" class="btn btn-success" onclick='confirmUpdate(this,"<%= engineering._id.toString()%>")'>
                                                     <span class="glyphicon glyphicon-ok"></span></button>
                                             </div>
-                                        </div></td>
+                                        </div>
+                                    </td>
+                                    <td><div><span><%= engineering.projectEngineering %></span> <a onclick='editEngineer(this)'><i class="glyphicon glyphicon-pencil"></i></a></div>
+                                        <div class="input-group input-group-sm input_group_div" style="width:200px;display: none">
+                                            <input class="form-control engineeringInput" type="number" name="projectEngineering">
+                                            <div class="input-group-btn">
+                                                <button type="button" class="btn btn-success" onclick='confirmUpdate(this,"<%= engineering._id.toString()%>")'>
+                                                    <span class="glyphicon glyphicon-ok"></span></button>
+                                            </div>
+                                        </div>
+                                    </td>
                                     <td><%= engineering.bill_lib.length %></td>
                                     <td><%= engineering.ration_lib.length %></td>
                                     <td><%= engineering.glj_lib.length %></td>
@@ -116,6 +129,11 @@
                         <input class="form-control engineeringInput" type="number" name ="engineering" id="engineeringInput" placeholder="请输入定额取费专业">
                         <small class="form-text text-danger" id="engineeringError" style="display: none">请输入定额取费专业。</small>
                     </div>
+                    <div class="form-group">
+                        <label>单位工程取费专业</label>
+                        <input class="form-control engineeringInput" type="number" name ="projectEngineering" id="projectEngineering" placeholder="请输入单位工程取费专业">
+                        <small class="form-text text-danger" id="projectError" style="display: none">请输入单位工程取费专业。</small>
+                    </div>
                     <input type="hidden" name="valuationID" value="<%= valuationId %>">
                     <input type="hidden" name="compilationId" value="<%= selectedCompilation._id.toString() %>" >
                 </form>