Merge branch 'spreadJS版' of http://192.168.1.12:3000/S.H.I.E.L.D./dingeku into spreadJS版

dinge.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->
@@ -111,6 +110,38 @@
                                       <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="optionsRadios2" id="optionsRadios2" value="option1"> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios2" 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>
+                                        <td>1</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianmaQ" class="m-0">编辑编码</a><p class="m-0">AA0017</p><p class="m-0">AA0018</p><p class="m-0">AA0019</p><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></div></td>
+                                      </tr>
+                                      <tr>
+                                        <td>2</td>
+                                        <td><a href data-toggle="modal" data-target="#editBianma" class="m-0">点击勾选编码</a></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>3</td>
+                                        <td></td>
+                                        <td></td>
+                                      </tr>
+                                      <tr>
+                                        <td>4</td>
+                                        <td></td>
+                                        <td></td>
+                                      </tr>
+                                    </tbody>
+                                  </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>
@@ -123,32 +154,31 @@
                                     <tbody>
                                       <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><a href data-toggle="modal" data-target="#editBianma" class="m-0">编辑编码</a><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><a href data-toggle="modal" data-target="#editBianma" class="m-0">编辑编码</a><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><a href data-toggle="modal" data-target="#editBianma" class="m-0">点击勾选编码</a></td>
                                         <td></td>
                                       </tr>
                                       <tr>
                                         <td>4</td>
-                                        <td data-toggle="modal" data-target="#editBianma"></td>
+                                        <td></td>
                                         <td></td>
                                       </tr>
                                       <tr>
                                         <td>5</td>
-                                        <td data-toggle="modal" data-target="#editBianma"></td>
+                                        <td></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>
                               </div>
                           </div>
@@ -220,7 +250,7 @@
                                           <thead><tr><th width="30"></th><th width="40">编号</th><th width="120">本分项全部适用</th><th>调整顺序</th><th>名称</th><th>内容</th></tr></thead>
                                           <tbody>
                                             <tr>
-                                              <td>1</td><td>1</td><td><i class="fa fa-check"></td><td>2</td><td>挖湿土时</td><td>人工x1.18</td>
+                                              <td>1</td><td>1</td><td><label class="form-check-label"><input type="checkbox" class="form-check-input" checked></label></td><td>2</td><td>挖湿土时</td><td>人工x1.18</td>
                                             </tr>
                                             <tr>
                                               <td>2</td><td></td><td></td><td></td><td></td><td></td>
@@ -368,6 +398,65 @@
         </div>
     </div>
 
+    <div class="modal fade" id="editBianmaQ" data-backdrop="static" style="display: none;" aria-hidden="true">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">修改编码</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                  <form>
+                    <div class="form-group">
+                      <label>编码</label>
+                      <div class="form-control">
+                        <div class="row code">
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0017
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0018
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0019
+                            </label>
+                          </div>
+                          <div class="w-100"></div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0020
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0021
+                            </label>
+                          </div>
+                          <div class="col">
+                            <label class="form-check-label">
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" checked> AA0022
+                            </label>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </form>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+                    <a href="" class="btn btn-primary">确定</a>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="modal fade" id="editBianma" data-backdrop="static" style="display: none;" aria-hidden="true">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
@@ -401,17 +490,17 @@
                           <div class="w-100"></div>
                           <div class="col">
                             <label class="form-check-label">
-                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1"> AA0020
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" disabled> AA0020
                             </label>
                           </div>
                           <div class="col">
                             <label class="form-check-label">
-                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1"> AA0021
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" disabled> AA0021
                             </label>
                           </div>
                           <div class="col">
                             <label class="form-check-label">
-                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1"> AA0022
+                              <input class="form-check-input" type="checkbox" id="inlineCheckbox1" value="option1" disabled> AA0022
                             </label>
                           </div>
                         </div>

fuzhu.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->
@@ -42,7 +41,7 @@
             <div class="container-fluid">
                 <div class="row">
                   <div class="main-side col-lg-7 p-0">
-                    <div class="main-date">
+                    <div class="main-data">
                     <table class="table table-sm table-bordered m-0">
                       <thead>
                         <tr>

gongliao.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->

main.html

@@ -7,7 +7,6 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>定额库编辑器</title>
     <link rel="stylesheet" href="css/bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="css/bootstrap/themes.css">
     <link rel="stylesheet" href="css/main.css">
     <link rel="stylesheet" href="css/font-awesome/font-awesome.min.css">
     <!--zTree-->