更新分项清单相关

biaoduan-panel.html

@@ -62,12 +62,19 @@
             </ul>
           </div>
           <div class="nav-box">
-            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账</h3>
+            <h3><i class="fa fa-file-text-o fa-fw"></i>签约合同</h3>
             <ul class="nav-list list-unstyled sub-list">
               <li><a href="taizhang-qianyue.html"><span>签约清单</span></a></li>
+              <li><a href="fenxiangqd.html"><span>分项清单</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账</h3>
+            <ul class="nav-list list-unstyled sub-list">
               <li><a href="taizhang.html"><span>台账分解</span></a></li>
               <li><a href="taizhang-shenpi.html"><span>台账分解</span></a></li>
               <li><a href="taizhang-duibi.html"><span>清单对比</span></a></li>
+              <li><a href="taizhang-fxduibi.html"><span>分项对比</span></a></li>
               <li><a href="taizhang-bg.html"><span>台账修订</span></a></li>
             </ul>
           </div>

settings-option.html

@@ -178,7 +178,7 @@
                                   <label class="form-check-label" for="inlineCheckbox22">农民工工资</label>
                                 </div>
                                 <div class="mt-3">
-                                  <span class="text-danger">“XX预付款”已经开始支付，不允许取消。</span>
+                                  <span class="text-danger">“XX预付款”已有标段开始支付，不允许取消。</span>
                                 </div>
                                 <div class="mt-3">
                                   <label class="form-text alert alert-danger">勾选后，预付款界面会出现相应模块。</label>

taizhang-qianyue.html

@@ -53,12 +53,19 @@
             </ul>
           </div>
           <div class="nav-box">
-            <h3><i class="fa fa-list-alt fa-fw"></i> 0号台账</h3>
+            <h3><i class="fa fa-file-text-o fa-fw"></i>签约合同</h3>
+            <ul class="nav-list list-unstyled sub-list">
+              <li class="active"><a href="taizhang-qianyue.html"><span>签约清单</span></a></li>
+              <li><a href="fenxiangqd.html"><span>分项清单</span></a></li>
+            </ul>
+          </div>
+          <div class="nav-box">
+            <h3><i class="fa fa-list-alt fa-fw"></i>0号台账</h3>
             <ul class="nav-list list-unstyled sub-list">
-              <li><a href="taizhang-qianyue.html"><span>签约清单</span></a></li>
               <li><a href="taizhang.html"><span>台账分解</span></a></li>
               <li><a href="taizhang-shenpi.html"><span>台账分解</span></a></li>
-              <li><a href="taizhang-duibi.html"><span>清单对比</span></a></li>
+              <li><a href="taizhang-duibi.html"><span>清单对比</span></a></li>              
+              <li><a href="taizhang-fxduibi.html"><span>分项对比</span></a></li>
               <li><a href="taizhang-bg.html"><span>台账修订</span></a></li>
             </ul>
           </div>
@@ -101,12 +108,22 @@
             <div>
               <div class="d-inline-block">
                 <div class="btn-group btn-group-toggle group-tab" data-toggle="buttons">
-                  <label class="btn btn-sm btn-light active">
+                  <a class="btn btn-sm btn-light active" href="#gcl">
+                    工程量清单
+                  </a>
+                  <!-- <label class="btn btn-sm btn-light active">
                     <input type="radio" name="options" id="option1" autocomplete="off" checked> 工程量清单
                   </label>
                   <label class="btn btn-sm btn-light">
-                    <input type="radio" name="options" id="option2" autocomplete="off"> 计日工清单
+                    <input type="radio" name="options" id="option3" autocomplete="off"> 分项工程量清单
                   </label>
+                  <label class="btn btn-sm btn-light">
+                    <input type="radio" name="options" id="option2" autocomplete="off"> 计日工清单
+                  </label> -->
+                  
+                  <a class="btn btn-sm btn-light" href="#jrg">
+                    计日工清单
+                  </a>
                 </div>
               </div>
             <!--工具-->
@@ -129,35 +146,39 @@
           <div class="w-100 sub-content row">
             <div class="c-body col-8">
               <div class="sjs-height-0" style="overflow: auto;">
-                <table class="table table-bordered table-sm">
-                    <tbody>
-                      <thead>
-                        <tr><th >清单编号</th><th>清单名称</th><th >单位</th><th >单价</th><th>数量</th><th >金额</th></tr>                        
-                        <tr><td>203-1</td><td>路基挖方</td><td></td><td></td><td></td><td>48759.01</td></tr>
-                        <tr><td>203-1-a</td><td>挖土方</td><td>m3</td><td>7.53</td><td>5213.67</td><td>39258.94</td></tr>
-                        <tr><td>203-1-b</td><td>挖石方</td><td>m3</td><td>7.69</td><td>1235.38</td><td>9500.07</td></tr>
-                        <tr><td>403-1</td><td>基础钢筋(包括灌注桩、承台、沉柱、沉井等)</td><td></td><td></td><td></td><td>406101.71</td></tr>
-                        <tr><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td>6.01</td><td>2703.4</td><td>16247.43</td></tr>
-                        <tr><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400)</td><td>kg</td><td>6.01</td><td>64867.6</td><td>389854.28</td></tr>
-                        <tr><td>403-2</td><td>下部结构钢筋</td><td></td><td></td><td></td><td>487372.27</td></tr>
-                        <tr><td>403-2-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td>6.02</td><td>54864.2</td><td>341255.32</td></tr>
-                        <tr><td>403-2-b</td><td>带肋钢筋(HRB335、HRB400)</td><td>kg</td><td>6.02</td><td>281.4</td><td>146116.95</td></tr>
-                      </thead>
-                    </tbody>
-                </table>
-                <table class="table table-bordered">
+                <div class="active" id="gcl">
+                  <table class="table table-bordered table-sm">
+                      <tbody>
+                        <thead>
+                          <tr><th>清单编号</th><th>清单名称</th><th >单位</th><th >单价</th><th>数量</th><th >金额</th></tr>
+                          <tr><td>203-1</td><td>路基挖方</td><td></td><td></td><td></td><td>48759.01</td></tr>
+                          <tr><td>203-1-a</td><td>挖土方</td><td>m3</td><td>7.53</td><td>5213.67</td><td>39258.94</td></tr>
+                          <tr><td>203-1-b</td><td>挖石方</td><td>m3</td><td>7.69</td><td>1235.38</td><td>9500.07</td></tr>
+                          <tr><td>403-1</td><td>基础钢筋(包括灌注桩、承台、沉柱、沉井等)</td><td></td><td></td><td></td><td>406101.71</td></tr>
+                          <tr><td>403-1-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td>6.01</td><td>2703.4</td><td>16247.43</td></tr>
+                          <tr><td>403-1-b</td><td>带肋钢筋(HRB335、HRB400)</td><td>kg</td><td>6.01</td><td>64867.6</td><td>389854.28</td></tr>
+                          <tr><td>403-2</td><td>下部结构钢筋</td><td></td><td></td><td></td><td>487372.27</td></tr>
+                          <tr><td>403-2-a</td><td>光圆钢筋(HPB235、HPB300)</td><td>kg</td><td>6.02</td><td>54864.2</td><td>341255.32</td></tr>
+                          <tr><td>403-2-b</td><td>带肋钢筋(HRB335、HRB400)</td><td>kg</td><td>6.02</td><td>281.4</td><td>146116.95</td></tr>
+                        </thead>
+                      </tbody>
+                  </table>                
+                </div> 
+                <div id="jrg">
+                  <table class="table table-bordered">
+                    <thead>
+                      <tr><th >清单编号</th><th>清单名称</th><th >单位</th><th >单价</th><th>数量</th><th >金额</th></tr> 
+                    </thead>
                     <tbody>
-                      <thead>
-                        <tr><th >清单编号</th><th>清单名称</th><th >单位</th><th >单价</th><th>数量</th><th >金额</th></tr> 
-                        <tr><td>J-101</td><td>班长</td><td>h</td><td>32</td><td>50</td><td>1600</td></tr>
-                        <tr><td>J-102</td><td>普通工</td><td>h</td><td>18</td><td>50</td><td>900</td></tr>
-                        <tr><td>J-201</td><td>水泥</td><td>kg</td><td>4.16</td><td>500</td><td>2080</td></tr>
-                        <tr><td>J-202</td><td>钢筋</td><td>kg</td><td>5.1</td><td>500</td><td>2550</td></tr>
-                        <tr><td>J-301-1</td><td>1.5~2.5m3</td><td>h</td><td>95</td><td>50</td><td>4750</td></tr>
-                        <tr><td>J-301-2</td><td>2.5m3以上</td><td>h</td><td>125</td><td>50</td><td>6250</td></tr>
-                      </thead>
+                      <tr><td>J-101</td><td>班长</td><td>h</td><td>32</td><td>50</td><td>1600</td></tr>
+                      <tr><td>J-102</td><td>普通工</td><td>h</td><td>18</td><td>50</td><td>900</td></tr>
+                      <tr><td>J-201</td><td>水泥</td><td>kg</td><td>4.16</td><td>500</td><td>2080</td></tr>
+                      <tr><td>J-202</td><td>钢筋</td><td>kg</td><td>5.1</td><td>500</td><td>2550</td></tr>
+                      <tr><td>J-301-1</td><td>1.5~2.5m3</td><td>h</td><td>95</td><td>50</td><td>4750</td></tr>
+                      <tr><td>J-301-2</td><td>2.5m3以上</td><td>h</td><td>125</td><td>50</td><td>6250</td></tr>
                     </tbody>
-                </table>
+                  </table>
+                </div>
               </div>
             </div>
             <div class="c-body col-4">