Selaa lähdekoodia

清单 计算基数 和 费率窗口合并

Chente 7 vuotta sitten
vanhempi
commit
0e9c8d5898
2 muutettua tiedostoa jossa 98 lisäystä ja 104 poistoa
  1. 4 1
      css/main.css
  2. 94 103
      zaojiashu.html

+ 4 - 1
css/main.css

@@ -2,7 +2,10 @@
 /*bootstrap 初始化*/
 body {
     font-size: 0.9rem;
-    overflow: hidden
+    overflow: hidden;
+}
+a{
+  outline: none
 }
 .dropdown-menu {
     font-size: 0.9rem

+ 94 - 103
zaojiashu.html

@@ -268,8 +268,7 @@
                     <div class="main-content col-lg-8 p-0">
                         <div class="top-content">
                             <div class="main-data-top">
-                              <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-jsjs">计算基数 窗口</a>
-                              <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-fl">费率(%) 窗口</a>
+                              <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#qd-jsjs">计算基数 窗口 & 费率(%) 窗口</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#loading">loading</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#zlfb">右键“整理分部”</a>
                               <a href="javacript:void(0);" class="btn btn-secondary m-3" data-toggle="modal" data-target="#jqaz">右键“计取安装费用”</a>
@@ -1323,113 +1322,105 @@
             </div>
         </div>
     </div>
-    <!--弹出 清单 计算基数-->
+    <!--弹出 清单 计算基数 和 费率(%)-->
     <div class="modal fade" id="qd-jsjs" 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">
-                    <input class="form-control" value="分部分项工程费+100">
-                    <p class="form-text">
-                      <button class="btn btn-secondary btn-sm">+</button>
-                      <button class="btn btn-secondary btn-sm">-</button>
-                      <button class="btn btn-secondary btn-sm">*</button>
-                      <button class="btn btn-secondary btn-sm">/</button>
-                      <button class="btn btn-secondary btn-sm">(</button>
-                      <button class="btn btn-secondary btn-sm">)</button>
-                    </p>
-                  </div>
-                  <div class="row">
-                    <div class="col-3">
-                      <ul class="list-unstyled">
-                        <li class="py-1">
-                          <a href="#">所有</a>
-                        </li>
-                        <li class="py-1">
-                          <a class="btn btn-outline-secondary btn-sm" href="#">分部分项</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">措施项目</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">其他项目</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">分包费</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">人材机</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">规费</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">税金</a>
-                        </li>
-                        <li class="py-1">
-                          <a href="#">税前工程造价</a>
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                  </button>
+                    <ul class="nav nav-tabs mb-3" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link active px-3" data-toggle="tab" href="#m-js" role="tab">计算基数</a>
                         </li>
-                      </ul>
-                    </div>
-                    <div class=" modal-auto-height col-9">
-                      <table class="table table-sm table-bordered">
-                        <thead>
-                          <tr><th></th><th>计算基础名称</th><th>金额</th></tr>
-                        </thead>
-                        <tbody>
-                          <tr>
-                            <td>1</td><td><button class="btn btn-secondary btn-sm">分部分项工程费</button></td><td>1000.16</td>
-                          </tr>
-                          <tr>
-                            <td>2</td><td><button class="btn btn-secondary btn-sm">分部分项基价直接工程费</button></td><td>600.16</td>
-                          </tr>
-                          <tr>
-                            <td>3</td><td><button class="btn btn-secondary btn-sm">分部分项基价人工费</button></td><td>100.16</td>
-                          </tr>
-                          <tr>
-                            <td>4</td><td><button class="btn btn-secondary btn-sm">分部分项基价材料费</button></td><td>200.16</td>
-                          </tr>
-                          <tr>
-                            <td>5</td><td><button class="btn btn-secondary btn-sm">分部分项基价机械费</button></td><td>300.16</td>
-                          </tr>
-                          <tr>
-                            <td>6</td><td><button class="btn btn-secondary btn-sm">分部分项调整人工费</button></td><td>100.16</td>
-                          </tr>
-                          <tr>
-                            <td>7</td><td><button class="btn btn-secondary btn-sm">分部分项调整机人工费</button></td><td>50.16</td>
-                          </tr>
-                        </tbody>
-                      </table>
+                          <li class="nav-item">
+                              <a class="nav-link px-3" data-toggle="tab" href="#m-fl" role="tab">费率(%)</a>
+                          </li>
+                    </ul>
+                    <div class="tab-content">
+                        <div class="tab-pane active" id="m-js" role="tabpanel">
+                            <div class="form-group">
+                                <input class="form-control" value="分部分项工程费+100">
+                                <p class="form-text">
+                                  <button class="btn btn-secondary btn-sm">+</button>
+                                  <button class="btn btn-secondary btn-sm">-</button>
+                                  <button class="btn btn-secondary btn-sm">*</button>
+                                  <button class="btn btn-secondary btn-sm">/</button>
+                                  <button class="btn btn-secondary btn-sm">(</button>
+                                  <button class="btn btn-secondary btn-sm">)</button>
+                                </p>
+                              </div>
+                              <div class="row">
+                                <div class="col-3">
+                                  <ul class="list-unstyled">
+                                    <li class="py-1">
+                                      <a href="#">所有</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a class="btn btn-outline-secondary btn-sm" href="#">分部分项</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">措施项目</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">其他项目</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">分包费</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">人材机</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">规费</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">税金</a>
+                                    </li>
+                                    <li class="py-1">
+                                      <a href="#">税前工程造价</a>
+                                    </li>
+                                  </ul>
+                                </div>
+                                <div class=" modal-auto-height col-9">
+                                  <table class="table table-sm table-bordered">
+                                    <thead>
+                                      <tr><th></th><th>计算基础名称</th><th>金额</th></tr>
+                                    </thead>
+                                    <tbody>
+                                      <tr>
+                                        <td>1</td><td><button class="btn btn-secondary btn-sm">分部分项工程费</button></td><td>1000.16</td>
+                                      </tr>
+                                      <tr>
+                                        <td>2</td><td><button class="btn btn-secondary btn-sm">分部分项基价直接工程费</button></td><td>600.16</td>
+                                      </tr>
+                                      <tr>
+                                        <td>3</td><td><button class="btn btn-secondary btn-sm">分部分项基价人工费</button></td><td>100.16</td>
+                                      </tr>
+                                      <tr>
+                                        <td>4</td><td><button class="btn btn-secondary btn-sm">分部分项基价材料费</button></td><td>200.16</td>
+                                      </tr>
+                                      <tr>
+                                        <td>5</td><td><button class="btn btn-secondary btn-sm">分部分项基价机械费</button></td><td>300.16</td>
+                                      </tr>
+                                      <tr>
+                                        <td>6</td><td><button class="btn btn-secondary btn-sm">分部分项调整人工费</button></td><td>100.16</td>
+                                      </tr>
+                                      <tr>
+                                        <td>7</td><td><button class="btn btn-secondary btn-sm">分部分项调整机人工费</button></td><td>50.16</td>
+                                      </tr>
+                                    </tbody>
+                                  </table>
+                                </div>
+                              </div>
+                        </div>
+                        <div class="tab-pane" id="m-fl" role="tabpanel">
+                            <div class="modal-fixed-height">
+                                spreadjs
+                              </div>
+                        </div>
                     </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="qd-fl" 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="modal-fixed-height">
-                    spreadjs
-                  </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>