造价书新增 项目属性 及 列设置；报表 注释修改

baobiao.html

@@ -433,7 +433,7 @@
               </div>
           </div>
       </div>
-      <!--弹出格式-->
+      <!--弹出内容-->
       <div class="modal fade" id="content" data-backdrop="static">
           <div class="modal-dialog" role="document">
               <div class="modal-content">

zaojiashu.html

@@ -42,7 +42,10 @@
         <nav class="navbar navbar-toggleable-lg justify-content-between navbar-light p-0">
             <ul class="nav navbar-nav px-1">
                 <li class="nav-item">
-                    <a class="nav-link" href="#" aria-haspopup="true" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
+                    <a class="nav-link" href="#" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cube"></i> 项目属性</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="#" aria-expanded="false"><i class="fa fa-sliders"></i> 选项</a>
                 </li>
                 <li class="nav-item dropdown">
                     <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench"></i> 工具</a>
@@ -93,6 +96,9 @@
                 <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>
               </div>
+              <div>
+                <a href="javacript:void(0);" data-toggle="modal" data-target="#column" class="btn btn-sm"><i class="fa fa-table" aria-hidden="true"></i> 列设置</a>
+              </div>
               <div class="side-tabs">
                   <ul class="nav nav-tabs" role="tablist">
                       <li class="nav-item">
@@ -2435,6 +2441,102 @@
             </div>
         </div>
     </div>
+    <!--弹出项目属性-->
+    <div class="modal fade" id="poj-set" 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">
+                  <ul class="nav nav-tabs" id="myTab" role="tablist">
+                    <li class="nav-item">
+                      <a class="nav-link active"  data-toggle="tab" href="#tab1" role="tab">关于计算</a>
+                    </li>
+                    <li class="nav-item">
+                      <a class="nav-link" data-toggle="tab" href="#tab2" role="tab" >清单工程量精度</a>
+                    </li>
+                    <li class="nav-item">
+                      <a class="nav-link" data-toggle="tab" href="#tab3" role="tab" >人工单价调整</a>
+                    </li>
+                  </ul>
+                  <div class="tab-content" id="myTabContent">
+                    <div class="tab-pane fade show active" id="tab1" role="tabpanel">
+                      <fieldset class="form-group">
+                        <legend>取费方式</legend>
+                        <div class="form-check">
+                          <label class="form-check-label">
+                            <input class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked="" type="radio">
+                            子目含量取费
+                          </label>
+                        </div>
+                        <div class="form-check">
+                        <label class="form-check-label">
+                            <input class="form-check-input" name="optionsRadios" id="optionsRadios2" value="option2" type="radio">
+                            子目单价取费（反算）：清单综合合价=清单综合单价*清单工程量
+                          </label>
+                        </div>
+                        <div class="form-check">
+                        <label class="form-check-label">
+                            <input class="form-check-input" name="optionsRadios" id="optionsRadios3" value="option3" type="radio">
+                            子目单价取费（正算）：清单综合合价=∑子目综合合价
+                          </label>
+                        </div>
+                        <div class="form-check">
+                        <label class="form-check-label">
+                            <input class="form-check-input" name="optionsRadios" id="optionsRadios4" value="option4" type="radio">
+                            清单单价取费
+                          </label>
+                        </div>
+                      </fieldset>
+                    </div>
+                    <div class="tab-pane fade" id="tab2" role="tabpanel" >2...</div>
+                    <div class="tab-pane fade" id="tab3" role="tabpanel" >3...</div>
+                  </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="column" data-backdrop="static">
+        <div class="modal-dialog modal-lg" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title"><i class="fa fa-history"></i> 列设置</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body modal-fixed-height">
+                  <table class="table table-bordered">
+                    <tr><th>序号</th><td></td></tr>
+                    <tr><th>项目编码</th><td></td></tr>
+                    <tr><th>类别</th><td></td></tr>
+                    <tr><th>项目名称</th><td></td></tr>
+                    <tr><th>计量单位</th><td></td></tr>
+                    <tr><th>项目项目特征</th><td></td></tr>
+                    <tr><th>工作内容</th><td></td></tr>
+                    <tr><th>工程专业</th><td><label class="form-check-label"><input class="form-check-input" type="checkbox" checked> 显示</label></td></tr>
+                    <tr><th>取费专业</th><td><label class="form-check-label"><input class="form-check-input" type="checkbox" checked> 显示</label></td></tr>
+                    <tr><th>工程量计算规则</th><td><label class="form-check-label"><input class="form-check-input" type="checkbox" checked> 显示</label></td></tr>
+                    <tr><th>工程量</th><td><label class="form-check-label"><input class="form-check-input" type="checkbox" checked> 显示</label></td></tr>
+                    <tr><th>单价</th><td><label class="form-check-label"><input class="form-check-input" type="checkbox" checked> 显示</label></td></tr>
+                    <tr><th>合价</th><td><label class="form-check-label"><input class="form-check-input" type="checkbox" checked> 显示</label></td></tr>
+                  </table>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+                </div>
+            </div>
+        </div>
+    </div>
     <!-- JS. -->
     <script src="js/jquery/jquery.min.js"></script>
     <script src="js/tether/tether.min.js"></script>