Merge branch '1.0.0_online' of http://smartcost.f3322.net:3000/SmartCost/ConstructionOperation into 1.0.0_online

modules/ration_repository/controllers/ration_repository_controller.js

@@ -218,7 +218,7 @@ class RationRepositoryController extends baseController {
     }
 
     /**
-     * 导出内容数据
+     * 导出内部数据
      *
      * @param {Object} request
      * @param {Object} response

modules/ration_repository/models/ration_item.js

@@ -915,17 +915,17 @@ rationItemDAO.prototype.exportExcelData = async function(rationRepId) {
         rationRepId: rationRepId
     };
     // @todo 限制导出的数量以防内存溢出
-    const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption']);
+    const rationDataList = await this.getRationItemByCondition(condition, ['name', 'code', 'ID', 'sectionId', 'feeType', 'caption', 'basePrice']);
 
     // 整理数据
     let rationData = [];
     for (const tmp of rationDataList) {
         const sectionId = tmp.sectionId <= 0 || tmp.sectionId === undefined ? null : tmp.sectionId;
         const feeType = tmp.feeType === '' || tmp.feeType === undefined ? null : tmp.feeType;
-        const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name, tmp.caption];
+        const ration = [sectionId, feeType, tmp.ID, tmp.code, tmp.name, tmp.caption, tmp.basePrice];
         rationData.push(ration);
     }
-    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称']];
+    const excelData = [['树ID', '取费专业', '定额ID', '定额编码', '定额名', '定额显示名称', '基价']];
     excelData.push.apply(excelData, rationData);
 
     return excelData;

web/maintain/ration_repository/anzhuang.html

@@ -27,9 +27,9 @@
                   <li class="nav-item">
                       <a class="nav-link px-3" id="gongliao" href="<%= redirectGlj %>">人材机</a>
                   </li>
-                  <li class="nav-item">
+                 <!-- <li class="nav-item">
                       <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>
-                  </li>
+                  </li>-->
                   <li class="nav-item">
                       <a class="nav-link active px-3" >安装增加费</a>
                   </li>

web/maintain/ration_repository/css/main.css

@@ -21,10 +21,10 @@ body {
     line-height: inherit
 }
 .top-msg{
-  position: fixed;
-  top:0;
-  width:100%;
-  z-index: 999
+    position: fixed;
+    top:0;
+    width:100%;
+    z-index: 999
 }
 .in-1{padding-left:0rem!important}
 .in-2{padding-left:1rem!important}
@@ -74,6 +74,7 @@ body {
 }
 .main-side {
     border-right: 1px solid #ccc;
+    border-left: 1px solid #ccc;
     overflow:hidden;
 }
 .main-side .tab-bar {
@@ -100,7 +101,7 @@ body {
     padding: 0.2em 0.5em
 }
 .side-tabs .nav-tabs .nav-item {
-  z-index: 999
+    z-index: 999
 }
 .side-tabs .nav-tabs {
     border-bottom: none;
@@ -228,52 +229,55 @@ body {
     overflow: auto;
 }
 .poj-list span.poj-icon {
-  padding-right:10px;
-  color:#ccc
+    padding-right:10px;
+    color:#ccc
 }
 .print-toolsbar{
-  padding:5px
+    padding:5px
 }
 .print-toolsbar .panel {
-  display:inline-block;
-  vertical-align:top;
-  background:#f7f7f9
+    display:inline-block;
+    vertical-align:top;
+    background:#f7f7f9
 }
 .print-toolsbar .panel .panel-foot{
-  text-align: center;
-  font-size: 12px
+    text-align: center;
+    font-size: 12px
 }
 .print-list {
-  border-right:1px solid #ccc
+    border-right:1px solid #ccc
 }
 .print-list .form-list {
-  overflow: auto
+    overflow: auto
 }
 .print-list .list-tools{
-  height:50px;
-  padding:10px 0;
-  border-bottom:1px solid #f2f2f2
+    height:50px;
+    padding:10px 0;
+    border-bottom:1px solid #f2f2f2
 }
 .pageContainer {
-  background: #ededed;
-  text-align: center
+    background: #ededed;
+    text-align: center
 }
 .pageContainer .page{
-  border:9px solid transparent;
-  display: inline-block;
+    border:9px solid transparent;
+    display: inline-block;
 }
 .pageContainer .page img{
-  width:inherit;
-  height: inherit;
+    width:inherit;
+    height: inherit;
 }
 .codeList{
     max-height: 200px;
     overflow:auto;
 }
 .main-data-top,.main-data-bottom,.main-data{
-  overflow: hidden;
+    overflow: hidden;
 }
 .modal-fixed-height {
     height:400px;
     overflow-y:auto;
-}
+}
+.btn.disabled, .btn:disabled {
+    color: #999;
+}

web/maintain/ration_repository/dinge.html

@@ -38,134 +38,145 @@
                   <li class="nav-item">
                       <a class="nav-link px-3" id="gongliao" href="<%= redirectGlj %>">人材机</a>
                   </li>
-                  <li class="nav-item">
+                 <!-- <li class="nav-item">
                       <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>
-                  </li>
+                  </li>-->
                   <li class="nav-item">
                       <a class="nav-link px-3" id="anzhuang" href="<%= redirectInstallation %>">安装增加费</a>
                   </li>
               </ul>
+            <ul class="nav nav-tabs" role="tablist">
+                <li class="nav-item">
+                    <a class="nav-link px-3" href="javascript:void(0);" id="zmhs">子目换算</a>
+                </li>
+            </ul>
         </nav>
     </div>
     <div class="main" style="overflow: hidden">
         <div class="content">
             <div class="container-fluid">
                 <div class="row">
-                  <div class="main-side col-lg-3 p-0" style="width: 100%; height: 100%; overflow: hidden">
-                      <div class="tab-bar">
-                          <a href="javascript:void(0);" id="tree_Insert" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-plus" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_remove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_upLevel" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_downLevel" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_downMove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
-                          <a href="javascript:void(0);" id="tree_upMove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
-                      </div>
-                    <div class="tab-content" id="sectionSpread" style="overflow: hidden">
-                      <!--<ul id="rationChapterTree" class="ztree"></ul>-->
-                    </div>
-                  </div>
-                  <div class="main-content col-lg-9 p-0">
-                      <!-- 右标签 -->
-                      <ul class="nav nav-tabs tools-bar" role="tablist">
-                          <li class="nav-item">
-                              <a class="nav-link active" data-toggle="tab" href="#tde" role="tab">定额</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tsm" role="tab" id="explanationLink">说明</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
-                          </li>
-                          <li class="nav-item">
-                              <a id="gznr" class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
-                          </li>
-                          <li class="nav-item">
-                              <a class="nav-link" data-toggle="tab" href="#tfz" role="tab">附注</a>
-                          </li>
-                      </ul>
-                      <div class="tab-content">
-                          <!--定额-->
-                          <div class="tab-pane active" id="tde" role="tabpanel">
-                              <!--定额top-->
-                              <div id="rationItemsSheet" class="main-data-top"></div>
-                              <!--定额bottom-->
-                              <div class="bottom-content">
-                                  <!-- 标签 -->
-                                  <ul class="nav nav-tabs" role="tablist">
-                                      <li class="nav-item">
-                                          <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">人材机</a>
-                                      </li>
-                                      <li class="nav-item">
-                                          <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
-                                      </li>
-                                      <li class="nav-item">
-                                          <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#rDetail" role="tab">子目换算调整</a>
-                                      </li>
-                                      <li class="nav-item">
-                                          <a class="nav-link" id="linkAZZJ" data-toggle="tab" href="#" role="tab">安装增加费</a>
-                                      </li>
-                                  </ul>
-                                  <!-- 内容 -->
-                                  <div class="tab-content">
-                                      <div class="tab-pane active" id="rDetail" role="tabpanel">
-                                          <div id="rdSpread" class="main-data-bottom" style="overflow: hidden"></div>
-                                      </div>
-                                  </div>
-                              </div>
-                          </div>
-                          <!--说明-->
-                          <div class="tab-pane" id="tsm" role="tabpanel">
-                              <div class="main-data">
-                                <!--  <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTsm" title="编辑">编辑说明</a></div>-->
-                                  <div class="main-content m-2">
-                                      <h5>说明</h5>
-                                      <!--<textarea id="explanationShow" class="form-control" rows="35" style="background: white;"></textarea>-->
-                                      <textarea id="explanationShow" class="form-control" style="background: white;"></textarea>
-                                  </div>
-                              </div>
-                          </div>
-                          <!--计算规则-->
-                          <div class="tab-pane" id="tjs" role="tabpanel">
-                              <div class="main-data">
-                         <!--         <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTjs" title="编辑">编辑计算规则</a></div>-->
-                                  <div class="main-content m-2">
-                                      <h5>计算规则</h5>
-                                      <textarea id="ruleTextShow" class="form-control" style="background: white;"></textarea>
-                                  </div>
-                              </div>
-                          </div>
-                          <!--工作内容-->
-                          <div class="tab-pane" id="tgz" role="tabpanel">
-                              <div class="main-data">
-                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" value="ALL" disabled=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" value="PARTIAL" disabled> 适合本项部分定额</label></div>
-                                  <!-- <p class="m-2">适合本项所有定额</p> -->
-                                  <table class="table table-sm table-bordered m-0" id="tableAll">
-                                      <tr>
-                                          <td><textarea class="form-control" rows="30" id="txtareaAll"></textarea></td>
-                                      </tr>
-                                  </table>
-                                  <table class="table table-sm table-bordered m-0" id="tablePartial">
-                                  </table>
-                              </div>
-                          </div>
-                          <!--附注-->
-                          <div class="tab-pane" id="tfz" role="tabpanel">
-                              <div class="main-data">
-                                  <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="ALL" disabled=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="PARTIAL" disabled> 适合本项部分定额</label></div>
-                                  <!-- <p class="m-2">适合本项所有定额</p> -->
-                                  <table class="table table-sm table-bordered m-0" id="fzTableAll">
-                                      <tr>
-                                          <td><textarea class="form-control" rows="30" id="fzTxtareaAll"></textarea></td>
-                                      </tr>
-                                  </table>
-                                  <table class="table table-sm table-bordered m-0" id="fzTablePartial">
-                                  </table>
-                              </div>
-                          </div>
-                  </div>
+                    <div class="main-side col-3 p-0" style="width: 100%; height: 100%; overflow: hidden">
+                        <div class="tab-bar">
+                            <a href="javascript:void(0);" id="tree_Insert" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="插入"><i class="fa fa-plus" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_remove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="删除"><i class="fa fa-remove" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_upLevel" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="升级"><i class="fa fa-arrow-left" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_downLevel" class="btn btn-sm " data-toggle="tooltip" data-placement="bottom" title="" data-original-title="降级"><i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_downMove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
+                            <a href="javascript:void(0);" id="tree_upMove" class="btn btn-sm" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
+                        </div>
+                        <div class="tab-content" id="sectionSpread" style="overflow: hidden">
+                            <!--<ul id="rationChapterTree" class="ztree"></ul>-->
+                        </div>
+                    </div>
+                    <div class="main-content col-9 p-0" id="mainContent">
+                        <!-- 右标签 -->
+                        <ul class="nav nav-tabs tools-bar" role="tablist">
+                            <li class="nav-item">
+                                <a class="nav-link active" data-toggle="tab" href="#tde" role="tab">定额</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#tsm" role="tab" id="explanationLink">说明</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#tjs" role="tab">计算规则</a>
+                            </li>
+                            <li class="nav-item">
+                                <a id="gznr" class="nav-link" data-toggle="tab" href="#tgz" role="tab">工作内容</a>
+                            </li>
+                            <li class="nav-item">
+                                <a class="nav-link" data-toggle="tab" href="#tfz" role="tab">附注</a>
+                            </li>
+                        </ul>
+                        <div class="tab-content">
+                            <!--定额-->
+                            <div class="tab-pane active" id="tde" role="tabpanel">
+                                <!--定额top-->
+                                <div id="rationItemsSheet" class="main-data-top"></div>
+                                <!--定额bottom-->
+                                <div class="bottom-content">
+                                    <!-- 标签 -->
+                                    <ul class="nav nav-tabs" role="tablist">
+                                        <li class="nav-item">
+                                            <a class="nav-link active" id="linkGLJ" data-toggle="tab" href="#rDetail" role="tab">人材机</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" id="linkFZDE" data-toggle="tab" href="#rDetail" role="tab">辅助定额调整</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" id="linkFZTJ" data-toggle="tab" href="#rDetail" role="tab">子目换算调整</a>
+                                        </li>
+                                        <li class="nav-item">
+                                            <a class="nav-link" id="linkAZZJ" data-toggle="tab" href="#" role="tab">安装增加费</a>
+                                        </li>
+                                    </ul>
+                                    <!-- 内容 -->
+                                    <div class="tab-content">
+                                        <div class="tab-pane active" id="rDetail" role="tabpanel">
+                                            <div id="rdSpread" class="main-data-bottom" style="overflow: hidden"></div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--说明-->
+                            <div class="tab-pane" id="tsm" role="tabpanel">
+                                <div class="main-data">
+                                    <!--  <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTsm" title="编辑">编辑说明</a></div>-->
+                                    <div class="main-content m-2">
+                                        <h5>说明</h5>
+                                        <!--<textarea id="explanationShow" class="form-control" rows="35" style="background: white;"></textarea>-->
+                                        <textarea id="explanationShow" class="form-control" style="background: white;"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--计算规则-->
+                            <div class="tab-pane" id="tjs" role="tabpanel">
+                                <div class="main-data">
+                                    <!--         <div class="m-2"><a href="javacript:void(0);" data-toggle="modal" data-target="#editTjs" title="编辑">编辑计算规则</a></div>-->
+                                    <div class="main-content m-2">
+                                        <h5>计算规则</h5>
+                                        <textarea id="ruleTextShow" class="form-control" style="background: white;"></textarea>
+                                    </div>
+                                </div>
+                            </div>
+                            <!--工作内容-->
+                            <div class="tab-pane" id="tgz" role="tabpanel">
+                                <div class="main-data">
+                                    <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" value="ALL" disabled=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="optionsRadios" value="PARTIAL" disabled> 适合本项部分定额</label></div>
+                                    <!-- <p class="m-2">适合本项所有定额</p> -->
+                                    <table class="table table-sm table-bordered m-0" id="tableAll">
+                                        <tr>
+                                            <td><textarea class="form-control" rows="30" id="txtareaAll"></textarea></td>
+                                        </tr>
+                                    </table>
+                                    <table class="table table-sm table-bordered m-0" id="tablePartial">
+                                    </table>
+                                </div>
+                            </div>
+                            <!--附注-->
+                            <div class="tab-pane" id="tfz" role="tabpanel">
+                                <div class="main-data">
+                                    <div class="form-check m-2"><label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="ALL" disabled=""> 适合本项所有定额</label>&nbsp;&nbsp;<label class="form-check-label"><input type="radio" class="form-check-input" name="fzRadios" value="PARTIAL" disabled> 适合本项部分定额</label></div>
+                                    <!-- <p class="m-2">适合本项所有定额</p> -->
+                                    <table class="table table-sm table-bordered m-0" id="fzTableAll">
+                                        <tr>
+                                            <td><textarea class="form-control" rows="30" id="fzTxtareaAll"></textarea></td>
+                                        </tr>
+                                    </table>
+                                    <table class="table table-sm table-bordered m-0" id="fzTablePartial">
+                                    </table>
+                                </div>
+                            </div>
+                        </div>
+                    </div i>
+                    <div class="main-side col-3 p-0" id="zmhsContent" style="display: none">
+                        <div class="main-data-top-fluid" id="mainSpread">
+                        </div>
+                        <div class="bottom-content" id="contentSpread">
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
     </div>
         <!--弹出添加-->
         <button id="gznrBtn" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#addNewgznr" style="display: none"></button>
@@ -561,6 +572,7 @@
         <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>
         <script type="text/javascript" src="/public/web/QueryParam.js"></script>
         <script type="text/javascript" src="/public/web/storageUtil.js"></script>
+        <script type="text/javascript" src="/web/maintain/ration_repository/js/coe.js"></script>
         <script type="text/javascript">
             let userAccount = '<%=userAccount %>';
             $(document).ready(function(){

web/maintain/ration_repository/gongliao.html

@@ -35,9 +35,9 @@
                   <li class="nav-item">
                       <a class="nav-link active px-3">人材机</a>
                   </li>
-                  <li class="nav-item">
+                  <!--<li class="nav-item">
                       <a class="nav-link px-3" id="fuzhu" href="<%= redirectCoe %>">子目换算</a>
-                  </li>
+                  </li>-->
                   <li class="nav-item">
                       <a class="nav-link px-3" id="anzhuang" href="<%= redirectInstallation %>">安装增加费</a>
                   </li>

web/maintain/ration_repository/js/coe.js

@@ -3,7 +3,30 @@
  */
 //modiyied by zhong on 2017/9/21
 
-
+$(document).ready(function () {
+    $('#zmhs').click(function () {
+        if(!$(this).hasClass('active')){
+            $(this).addClass('active');
+            $('#mainContent').removeClass('col-9');
+            $('#mainContent').addClass('col-6');
+            $('#zmhsContent').show();
+            if(!coeOprObj.workBook){
+                pageObj.initPage();
+            }
+            coeOprObj.workBook.refresh();
+            gljAdjOprObj.workBook.refresh();
+            rationOprObj.workBook.refresh();
+            rationGLJOprObj.sheet.getParent().refresh();
+        } else {
+            $(this).removeClass('active');
+            $('#mainContent').removeClass('col-6');
+            $('#mainContent').addClass('col-9');
+            $('#zmhsContent').hide();
+            rationOprObj.workBook.refresh();
+            rationGLJOprObj.sheet.getParent().refresh();
+        }
+    });
+});
 var pageObj = {
     libID: null,
     gljLibID: null,

web/maintain/ration_repository/js/global.js

@@ -21,19 +21,19 @@ function autoFlashHeight(){
     $('#partialBody').find('tr').find('td:eq(0)').width(partialWidth * 0.06);
     $('#partialBody').find('tr').find('td:eq(1)').width(partialWidth * 0.3);
     $('#partialBody').find('tr').find('td:eq(2)').width(partialWidth * 0.64);
-    //说明
+//说明
     $('#explanationShow').height($(window).height()-headerHeight-toolsBar-100);
-    //计算规则
+//计算规则
     $('#ruleTextShow').height($(window).height()-headerHeight-toolsBar-100);
 };
 $(window).resize(autoFlashHeight);
 /*全局自适应高度结束*/
 $(function(){
-/*侧滑*/
-$(".open-sidebar").click(function(){
-    $(".slide-sidebar").animate({width:"800"}).addClass("open");
-});
-$("body").click(function(event){
+    /*侧滑*/
+    $(".open-sidebar").click(function(){
+        $(".slide-sidebar").animate({width:"800"}).addClass("open");
+    });
+    $("body").click(function(event){
         var e = event || window.event; //浏览器兼容性
         if(!$(event.target).is('a')) {
             var elem = event.target || e.srcElement;
@@ -47,10 +47,10 @@ $("body").click(function(event){
         }
 
     });
-/*侧滑*/
-/*工具提示*/
-$('*[data-toggle=tooltip]').mouseover(function() {
- $(this).tooltip('show');
-  });
-/*工具提示*/
+    /*侧滑*/
+    /*工具提示*/
+    $('*[data-toggle=tooltip]').mouseover(function() {
+        $(this).tooltip('show');
+    });
+    /*工具提示*/
 });