zhangweicheng 5 лет назад
Родитель
Сommit
3e672d1cd4

+ 397 - 374
web/building_saas/glj/html/project_glj.html

@@ -1,396 +1,419 @@
 <style type="text/css">
-    .copy,#save-as-tips{
-        display: none;
-    }
+  .copy,
+  #save-as-tips {
+    display: none;
+  }
 </style>
 <div class="toolsbar px-1" id="projectGljToolsBar">
-    <div class="form-inline py-1">
-        <label class="mx-2">使用单价文件:<span id="current-name"></span>(<label class="a_color" id="pop-used-list" data-original-title="" title="">与<span id="used-project-count">0</span>个单位工程同步</label>)
-            <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-unitFile"><i class="fa fa-exchange"></i> 选择其他</a>
-            <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#unitFile-save-as"><i class="fa fa-files-o"></i> 另存单独用</a>
-            <a class="btn btn-sm ml-1" id="editUnitFile" href="/unitPrice/index/123" target="_"> 编辑单价文件</a>
-        </label>
-        <select class="form-control form-control-sm" style="width: auto; font-size: .875rem ;color: #007bff" id="adjustType">
-            <option value="priceInfo" selected>造价信息差额调整法</option>
-            <option value="priceCoe">价格指数调整法</option>
-        </select>
-    </div>
-    
+  <div class="form-inline py-1">
+    <label class="mx-2">使用单价文件:<span id="current-name"></span>(<label class="a_color" id="pop-used-list"
+        data-original-title="" title="">与<span id="used-project-count">0</span>个单位工程同步</label>)
+      <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#change-unitFile"><i
+          class="fa fa-exchange"></i> 选择其他</a>
+      <a class="btn btn-sm ml-1" href="#" data-toggle="modal" data-target="#unitFile-save-as"><i
+          class="fa fa-files-o"></i> 另存单独用</a>
+      <a class="btn btn-sm ml-1" id="editUnitFile" href="/unitPrice/index/123" target="_"> 编辑单价文件</a>
+    </label>
+    <select class="form-control form-control-sm" style="width: auto; font-size: .875rem ;color: #007bff"
+      id="adjustType">
+      <option value="priceInfo" selected>造价信息差额调整法</option>
+      <option value="priceCoe">价格指数调整法</option>
+    </select>
+  </div>
+
 </div>
 
 <div class="container-fluid">
-    <div class="row">
-        <div class="gl-side  " id='filterType'>
-            <ul class="nav flex-column nav-side mt-2 mb-2" style="margin-top: 0px!important;">
-                <li class="nav-item" ><a class="nav-link active" href="#" id="ALL">所有人材机</a></li>
-             <!--   <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="LABOUR">人工</a></li>
+  <div class="row">
+    <div class="gl-side  " id='filterType'>
+      <ul class="nav flex-column nav-side mt-2 mb-2" style="margin-top: 0px!important;">
+        <li class="nav-item"><a class="nav-link active" href="#" id="ALL">所有人材机</a></li>
+        <!--   <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="LABOUR">人工</a></li>
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="GENERAL_MATERIAL">材料</a></li>
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="GENERAL_MACHINE">机械</a></li>
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="MAIN_MATERIAL">主材</a></li>
                 <li class="nav-item li_sub"><a class="nav-link" href="javascript:void(0)" id="EQUIPMENT">设备</a></li>-->
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="TECH">措施项目人材机</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="JGCL">甲供材料</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="SCHZ">三材汇总</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZYCL">主要材料</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="AMAE">承包人主要材料设备</a></li>
-                <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="PBCL">评标材料</a></li>
-            </ul>
-        </div>
-        <div class="main-content col p-0" id="material_adjust" style="overflow: hidden; display: none">
-            <div class="" id="material_adjust_sheet" style="overflow: hidden;width: 100%">
-            </div>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="TECH">措施项目人材机</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="JGCL">甲供材料</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZGCL">暂估材料</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="SCHZ">三材汇总</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="ZYCL">主要材料</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="AMAE">承包人主要材料设备</a></li>
+        <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="PBCL">评标材料</a></li>
+      </ul>
+    </div>
+    <div class="main-content col p-0" id="material_adjust" style="overflow: hidden; display: none">
+      <div class="" id="material_adjust_sheet" style="overflow: hidden;width: 100%">
+      </div>
+    </div>
+    <div class="main-content col p-0" id="config_material" style="overflow: hidden; display: none">
+      <!--暂估材料,主要材料等-->
+      <div class="top-content" id="configMaterialTop" style="overflow: hidden">
+        <div class="main-data-top" style="width: 100%; overflow: hidden" id="config_material_sheet">
         </div>
-        <div class="main-content col p-0" id="config_material" style="overflow: hidden; display: none"><!--暂估材料,主要材料等-->
-            <div class="top-content" id="configMaterialTop" style="overflow: hidden">
-                <div class="main-data-top" style="width: 100%; overflow: hidden" id="config_material_sheet">
-                </div>
-            </div>
-            <div class="resize-y" id="configMaterialResize"></div>
-            <div class="bottom-content" id="configMaterialBottom">
-                <ul class="nav nav-tabs" role="tablist">
-                      <li class="nav-item">
-                          <a class=" nav-link  active " data-toggle="tab" data-name="related_sheet" id="related_link" href="#related_div" role="tab">关联暂估材料</a>
-                      </li>
-                  <!--   <li class="nav-item">
+      </div>
+      <div class="resize-y" id="configMaterialResize"></div>
+      <div class="bottom-content" id="configMaterialBottom">
+        <ul class="nav nav-tabs" role="tablist">
+          <li class="nav-item">
+            <a class=" nav-link  active " data-toggle="tab" data-name="related_sheet" id="related_link"
+              href="#related_div" role="tab">关联暂估材料</a>
+          </li>
+          <!--   <li class="nav-item">
                          <a class=" nav-link " data-toggle="tab" data-name="detail_sheet" id="detail_link" href="#related_div" role="tab">关联暂估材料明细</a>
                      </li>-->
-                </ul>
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div class="tab-pane active" id="related_div" role="tabpanel">
-                        <div class="form-inline py-1 toolsbar_feeRate" id="filterToolDiv">
-                            <label class="mx-2" for="filterGljName">材料名称包括:</label>
-                            <input type="text" class="form-control form-control-sm" id="filterGljName">
-                            <button type="button" class="btn btn-outline-primary btn-sm" id = "filterAgain">重新过滤</button>
-                           <!-- <button type="button" class="btn btn-outline-primary btn-sm" id = "autoRelated">自动关联招标材料</button>-->
-                        </div>
-                        <div class="main-data-bottom" id="related_sheet" style="overflow:hidden"></div>
-                    </div>
-                </div>
+        </ul>
+        <!-- Tab panes -->
+        <div class="tab-content">
+          <div class="tab-pane active" id="related_div" role="tabpanel">
+            <div class="form-inline py-1 toolsbar_feeRate" id="filterToolDiv">
+              <label class="mx-2" for="filterGljName">材料名称包括:</label>
+              <input type="text" class="form-control form-control-sm" id="filterGljName">
+              <button type="button" class="btn btn-outline-primary btn-sm" id="filterAgain">重新过滤</button>
+              <!-- <button type="button" class="btn btn-outline-primary btn-sm" id = "autoRelated">自动关联招标材料</button>-->
             </div>
+            <div class="main-data-bottom" id="related_sheet" style="overflow:hidden"></div>
+          </div>
         </div>
+      </div>
+    </div>
 
-        <div class="main-content col p-0" id="project-glj-main" style="overflow: hidden; ">
-            <div class="top-content" id="projectGljTop" style="overflow: hidden">
-                <div class="main-data-top" style="width: 100%; overflow: hidden" id="project_glj_sheet">
-                </div>
-            </div>
-            <div class="resize-y" id="projectGljResize"></div>
-            <div class="bottom-content" id="projectGljBottom">
-                <ul class="nav nav-tabs" role="tablist">
-                  <li class="nav-item">
-                    <a class="nav-link active show" id="mixRatio-nav" data-toggle="tab" href="#ph_div" role="tab" aria-selected="false">组成物计算</a>
-                  </li>
-                  <li class="nav-item">
-                    <a class="nav-link " id="ration-nav" data-toggle="tab" href="#ph_div" role="tab" aria-selected="true">相关定额</a>
-                  </li>
-                  <li class="nav-item">
-                    <a class="nav-link" id="info-nav"  data-toggle="tab" data-name="info"  href="#info_price_div" role="tab">信息价</a>
-                </li>
-                   
-                   <!-- <li class="nav-item">
+    <div class="main-content col p-0" id="project-glj-main" style="overflow: hidden; ">
+      <div class="top-content" id="projectGljTop" style="overflow: hidden">
+        <div class="main-data-top" style="width: 100%; overflow: hidden" id="project_glj_sheet">
+        </div>
+      </div>
+      <div class="resize-y" id="projectGljResize"></div>
+      <div class="bottom-content" id="projectGljBottom">
+        <ul class="nav nav-tabs" role="tablist">
+          <li class="nav-item">
+            <a class="nav-link active show" id="mixRatio-nav" data-toggle="tab" href="#ph_div" role="tab"
+              aria-selected="false">组成物计算</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link " id="ration-nav" data-toggle="tab" href="#ph_div" role="tab"
+              aria-selected="true">相关定额</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" id="info-nav" data-toggle="tab" data-name="info" href="#info_price_div"
+              role="tab">信息价</a>
+          </li>
+
+          <!-- <li class="nav-item">
                         <a class="nav-link" data-toggle="tab" data-name="machine_sheet" id="machine_ratio_link" href="#ph_div" role="tab">机械单价</a>
                     </li>-->
-                </ul>
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <!--<div class="tab-pane active" id="glj_de_div" role="tabpanel">
+        </ul>
+        <!-- Tab panes -->
+        <div class="tab-content">
+          <!--<div class="tab-pane active" id="glj_de_div" role="tabpanel">
                         <div class="main-data-bottom ovf-hidden">
                             相关定额
                         </div>
                     </div>-->
-                    <div class="tab-pane active" id="ph_div" role="tabpanel">
-                        <div class="main-data-bottom" id="mix_ratio_sheet" style="overflow:hidden">
-                        </div>
-                    </div>
-                   <div class="tab-pane" id="info_price_div" role="tabpanel">
-                    <div class="form-inline py-1 toolsbar_feeRate" id="infoToolDiv" style="background:#f7f7f9">
-                      <label class="mx-2" for="info_area">地区</label>
-                      <select class="form-control form-control-sm" style="font-size: .875rem; width:120px;" id="info_area">
-                        <option value=""></option>
-                        <option value="江北区" >江北区</option>
-                      </select>
-                      <label class="mx-2" for="info_year">期数</label>
-                      <select class="form-control form-control-sm" style="font-size: .875rem; width:100px;" id="info_year">
-                        <option value=""></option>
-                        <option value="2020" >2020</option>
-                        <option value="2019" >2019</option>
-                        <option value="2018" >2018</option>
-                        <option value="2017" >2017</option>
-                      </select>
-                      <select class="form-control form-control-sm" style="font-size: .875rem; width:80px;" id="info_month">
-                        <option value=""></option>
-                        <option value="01" >01</option>
-                        <option value="02" >02</option>
-                        <option value="03" >03</option>
-                        <option value="04" >04</option>
-                        <option value="05" >05</option>
-                        <option value="06" >06</option>
-                        <option value="07" >07</option>
-                        <option value="08" >08</option>
-                        <option value="09" >09</option>
-                        <option value="10" >10</option>
-                        <option value="11" >11</option>
-                        <option value="12" >12</option>
-                      </select>
-                      &nbsp;
-                      <input type="text" class="form-control form-control-sm" id="info_search_name">
-                      <button type="button" class="btn btn-outline-primary btn-sm mr-auto" id="info_search_btn"><i class="fa fa-search" aria-hidden="true"></i></button>
-                      <button type="button" class="btn btn-primary  btn-sm" id="muti_apply_info">批量套用</button>
-                   </div>
-                    <div class="main-data-bottom" id="info_price_sheet"> </div>
-                    </div>
-                </div>
+          <div class="tab-pane active" id="ph_div" role="tabpanel">
+            <div class="main-data-bottom" id="mix_ratio_sheet" style="overflow:hidden">
             </div>
+          </div>
+          <div class="tab-pane" id="info_price_div" role="tabpanel">
+            <div class="form-inline py-1 toolsbar_feeRate" id="infoToolDiv" style="background:#f7f7f9">
+              <label class="mx-2" for="info_area">地区</label>
+              <select class="form-control form-control-sm" style="font-size: .875rem; width:120px;" id="info_area">
+                <option value=""></option>
+                <option value="江北区">江北区</option>
+              </select>
+              <label class="mx-2" for="info_year">期数</label>
+              <select class="form-control form-control-sm" style="font-size: .875rem; width:100px;" id="info_year">
+                <option value=""></option>
+                <option value="2020">2020</option>
+                <option value="2019">2019</option>
+                <option value="2018">2018</option>
+                <option value="2017">2017</option>
+              </select>
+              <select class="form-control form-control-sm" style="font-size: .875rem; width:80px;" id="info_month">
+                <option value=""></option>
+                <option value="01">01</option>
+                <option value="02">02</option>
+                <option value="03">03</option>
+                <option value="04">04</option>
+                <option value="05">05</option>
+                <option value="06">06</option>
+                <option value="07">07</option>
+                <option value="08">08</option>
+                <option value="09">09</option>
+                <option value="10">10</option>
+                <option value="11">11</option>
+                <option value="12">12</option>
+              </select>
+              &nbsp;
+              <input type="text" class="form-control form-control-sm" id="info_search_name">
+              <button type="button" class="btn btn-outline-primary btn-sm mr-auto" id="info_search_btn"><i
+                  class="fa fa-search" aria-hidden="true"></i></button>
+              <button type="button" class="btn btn-primary  btn-sm" id="muti_apply_info">批量套用</button>
+            </div>
+            <div class="main-data-bottom" id="info_price_sheet"> </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 <!--弹出更换-->
 <div class="modal fade" id="change-unitFile" data-backdrop="static">
-    <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">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label class="custom-control custom-radio">
-                        <input name="change-type" type="radio" class="" checked="checked" value="0">
-                        <span class="custom-control-indicator"></span>
-                        <span class="custom-control-description">从本建设项目中选择</span>
-                    </label>
-                    <label class="custom-control custom-radio">
-                        <input name="change-type" type="radio" class="" value="1">
-                        <span class="custom-control-indicator"></span>
-                        <span class="custom-control-description">从其他建设项目中复制</span>
-                    </label>
-                </div>
-                <!--从本建设项目中选择-->
-                <div class="form-group select option">
-                    <label id="current-project-name"></label>
-                    <select class="form-control" id="self-file"></select>
-                </div>
-                <!--从其他建设项目中复制-->
-                <div class="form-group copy option">
-                    <label>选择建设项目</label>
-                    <select class="form-control" id="other-project"></select>
-                </div>
-                <div class="form-group copy option">
-                    <select class="form-control" id="other-file"></select>
-                    <small class="form-text text-muted">你选择的单价文件将复制一份至新项目,不会影响原建设项目的单价文件。</small>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <a href="javascript:void(0);" class="btn btn-primary" id="change-file-confirm">确定</a>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-            </div>
+  <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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div class="form-group">
+          <label class="custom-control custom-radio">
+            <input name="change-type" type="radio" class="" checked="checked" value="0">
+            <span class="custom-control-indicator"></span>
+            <span class="custom-control-description">从本建设项目中选择</span>
+          </label>
+          <label class="custom-control custom-radio">
+            <input name="change-type" type="radio" class="" value="1">
+            <span class="custom-control-indicator"></span>
+            <span class="custom-control-description">从其他建设项目中复制</span>
+          </label>
+        </div>
+        <!--从本建设项目中选择-->
+        <div class="form-group select option">
+          <label id="current-project-name"></label>
+          <select class="form-control" id="self-file"></select>
+        </div>
+        <!--从其他建设项目中复制-->
+        <div class="form-group copy option">
+          <label>选择建设项目</label>
+          <select class="form-control" id="other-project"></select>
+        </div>
+        <div class="form-group copy option">
+          <select class="form-control" id="other-file"></select>
+          <small class="form-text text-muted">你选择的单价文件将复制一份至新项目,不会影响原建设项目的单价文件。</small>
         </div>
+      </div>
+      <div class="modal-footer">
+        <a href="javascript:void(0);" class="btn btn-primary" id="change-file-confirm">确定</a>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
     </div>
+  </div>
 </div>
 <!--弹出 另存新文件-->
 <div class="modal fade" id="unitFile-save-as" data-backdrop="static">
-    <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">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label>单价文件名称</label>
-                    <input class="form-control" id="save-as-name" value="">
-                    <small class="form-text text-danger" id="save-as-tips">已存在同名单价文件。</small>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="save-as-confirm">确定</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-            </div>
+  <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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div class="form-group">
+          <label>单价文件名称</label>
+          <input class="form-control" id="save-as-name" value="">
+          <small class="form-text text-danger" id="save-as-tips">已存在同名单价文件。</small>
         </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="save-as-confirm">确定</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
     </div>
+  </div>
 </div>
 
 
 <!--弹出 重命名窗口-->
 <div class="modal fade" id="rename-unitFile" data-backdrop="static">
-    <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">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="form-group">
-                    <label>单价文件名称</label>
-                    <input class="form-control" id="newUnitFileID" value="" style="display: none">
-                    <input class="form-control" id="newUnitFileName" value="">
-                    <small class="form-text text-danger" id="renameError_unitFile">本建设项目中已存在同名单价文件。</small>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="renameUnitFileConfirm">确定</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-            </div>
+  <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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <div class="form-group">
+          <label>单价文件名称</label>
+          <input class="form-control" id="newUnitFileID" value="" style="display: none">
+          <input class="form-control" id="newUnitFileName" value="">
+          <small class="form-text text-danger" id="renameError_unitFile">本建设项目中已存在同名单价文件。</small>
         </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="renameUnitFileConfirm">确定</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
     </div>
+  </div>
 </div>
 
 <!--弹出 从人材机汇总中选择-->
 <div class="modal fade" id="selectFromGLJ" data-backdrop="static">
-    <div class="modal-dialog modal-lg" 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">&times;</span>
-                </button>
+  <div class="modal-dialog modal-lg" 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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body" style="padding: 0px">
+        <div class="btn-toolbar" style="margin: 10px">
+          <div class="btn-group btn-group-sm mr-2">
+            <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选</button>
+            <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选主材</button>
+            <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选设备</button>
+          </div>
+          <!--前面3个按钮 有选中状态,出现 取消 按钮-->
+          <button type="button" class="btn btn-outline-danger btn-sm mr-2 glj_sel_check_btn">取消</button>
+          <div class="input-group input-group-sm mr-2" style="width:200px">
+            <input type="text" class="form-control form-control-sm" placeholder="查找" id="glj_sel_input" value="">
+            <div class="input-group-append">
+              <button class="btn btn-outline-primary btn-sm" id="glj_sel_btn_find" type="button"><i class="fa fa-search"
+                  aria-hidden="true"></i></button>
             </div>
-            <div class="modal-body" style="padding: 0px">
-                <div class="btn-toolbar" style="margin: 10px">
-                    <div class="btn-group btn-group-sm mr-2">
-                        <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选</button>
-                        <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选主材</button>
-                        <button type="button" class="btn btn-outline-primary glj_sel_check_btn">全选设备</button>
-                    </div>
-                    <!--前面3个按钮 有选中状态,出现 取消 按钮-->
-                    <button type="button" class="btn btn-outline-danger btn-sm mr-2 glj_sel_check_btn">取消</button>
-                    <div class="input-group input-group-sm mr-2" style="width:200px">
-                        <input type="text" class="form-control form-control-sm"  placeholder="查找" id="glj_sel_input" value="">
-                        <div class="input-group-append">
-                            <button class="btn btn-outline-primary btn-sm" id="glj_sel_btn_find" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
-                        </div>
-                    </div>
-                    <div class="input-group input-group-sm">
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_all" value="0">
-                            <label class="form-check-label" for="glj_sel_all">所有</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_labour" value="1">
-                            <label class="form-check-label" for="glj_sel_labour">人</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_material" checked value="2">
-                            <label class="form-check-label" for="glj_sel_material">材</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_machine" value="3">
-                            <label class="form-check-label" for="glj_sel_machine">机</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_main" checked value="4">
-                            <label class="form-check-label" for="glj_sel_main">主材</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_eqp" checked value="5">
-                            <label class="form-check-label" for="glj_sel_eqp">设备</label>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-auto-height" style="margin-top:10px; border: 1px solid #ccc">
-                    <div  id="glj_from_sheet" style="overflow: hidden;height: 100%"></div>
-                </div>
+          </div>
+          <div class="input-group input-group-sm">
+            <div class="form-check form-check-inline">
+              <input class="form-check-input glj_sel_input" type="checkbox" id="glj_sel_all" value="0">
+              <label class="form-check-label" for="glj_sel_all">所有</label>
+            </div>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_labour"
+                value="1">
+              <label class="form-check-label" for="glj_sel_labour">人</label>
+            </div>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_material"
+                checked value="2">
+              <label class="form-check-label" for="glj_sel_material">材</label>
             </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="glj_sel_confirm" data-dismiss="modal">确定</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_machine"
+                value="3">
+              <label class="form-check-label" for="glj_sel_machine">机</label>
             </div>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_main"
+                checked value="4">
+              <label class="form-check-label" for="glj_sel_main">主材</label>
+            </div>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input glj_sel_input glj_sel_input_other" type="checkbox" id="glj_sel_eqp" checked
+                value="5">
+              <label class="form-check-label" for="glj_sel_eqp">设备</label>
+            </div>
+          </div>
         </div>
+        <div class="modal-auto-height" style="margin-top:10px; border: 1px solid #ccc">
+          <div id="glj_from_sheet" style="overflow: hidden;height: 100%"></div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="glj_sel_confirm" data-dismiss="modal">确定</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
     </div>
+  </div>
 </div>
 
 <!--暂估材料弹出 从人材机汇总中选择-->
 <div class="modal fade" id="selectPGLJ" data-backdrop="static">
-    <div class="modal-dialog modal-lg" 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">&times;</span>
-                </button>
+  <div class="modal-dialog modal-lg" 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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body" style="padding: 0px">
+        <div class="btn-toolbar" style="margin: 10px">
+          <div class="btn-group btn-group-sm mr-2">
+            <button type="button" class="btn btn-outline-primary pglj_sel_check_btn">全选</button>
+            <button type="button" class="btn btn-outline-primary pglj_sel_check_btn">全选主材</button>
+            <button type="button" class="btn btn-outline-primary pglj_sel_check_btn">全选设备</button>
+          </div>
+          <!--前面3个按钮 有选中状态,出现 取消 按钮-->
+          <button type="button" class="btn btn-outline-danger btn-sm mr-2 pglj_sel_check_btn">取消</button>
+          <div class="input-group input-group-sm mr-2" style="width:200px">
+            <input type="text" class="form-control form-control-sm" placeholder="查找" id="pglj_sel_input" value="">
+            <div class="input-group-append">
+              <button class="btn btn-outline-primary btn-sm" id="pglj_sel_btn_find" type="button"><i
+                  class="fa fa-search" aria-hidden="true"></i></button>
             </div>
-            <div class="modal-body" style="padding: 0px">
-                <div class="btn-toolbar" style="margin: 10px">
-                    <div class="btn-group btn-group-sm mr-2">
-                        <button type="button" class="btn btn-outline-primary pglj_sel_check_btn">全选</button>
-                        <button type="button" class="btn btn-outline-primary pglj_sel_check_btn">全选主材</button>
-                        <button type="button" class="btn btn-outline-primary pglj_sel_check_btn">全选设备</button>
-                    </div>
-                    <!--前面3个按钮 有选中状态,出现 取消 按钮-->
-                    <button type="button" class="btn btn-outline-danger btn-sm mr-2 pglj_sel_check_btn">取消</button>
-                    <div class="input-group input-group-sm mr-2" style="width:200px">
-                        <input type="text" class="form-control form-control-sm"  placeholder="查找" id="pglj_sel_input" value="">
-                        <div class="input-group-append">
-                            <button class="btn btn-outline-primary btn-sm" id="pglj_sel_btn_find" type="button"><i class="fa fa-search" aria-hidden="true"></i></button>
-                        </div>
-                    </div>
-                    <div class="input-group input-group-sm">
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input pglj_sel_input" type="checkbox" id="pglj_sel_all" value="0">
-                            <label class="form-check-label" for="pglj_sel_all">所有</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input pglj_sel_input pglj_sel_input_other" type="checkbox" id="pglj_sel_material" checked value="2">
-                            <label class="form-check-label" for="pglj_sel_material">材</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input pglj_sel_input pglj_sel_input_other" type="checkbox" id="pglj_sel_main" checked value="4">
-                            <label class="form-check-label" for="pglj_sel_main">主材</label>
-                        </div>
-                        <div class="form-check form-check-inline">
-                            <input class="form-check-input pglj_sel_input pglj_sel_input_other" type="checkbox" id="pglj_sel_eqp" checked value="5">
-                            <label class="form-check-label" for="pglj_sel_eqp">设备</label>
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-auto-height" style="margin-top:10px; border: 1px solid #ccc">
-                    <div  id="pglj_from_sheet" style="overflow: hidden;height: 100%"></div>
-                </div>
+          </div>
+          <div class="input-group input-group-sm">
+            <div class="form-check form-check-inline">
+              <input class="form-check-input pglj_sel_input" type="checkbox" id="pglj_sel_all" value="0">
+              <label class="form-check-label" for="pglj_sel_all">所有</label>
             </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" id="pglj_sel_confirm" data-dismiss="modal">确定</button>
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input pglj_sel_input pglj_sel_input_other" type="checkbox" id="pglj_sel_material"
+                checked value="2">
+              <label class="form-check-label" for="pglj_sel_material">材</label>
             </div>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input pglj_sel_input pglj_sel_input_other" type="checkbox" id="pglj_sel_main"
+                checked value="4">
+              <label class="form-check-label" for="pglj_sel_main">主材</label>
+            </div>
+            <div class="form-check form-check-inline">
+              <input class="form-check-input pglj_sel_input pglj_sel_input_other" type="checkbox" id="pglj_sel_eqp"
+                checked value="5">
+              <label class="form-check-label" for="pglj_sel_eqp">设备</label>
+            </div>
+          </div>
         </div>
+        <div class="modal-auto-height" style="margin-top:10px; border: 1px solid #ccc">
+          <div id="pglj_from_sheet" style="overflow: hidden;height: 100%"></div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="pglj_sel_confirm" data-dismiss="modal">确定</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
     </div>
+  </div>
 </div>
 
 <!--弹出 信息价单位换算窗口-->
 <div class="modal fade" id="infoPriceCoeDiv" data-backdrop="static">
   <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">&times;</span>
-              </button>
-          </div>
-          <div class="modal-body">
-              <!-- <div class="form-group">
+    <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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <!-- <div class="form-group">
                   <label id = "assistProductionLabel">辅助生产间接费费率(%)</label>
                   <input class="form-control" id="assistProductionFeeRate" value="">
               </div> -->
-              <input type="hidden" id="infoRow" value="">
-              <fieldset class="form-group"  style="border:1px solid #b3b3b3;padding: 15px">
-                <legend class="legend" ></legend>
-                <label>材料名称:</label><label id="applyGLJName">钢筋</label><br>
-                <label  >单位:</label><label id="applyGLJUnit">t</label>=&nbsp;<input id="infoPriceCoe" type="number" class="form-control form-control-sm" style="display:inline;width: 200px;" value="">&nbsp;<label id="applyInfoUnit" >m3</label>
-            </fieldset>
-          </div>
-          <div class="modal-footer">
-              <button type="button" class="btn btn-primary" id="infoPriceCoeConfirm">确定</button>
-              <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-          </div>
+        <input type="hidden" id="infoRow" value="">
+        <fieldset class="form-group" style="border:1px solid #b3b3b3;padding: 15px">
+          <legend class="legend"></legend>
+          <label>材料名称:</label><label id="applyGLJName">钢筋</label><br>
+          <label>单位:</label><label id="applyGLJUnit">t</label>=&nbsp;<input id="infoPriceCoe" type="number"
+            class="form-control form-control-sm" style="display:inline;width: 200px;" value="">&nbsp;<label
+            id="applyInfoUnit">m3</label>
+        </fieldset>
       </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="infoPriceCoeConfirm">确定</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
+    </div>
   </div>
 </div>
 
@@ -398,58 +421,58 @@
 <!--弹出批量套用窗口-->
 <div class="modal fade" id="mutiApplyInfoPriceDiv" data-backdrop="static">
   <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">&times;</span>
-              </button>
-          </div>
-          <div class="modal-body" style="padding: 0;">
-            <fieldset class="form-group" style="padding: 1rem;">
-              <h5>套用条件</h5>   
-              <label class="form-check-label info-checkbox">
-                  <input class="" type="checkbox" checked disabled>
-                  名称
-              </label>
-              <label class="form-check-label info-checkbox">
-                  <input class="" type="checkbox" checked disabled>
-                  规格型号
-              </label>
-              <label class="form-check-label info-checkbox">
-                  <input class="" type="checkbox" checked disabled>
-                  单位
-              </label> 
-          </fieldset>
+    <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">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body" style="padding: 0;">
+        <fieldset class="form-group" style="padding: 1rem;">
+          <h5>套用条件</h5>
+          <label class="form-check-label info-checkbox">
+            <input class="" type="checkbox" checked disabled>
+            名称
+          </label>
+          <label class="form-check-label info-checkbox">
+            <input class="" type="checkbox" checked disabled>
+            规格型号
+          </label>
+          <label class="form-check-label info-checkbox">
+            <input class="" type="checkbox" checked disabled>
+            单位
+          </label>
+        </fieldset>
 
-          <fieldset class="form-group" style="border-top:1px solid #ccc;padding: 1rem;">
-            <h5>套用类别</h5>   
-            <label class="form-check-label info-checkbox">
-                <input class="info_apply_type" id="info_label" value="1" type="checkbox" checked >
-                人工
-            </label>
-            <label class="form-check-label info-checkbox">
-                <input class="info_apply_type" id="info_material" value="2" type="checkbox" checked >
-                材料
-            </label>
-            <label class="form-check-label info-checkbox">
-                <input class="info_apply_type" id="info_machine" value="3" type="checkbox" checked >
-                机械
-            </label> 
-            <label class="form-check-label info-checkbox">
-              <input class="info_apply_type"  id="info_main" value="4" type="checkbox" checked >
-              主材
-            </label>
-            <label class="form-check-label info-checkbox">
-                <input class="info_apply_type" id="info_equipment" value="5" type="checkbox" checked >
-                设备
-            </label> 
+        <fieldset class="form-group" style="border-top:1px solid #ccc;padding: 1rem;">
+          <h5>套用类别</h5>
+          <label class="form-check-label info-checkbox">
+            <input class="info_apply_type" id="info_label" value="1" type="checkbox">
+            人工
+          </label>
+          <label class="form-check-label info-checkbox">
+            <input class="info_apply_type" id="info_material" value="2" type="checkbox" checked>
+            材料
+          </label>
+          <label class="form-check-label info-checkbox">
+            <input class="info_apply_type" id="info_machine" value="3" type="checkbox">
+            机械
+          </label>
+          <label class="form-check-label info-checkbox">
+            <input class="info_apply_type" id="info_main" value="4" type="checkbox" checked>
+            主材
+          </label>
+          <label class="form-check-label info-checkbox">
+            <input class="info_apply_type" id="info_equipment" value="5" type="checkbox" checked>
+            设备
+          </label>
         </fieldset>
-          </div>
-          <div class="modal-footer">
-              <button type="button" class="btn btn-primary" data-dismiss="modal" id="mutiApplyinfoPriceConfirm">确定</button>
-              <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
-          </div>
       </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal" id="mutiApplyinfoPriceConfirm">确定</button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
+      </div>
+    </div>
   </div>
 </div>

Разница между файлами не показана из-за своего большого размера
+ 882 - 543
web/building_saas/main/js/views/material_adjust_view.js


Разница между файлами не показана из-за своего большого размера
+ 2101 - 1781
web/building_saas/main/js/views/project_glj_view.js