部分内容增加

biaoduan-panel.html

@@ -64,7 +64,7 @@
           <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-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>
@@ -651,7 +651,7 @@
                     <div class="col-4">
                       <div class="input-group input-group-sm">
                         <div class="input-group-prepend">
-                          <span class="input-group-text">数量</span>
+                          <span class="input-group-text">单价</span>
                         </div>
                         <input type="number" class="form-control" value="2" readonly="">
                       </div>

biaoduan.html

@@ -620,7 +620,7 @@
                   <h5 class="modal-title">添加新标段</h5>
               </div>
               <div class="modal-body">
-                <div class="form-group">
+                <!-- <div class="form-group">
                   <label>文件夹<b class="text-danger">*</b></label>
                   <input class="form-control form-control-sm"  placeholder="选择文件夹目录" type="text"  data-toggle="dropdown" >
                   <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
@@ -630,7 +630,7 @@
                     </form>
                       </div>
                   </div>
-                </div>
+                </div> -->
                 <div class="form-group">
                   <label>标段名称<b class="text-danger">*</b></label>
                   <input class="form-control form-control-sm"  placeholder="输入标段名称" type="text">
@@ -643,7 +643,7 @@
                   </div>
                 </div>
                 <div class="form-group">
-                  <label ><b class="text-danger">*</b>计价规范</label>
+                  <label ><b class="text-danger">*</b>计价标准</label>
                   <div>
                       <div class="form-check form-check-inline">
                         <input class="form-check-input" type="radio" id="inlineCheckbox1" value="option1" checked="">

jiliang-qi-detail-2.html

@@ -117,6 +117,7 @@
               </div>
             </div>
             <div class="c-body col-4">
+                <!--甲供材料-->
               <table class="table table-bordered">
                 <tr><th class="text-center" width="50%">名称</th><th class="text-center">金额</th></tr>
                 <tr><td>本期到场</td><td class="text-right"></td></tr>
@@ -124,6 +125,18 @@
                 <tr><td>本期扣回</td><td class="text-right"></td></tr>
                 <tr><td>截止本期扣回</td><td class="text-right"></td></tr>
               </table>
+                <!--奖罚金-->
+              <table class="table table-bordered">
+                <tr><th class="text-center" width="50%">名称</th><th class="text-center">金额</th></tr>
+                <tr><td>金额</td><td class="text-right"></td></tr>
+              </table>
+                  <!--其他-->
+              <table class="table table-bordered">
+                <tr><th class="text-center" width="50%">名称</th><th class="text-center">金额</th></tr>
+                <tr><td>金额</td><td class="text-right"></td></tr>
+                <tr><td>本期金额</td><td class="text-right"></td></tr>
+                <tr><td>截止本期金额</td><td class="text-right"></td></tr>
+              </table>
             </div>
           </div>
 				</div>

taizhang-qianyue.html

@@ -55,7 +55,7 @@
           <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 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>
@@ -146,8 +146,11 @@
                   <tr><td colspan="2">暂估价(C)</td><td></td></tr>
                   <tr><td colspan="2">其他费用(D)</td><td></td></tr>
                   <tr><td colspan="2">计日工合计(E)</td><td></td></tr>
+                  <tr><td colspan="2">签约合同价（不含暂列金）</td><td></td></tr>
                   <tr><td colspan="2">签约合同价(F=A+B+C+D)</td><td></td></tr>
                   <tr><td colspan="2">签约合同价修正</td><td></td></tr>
+                  <tr><td colspan="2">签约开工预付款</td><td></td></tr>
+                  <tr><td colspan="2">材料预付款</td><td></td></tr>
                 </table>
               </div>
             </div>

taizhang.html

@@ -248,8 +248,12 @@
                       <a class="nav-link active" href="#">计量单元</a>
                     </li>
                     <li class="nav-item">
-                      <div class="ml-2">
+                      <div class="ml-2 mt-1">
                         <div class="d-inline-flex">
+                          <a href="" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="新增"><i class="fa fa-plus" aria-hidden="true"></i></a>
+                          <a href="" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                          <a href="" class="btn btn-sm btn-light text-primary disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                          <a href="" class="btn btn-sm btn-light text-primary disabled" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
                           <a href="" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                           <a href="" class="btn btn-sm btn-light text-primary" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                         </div>