工料机增加单价文件同步；造价书 分项说明 及 定额说明 内容增加textarea；

gongliaoji.html

@@ -87,13 +87,11 @@
         </div>
         <div class="content">
             <div class="toolsbar px-1">
-                <div class="tools-btn btn-group align-top">
-                    <a href="" class="btn btn-sm"><i class="fa fa-arrow-down" aria-hidden="true"></i>下移</a>
-                    <a href="" class="btn btn-sm"><i class="fa fa-arrow-up" aria-hidden="true"></i>上移</a>
-                    <a href="" class="btn btn-sm"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
-                    <a href="" class="btn btn-sm"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-                    <a href="" class="btn btn-sm"><i class="fa fa-undo" aria-hidden="true"></i></a>
-                </div>
+              <div class="form-inline py-1">
+                <label class="mx-2">当前使用：单价1（<a href="#" id="pop-dj" data-original-title="" title="">3 单位工程使用</a>）
+                <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-dj"><i class="fa fa-exchange"></i> 选择其他</a>
+                <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#copy-dj"><i class="fa fa-files-o"></i> 另存单独用</a></label>
+              </div>
             </div>
             <div class="container-fluid">
                 <div class="row">
@@ -192,6 +190,76 @@
             </div>
         </div>
     </div>
+    <!--弹出更换-->
+    <div class="modal fade" id="change-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 class="custom-control custom-radio">
+                      <input id="radio1" name="radio" type="radio" class="custom-control-input" checked>
+                      <span class="custom-control-indicator"></span>
+                      <span class="custom-control-description">从本建设项目中选择</span>
+                    </label>
+                    <label class="custom-control custom-radio">
+                      <input id="radio2" name="radio" type="radio" class="custom-control-input">
+                      <span class="custom-control-indicator"></span>
+                      <span class="custom-control-description">从其他建设项目中复制</span>
+                    </label>
+                  </div>
+                  <!--从本建设项目中选择-->
+                  <div class="form-group">
+                    <label>建设项目A</label>
+                    <select class="form-control"><option>单价1</option><option>单价2</option><option>单价3</option></select>
+                  </div>
+                  <!--从其他建设项目中复制-->
+                  <div class="form-group">
+                    <label>选择建设项目</label>
+                    <select class="form-control"><option>建设项目B</option><option>建设项目C</option><option>建设项目D</option></select>
+                  </div>
+                  <div class="form-group">
+                    <select class="form-control"><option>单价1</option><option>单价2</option><option>单价3</option></select>
+                    <small class="form-text text-muted">你选择的单价文件将复制一份至新项目，不会影响原建设项目的单价文件。</small>
+                  </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>
+    <!--弹出 另存新文件-->
+    <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>
+                <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>
@@ -199,6 +267,15 @@
     <script src="js/global.js"></script>
 </body>
 <script type="text/javascript">
+    $('#pop-dj').popover({
+      placement:"bottom",
+      html:true,
+      trigger:"hover | focus",
+      content:"A单位工程<br>B单位工程<br>C单位工程"
+    }
+    );
+</script>
+<script type="text/javascript">
     autoFlashHeight();
 </script>
 

project-management.html

@@ -104,7 +104,7 @@
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj1" class="btn btn-sm">新建 <i class="fa fa-cubes"></i> 建设项目</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj2" class="btn btn-sm">新建 <i class="fa fa-cube"></i> 单项工程</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#addPoj3" class="btn btn-sm disabled">新建 <i class="fa fa-sticky-note-o"></i> 单位工程</a>
-                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addFolder" class="btn btn-sm"><i class="fa fa-folder-o"></i>&nbsp;新建文件夹</a>
+                            <a href="javacript:void(0);" data-toggle="modal" data-target="#addFolder" class="btn btn-sm">新建 <i class="fa fa-folder-o"></i> 文件夹</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#rename" class="btn btn-sm">重命名</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="btn btn-sm">删除</a>
                             <a href="javacript:void(0);" data-toggle="modal" data-target="#moveto" class="btn btn-sm">移动到...</a>

zaojiashu.html

@@ -2300,12 +2300,12 @@
                                 </div>
                                 <div class="tab-pane" id="fx" role="tabpanel">
                                     <div class="main-data-bottom">
-                                        分项说明的内容
+                                        <textarea class="form-control" id="exampleTextarea" rows="8" readonly="">分项说明的内容</textarea>
                                     </div>
                                 </div>
                                 <div class="tab-pane" id="des" role="tabpanel">
                                     <div class="main-data-bottom">
-                                        定额说明的内容
+                                        <textarea class="form-control" id="exampleTextarea" rows="8" readonly="">定额说明的内容</textarea>
                                     </div>
                                 </div>
                                 <div class="tab-pane" id="tenr" role="tabpanel">
@@ -2560,8 +2560,21 @@
                         </div>
                         <!--人工单价调整-->
                         <div class="tab-pane fade" id="poj-settings-6" role="tabpanel">
+                          <div class="row px-3">
+                            <select class="col-4 form-control form-control-sm"><option>渝建[2016]71号</option><option>渝建[2017]78号</option></select>
+                          </div>
                           <div class="modal-auto-height">
-                            人工单价调整
+                            <table class="table table-bordered">
+                              <thead><tr><th>定额工种</th><th>2006概算定额</th><th>2008计价定额</th><th>2011轨道定额</th></tr></thead>
+                              <tbody>
+                                <tr><td>土石方人工</td><td>2.94</td><td>2.41</td><td>1.51</td></tr>
+                                <tr><td>建筑、市政、维修人工</td><td>2.82</td><td>2.48</td><td>1.55</td></tr>
+                                <tr><td>装饰人工</td><td>-</td><td>3.04</td><td>-</td></tr>
+                                <tr><td>安装、机械人工</td><td>2.58</td><td>2.39</td><td>1.49</td></tr>
+                                <tr><td>仿古、园林绿化人工</td><td>-</td><td>2.39</td><td>-</td></tr>
+                                <tr><td>盾构用工</td><td>-</td><td>-</td><td>1.49</td></tr>
+                              </tbody>
+                            </table>
                           </div>
                         </div>
                       </div>