费率 和 计算程序调整

feilv.html

@@ -99,6 +99,7 @@
                   <label class="mx-2" >基于 重庆渝建发[2016]35号</label>
                   <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#set-lv"><i class="fa fa-cog"></i> 设置</a>
                   <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-lv"><i class="fa fa-exchange"></i> 更换</a>
+                  <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#copy-lv"><i class="fa fa-files-o"></i> 另存新文件</a>
                 </div>
             </div>
             <div class="container-fluid">
@@ -223,7 +224,6 @@
                   </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary pull-left">另存新文件</button>
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <a href="" class="btn btn-primary">确定</a>
                 </div>
@@ -298,6 +298,35 @@
             </div>
         </div>
     </div>
+    <!--弹出 另存新文件-->
+    <div class="modal fade" id="copy-lv" data-backdrop="static">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">另存新费率文件</h5>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                      <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                  <div class="form-group">
+                    <label>费率文件名称</label>
+                    <input class="form-control"  value="费率1副本">
+                    <!--默认为复制费率文件名字+副本 2字，用户修改后需判断是否在同项目下存在同名-->
+                    <small class="form-text text-danger">已存在同名费率文件。</small>
+                  </div>
+                  <div class="form-group">
+                    <label >费率标准</label>
+                    <select class="form-control" disabled><option>重庆渝建发[2016]35号</option></select>
+                  </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
     <!-- JS. -->
     <script src="js/jquery/jquery.min.js"></script>
     <script src="js/tether/tether.min.js"></script>

jisuanchengxu.html

@@ -95,7 +95,7 @@
                            <tr><th>序号</th><th>专业名称</th></tr>
                          </thead>
                          <tbody>
-                           <tr><td>1</td><td>重庆几家规则(2013)</td></tr>
+                           <tr><td>1</td><td>重庆计价规则(2013)</td></tr>
                            <tr><td>2</td><td>-建筑工程</td></tr>
                          </tbody>
                        </table>
@@ -119,7 +119,7 @@
                                 <td>1</td>
                                 <td>基价直接工程费</td>
                                 <td>F2+F5+F6+F10 <a href="javacript:void(0);" class="btn btn-secondary btn-sm" data-toggle="modal" data-target="#jsjs">基数选择</a></td>
-                                <td>基价人工费+基价材料费+基价机械费+未计划材料费</td>
+                                <td>基价人工费+基价材料费+基价机械费+未计价材料费</td>
                                 <td></td>
                                 <td></td>
                               </tr>