修改工作内容

dinge.html

@@ -73,13 +73,13 @@
                                             <td>1</td><td>AA0001</td><td>人工挖土方</td><td>100m3</td><td>840.84</td><td>人工挖土方</td><td>1</td>
                                           </tr>
                                           <tr>
-                                            <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                            <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                           </tr>
                                           <tr>
-                                            <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                            <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                           </tr>
                                           <tr>
-                                            <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                            <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                           </tr>
                                         </tbody>
                                       </table>
@@ -104,25 +104,51 @@
                               </div>
                               <div class="tab-pane" id="tgz" role="tabpanel">
                                 <div class="warp-p2">
-                                  <!-- <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked=""> 适合本项所有定额</label></div> -->
-                                  <p class="m-2">适合本项所有定额</p>
-                                  <p class="m-2">1.挖土、修理边底。2.挖淤泥、流沙、修理边底。</p>
-                                  <p class="m-2">适合本项部分定额</p>
+                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1"> 适合本项部分定额</label></div>
+                                  <!-- <p class="m-2">适合本项所有定额</p> -->
+                                  <table class="table table-sm table-bordered m-0">
+                                    <tr>
+                                      <td>1.挖土、修理边底。2.挖淤泥、流沙、修理边底。</td>
+                                    </tr>
+                                  </table>
+                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios2" value="option1"> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios2" value="option1" checked=""> 适合本项部分定额</label></div>
                                   <table class="table table-sm table-bordered m-0">
                                     <thead>
                                       <tr>
+                                        <th></th>
                                         <th>编码</th>
                                         <th>工作内容</th>
                                       </tr>
                                     </thead>
                                     <tbody>
-                                      <tr rowspan="4">
-                                        <td data-toggle="modal" data-target="#editBianma"><p class="m-0">AA0017</p><p class="m-0">AA0018</p><p class="m-0">AA0019</p><p class="m-0">AA0020</p></td>
-                                        <td>1.挖土、修理边底。</td>
+                                      <tr>
+                                        <td>1</td>
+                                        <td data-toggle="modal" data-target="#editBianma"><p class="m-0">AA0017</p><p class="m-0">AA0018</p><p class="m-0">AA0019</p></td>
+                                        <td><p class="m-0">1.松填土：5m内的就地取土，铺平。</p><p class="m-0">2.夯填土方（石渣）：5m内的就地取土（石渣）、铺平、夯实、洒水等。</p></td>
+                                      </tr>
+                                      <tr>
+                                        <td>2</td>
+                                        <td data-toggle="modal" data-target="#editBianma"><p class="m-0">AA0020</p><p class="m-0">AA0021</p><p class="m-0">AA0022</p></td>
+                                        <td><p class="m-0">1.松填土：5m内的就地取土，铺平。</p><p class="m-0">2.夯填土方（石渣）：5m内的就地取土（石渣）、铺平、夯实、洒水等。</p></td>
+                                      </tr>
+                                      <tr>
+                                        <td>3</td>
+                                        <td data-toggle="modal" data-target="#editBianma"></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>4</td>
+                                        <td data-toggle="modal" data-target="#editBianma"></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>5</td>
+                                        <td data-toggle="modal" data-target="#editBianma"></td>
+                                        <td></td>
                                       </tr>
                                     </tbody>
                                   </table>
-                                  <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#addNewgznr" class="btn btn-primary btn-sm">新增工作内容</a></div>
+                                  <!-- <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#addNewgznr" class="btn btn-primary btn-sm">新增工作内容</a></div> -->
                                 </div>
                               </div>
                           </div>
@@ -154,13 +180,13 @@
                                               <td>人工</td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td></td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                           </tbody>
                                         </table>
@@ -176,13 +202,13 @@
                                               <td>20</td><td>20</td><td>0</td><td>四舍五入</td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>2</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>3</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>4</td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                           </tbody>
                                         </table>
@@ -197,13 +223,13 @@
                                               <td>1</td><td>1</td><td><i class="fa fa-check"></td><td>2</td><td>挖湿土时</td><td>人工x1.18</td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>2</td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>3</td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                             <tr>
-                                              <td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>
+                                              <td>4</td><td></td><td></td><td></td><td></td><td></td>
                                             </tr>
                                           </tbody>
                                         </table>
@@ -234,20 +260,12 @@
                 <div class="modal-body">
                   <form>
                     <div class="form-group">
-                      <label>选择</label>
-                      <select class="form-control" id="exampleSelect1"><option>适合本项所有定额</option><option>适合本项部分定额</option></select>
-                    </div>
-                    <div class="form-group">
                       <label>内容</label>
                       <textarea class="form-control" id="" rows="5"></textarea>
                     </div>
                   </form>
                   <form>
                     <div class="form-group">
-                      <label>选择</label>
-                      <select class="form-control" id="exampleSelect1"><option>适合本项部分定额</option><option>适合本项所有定额</option></select>
-                    </div>
-                    <div class="form-group">
                       <label>编码</label>
                       <div class="form-control">
                         <div class="row code">

fuzhu.html

@@ -77,29 +77,29 @@
                           <td>人工×26.72</td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>5</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>6</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>7</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>
                   </div>
                   <div class="main-content col-lg-5 p-0">
                     <div class="m-2">
-                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked> 工料机整体调整</label></div></p>
+                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1" checked> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" id="optionsRadios1" value="option1"> 单个工料机调整</label></div></p>
                     </div>
                     <table class="table table-sm table-bordered m-0">
                       <thead>
@@ -128,7 +128,7 @@
                       </tbody>
                     </table>
                     <div class="m-2">
-                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1" checked> 单个工料机调整</label></div></p>
+                      <p><div class="form-check"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1"> 工料机整体调整</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios1" id="optionsRadios" value="option1" checked> 单个工料机调整</label></div></p>
                     </div>
                     <table class="table table-sm table-bordered m-0">
                       <thead>
@@ -149,25 +149,25 @@
                           <td>1.18</td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>2</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>3</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>4</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>

gongliao.html

@@ -88,31 +88,31 @@
                           <td>材料</td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>4</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>5</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                         <tr>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
-                          <td>&nbsp;</td>
+                          <td>6</td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>