Merge branch 'master' of http://192.168.1.41:3000/S.H.I.E.L.D./measureSAAS.v3.git

biaoduan-panel.html

@@ -56,15 +56,20 @@
               <li class="active"><a href="biaoduan-panel.html"><i class="fa fa-pie-chart"></i> <span>标段概况</span></a></li>
             </ul>
           </div>
+         <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li><a href="taizhang-qianyue.html"><i class="fa fa-money"></i> <span>签约合同</span></a></li>
+            </ul>
+          </div>
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
               <li><a href="yufukuan-qi.html"><i class="fa fa-handshake-o"></i> <span>预付款</span></a></li>
             </ul>
           </div>
+
           <div class="nav-box">
             <h3><i class="fa fa-list-alt"></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>

taizhang-qianyue.html

@@ -47,6 +47,11 @@
               <li><a href="biaoduan-panel.html"><i class="fa fa-pie-chart"></i> <span>标段概况</span></a></li>
             </ul>
           </div>
+           <div class="nav-box">
+            <ul class="nav-list list-unstyled">
+              <li><a href="taizhang-qianyue.html"><i class="fa fa-money"></i> <span>签约合同</span></a></li>
+            </ul>
+          </div>
           <div class="nav-box">
             <ul class="nav-list list-unstyled">
               <li><a href="yufukuan-qi.html"><i class="fa fa-handshake-o"></i> <span>预付款</span></a></li>
@@ -55,7 +60,6 @@
           <div class="nav-box">
             <h3><i class="fa fa-list-alt"></i> 0号台账</h3>
             <ul class="nav-list list-unstyled sub-list">
-              <li class="active"><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>
@@ -133,7 +137,7 @@
                     <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>48759.01</td></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>