更新部分文字，新增组成物

gongliao.html

@@ -36,7 +36,7 @@
                       <ul id="treeDemo" class="ztree"></ul>
                     </div>
                   </div>
-                  <div class="main-content col-lg-9 p-0">
+                  <div class="main-content col-lg-7 p-0">
                     <div class="main-data">
                       <table class="table table-sm table-bordered m-0">
                       <thead>
@@ -44,9 +44,9 @@
                           <th></th>
                           <th>编码</th>
                           <th>名称</th>
-                          <th>规格</th>
-                          <th>单位</th>
-                          <th>基价单价</th>
+                          <th>规格型号</th>
+                          <th>计量单位</th>
+                          <th>单价</th>
                           <th>类型</th>
                         </tr>
                       </thead>
@@ -109,6 +109,41 @@
                     </table>
                     </div>
                   </div>
+                    <div class="main-side col-lg-2 p-0">
+                      <table class="table table-sm table-bordered m-0">
+                        <thead>
+                          <tr><th></th><th>编码</th><th>名称</th><th>计量单位</th><th>单价</th><th>消耗量</th></tr>
+                        </thead>
+                        <tbody>
+                          <tr><td>1</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>2</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>3</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>4</td><td></td><td></td><td></td><td></td><td></td></tr>
+                        </tbody>
+                      </table>
+                      <table class="table table-sm table-bordered m-0">
+                        <thead>
+                          <tr><th></th><th>编码</th><th>名称</th><th>计量单位</th><th>单价</th><th>消耗量</th></tr>
+                        </thead>
+                        <tbody>
+                          <tr><td>1</td><td>01010101</td><td>水泥32.5</td><td>kg</td><td>0.25</td><td>243.000</td></tr>
+                          <tr><td>2</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>3</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>4</td><td></td><td></td><td></td><td></td><td></td></tr>
+                        </tbody>
+                      </table>
+                      <table class="table table-sm table-bordered m-0">
+                        <thead>
+                          <tr><th></th><th>编码</th><th>名称</th><th>计量单位</th><th>单价</th><th>消耗量</th></tr>
+                        </thead>
+                        <tbody>
+                          <tr><td>1</td><td>xxx</td><td>机上人工</td><td>工日</td><td>28.00</td><td>2.540</td></tr>
+                          <tr><td>2</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>3</td><td></td><td></td><td></td><td></td><td></td></tr>
+                          <tr><td>4</td><td></td><td></td><td></td><td></td><td></td></tr>
+                        </tbody>
+                      </table>
+                    </div>
                 </div>
             </div>
         </div>

main.html

@@ -35,7 +35,7 @@
                       <table class="table table-hover table-bordered">
                         <thead><tr><th>工料机库名称</th><th>编办</th><th>定额库</th><th width="160">添加时间</th><th width="90">操作</th></tr></thead>
                         <tbody>
-                          <tr><td><a href="gongliao.html">XX工料机库</a></td><td>重庆2018</td><td>XXX定额库（重庆2018）</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
+                          <tr><td><a href="gongliao.html">XX工料机库</a></td><td>重庆2018</td><td>XXX定额库（重庆2018）<br>ABC定额库（重庆2017）</td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
                           <tr><td><a href="gongliao.html">XX工料机库</a></td><td>重庆2018</td><td></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
                           <tr><td><a href="gongliao.html">XX工料机库</a></td><td>重庆2018</td><td></td><td>2017-01-01 </td><td><a href="javacript:void(0);" data-toggle="modal" data-target="#edit" title="编辑"><i class="fa fa-pencil-square-o"></i></a> <a href="javacript:void(0);" data-toggle="modal" data-target="#del" class="text-danger" title="删除"><i class="fa fa-remove"></i></a></td></tr>
                         </tbody>
@@ -51,7 +51,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">添加定额库</h5>
+                  <h5 class="modal-title">添加工料机库</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -60,7 +60,7 @@
                   <form>
                     <div class="form-group">
                       <label>工料机名称</label>
-                      <input class="form-control" placeholder="输入定额库名称" type="text">
+                      <input class="form-control" placeholder="输入工料机库名称" type="text">
                     </div>
                     <div class="form-group">
                       <label>编办名称</label>
@@ -80,7 +80,7 @@
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
-                  <h5 class="modal-title">编辑工料机</h5>
+                  <h5 class="modal-title">编辑工料机库</h5>
                   <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                     <span aria-hidden="true">×</span>
                   </button>
@@ -89,11 +89,11 @@
                   <form>
                     <div class="form-group">
                       <label>工料机库名称</label>
-                      <input class="form-control" placeholder="输入编码" type="text" value="XXX库">
+                      <input class="form-control" placeholder="输入工料机库名称" type="text" value="XXX库">
                     </div>
                     <div class="form-group">
                       <label>编办名称</label>
-                      <select class="form-control"><option>重庆2018</option></select>
+                      <select class="form-control" disabled><option>重庆2018</option></select>
                     </div>
                   </form>
                 </div>