Merge branch '1.0.0_online' of http://192.168.1.12:3000/SmartCost/ConstructionCost into 1.0.0_online

web/building_saas/main/html/main.html

@@ -69,8 +69,8 @@
                     <a href="javascript:void(0)" class="btn btn-sm" title="剪切"><i class="fa fa-scissors" aria-hidden="true"></i></a>
                     <a href="javascript:void(0)" class="btn btn-sm" title="粘贴"><i class="fa fa-clipboard" aria-hidden="true"></i></a>-->
                     <a class="btn btn-light btn-sm" href="javascript:void(0);" aria-expanded="false" data-toggle="modal" data-target="#poj-set"><i class="fa fa-cog" data-toggle="tooltip" data-original-title="项目属性" data-placement="bottom"></i></a>
-                    <span class="btn btn-light btn-sm">
-                        <a class="dropdown-toggle" id="uploadDropDown" href="#" data-toggle="dropdown"><i class="fa fa-cloud-upload" data-toggle="tooltip" data-original-title="导入" data-placement="bottom"></i></a>
+                    <span class="btn btn-light btn-sm" id="importSpan">
+                        <a class="dropdown-toggle" href="#" data-toggle="dropdown"><i class="fa fa-cloud-upload" data-toggle="tooltip" data-original-title="导入" data-placement="bottom"></i></a>
                         <div class="dropdown-menu">
                             <a id="uploadLj" class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入09表Excel清单</a>
                             <a id="uploadGld" class="dropdown-item" href="#import" data-toggle="modal" data-target="#import">导入广联达算量Excel清单</a>
@@ -83,7 +83,7 @@
                       <a href="javascript:void(0)" class="btn btn-light btn-sm" id="upMove" data-toggle="tooltip" data-placement="bottom" data-original-title="上移"><i class="fa fa-arrow-up" aria-hidden="true"></i></a>
                       <a href="javascript:void(0)" class="btn btn-light btn-sm" id="downMove" data-toggle="tooltip" data-placement="bottom" data-original-title="下移"><i class="fa fa-arrow-down" aria-hidden="true"></i></a>
                     <span class="btn btn-light btn-sm">
-                      <a href="" data-toggle="dropdown"><span data-toggle="tooltip" data-original-title="显示至" data-placement="bottom"><i class="fa fa-list-ol"></i></span></a>
+                      <a href="" data-toggle="dropdown"><span data-placement="bottom"><i class="fa fa-list-ol"></i></span> 显示至...</a>
                       <div class="dropdown-menu dropdown-menu-left" style="min-width: 6.5rem">
                       <a class="dropdown-item" href="javascript:void(0);" id="displayDXFY">大项费用</a>
                       <a class="dropdown-item" href="javascript:void(0);"  id="displayFB1">一级分部</a>
@@ -95,13 +95,13 @@
                       <a class="dropdown-item" href="javascript:void(0);"  id="displayZD">最底层</a>
                     </div>
                     </span>
-                      <a href="javascript:void(0);" id="ZLFB_btn" class="btn btn-light btn-sm" data-placement="bottom" data-toggle="tooltip" data-original-title="整理分部"><i class="fa fa-retweet" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0);" id="ZLFB_btn" class="btn btn-light btn-sm" data-placement="bottom"><i class="fa fa-retweet" aria-hidden="true"></i> 整理分部</a>
                       <% if (projectData.property.lockBills == true) { %>
-                      <a href="javascript:void(0)"  class="btn btn-light btn-sm" name="lockBills" data-toggle="tooltip" data-placement="bottom" data-original-title="解锁清单"> <i class="fa fa-unlock-alt" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0)"  class="btn btn-light btn-sm" name="lockBills"> <i class="fa fa-unlock-alt" aria-hidden="true"></i> 解锁清单</a>
                       <% } else { %>
-                      <a href="javascript:void(0)"  class="btn btn-light btn-sm" name="lockBills" data-toggle="tooltip" data-placement="bottom" data-original-title="锁定清单"> <i class="fa fa-lock" aria-hidden="true"></i></a>
+                      <a href="javascript:void(0)"  class="btn btn-light btn-sm" name="lockBills"> <i class="fa fa-lock" aria-hidden="true"></i> 锁定清单</a>
                       <% } %>
-                      <a id="switchTznr" href="javascript:void(0);"  class="btn btn-light btn-sm"  data-toggle="tooltip" data-placement="bottom" data-original-title="显示特征"><i class="fa fa-eye" aria-hidden="true"></i></a>
+                      <a id="switchTznr" href="javascript:void(0);"  class="btn btn-light btn-sm"><i class="fa fa-eye" aria-hidden="true"></i> 显示特征</a>
                   </div>
                   <div class="side-tabs">
                       <ul class="nav nav-tabs" role="tablist">
@@ -1366,7 +1366,6 @@
                     <button style="margin-top: 2px;" type="button" class="btn btn-primary" id="uploadExample">示例</button>
                    <!-- <div id="uploadSheets" style="display: none; border-top: 1px solid #CED4DA;border-left: 1px solid #CED4DA;border-radius: 5px;margin-top: 5px;"></div>-->
                     <div id="uploadSheets"></div>
-                    <div id="importSpread" style="display: none"></div>
                 </div>
                 <div class="modal-footer">
                     <a href="javascript:void(0);" class="btn btn-primary" id="importConfirm">确定导入</a>

web/building_saas/main/js/views/main_tree_col.js

@@ -521,21 +521,23 @@ function switchTznrHtml(show) {
         return;
     }
     if(show){
-        $('#switchTznr').attr('data-original-title', '显示特征');
+        /*$('#switchTznr').attr('data-original-title', '显示特征');
         $('#switchTznr').find('i').removeClass('fa-eye-slash');
-        $('#switchTznr').find('i').addClass('fa-eye');
+        $('#switchTznr').find('i').addClass('fa-eye');*/
+        $('#switchTznr').html('<i class="fa fa-eye" aria-hidden="true"></i> 显示特征');
     }
     else {
-        $('#switchTznr').attr('data-original-title', '隐藏特征');
+       /* $('#switchTznr').attr('data-original-title', '隐藏特征');
         $('#switchTznr').find('i').removeClass('fa-eye');
-        $('#switchTznr').find('i').addClass('fa-eye-slash');
+        $('#switchTznr').find('i').addClass('fa-eye-slash');*/
+        $('#switchTznr').html('<i class="fa fa-eye-slash" aria-hidden="true"></i> 隐藏特征');
     }
 }
 
 $('#switchTznr').click(function () {
     let me = colSettingObj;
-    let cur = $(this).attr('data-original-title');
-    //$("[data-toggle='tooltip']").tooltip('hide');
+    //let cur = $(this).attr('data-original-title');
+    let cur = $(this).text();
     if(cur.includes('显示特征')){
         switchTznrHtml(false);
         me.setVisible('itemCharacterText', true);

web/building_saas/main/js/views/project_view.js

@@ -1740,11 +1740,11 @@ var projectObj = {
     },
     loadLockBillsButton:function () {
         if(projectInfoObj.projectInfo.property.lockBills == true){
-            $("a[name='lockBills']").attr("data-original-title","解锁清单");
-            $("a[name='lockBills']").html('<i class="fa fa-unlock-alt" aria-hidden="true"></i>');
+            //$("a[name='lockBills']").attr("data-original-title","解锁清单");
+            $("a[name='lockBills']").html('<i class="fa fa-unlock-alt" aria-hidden="true"></i> 解锁清单');
         }else {
-            $("a[name='lockBills']").attr("data-original-title","锁定清单");
-            $("a[name='lockBills']").html('<i class="fa fa-lock" aria-hidden="true"></i>');
+            //$("a[name='lockBills']").attr("data-original-title","锁定清单");
+            $("a[name='lockBills']").html('<i class="fa fa-lock" aria-hidden="true"></i> 锁定清单');
         }
     },
     editContent:function (node,fieldID) {//右键编辑工程内容、服务内容、签证及索赔依据
@@ -2457,7 +2457,6 @@ $('#uploadGld').click(function () {
 });
 
 let importJson = null;
-let importSpread = null;
 //选择导入的excel文件
 $('#customFile').change(function () {
    let file = $(this)[0];
@@ -2478,7 +2477,6 @@ $('#customFile').change(function () {
        if(importJson){
            importJson = null;
        }
-       importSpread = new GC.Spread.Sheets.Workbook($('#importSpread')[0]);
        let excelIo = new GC.Spread.Excel.IO();
        let sDate = +new Date();
        excelIo.open(excelFile, function (json) {
@@ -2739,7 +2737,7 @@ function disableTools(){
     $('#downMove').remove();
     $('#ZLFB_btn').remove();
     $('#switchTznr').remove();
-    $('#uploadDropDown').remove();
+    $('#importSpan').remove();
     $('a[name="lockBills"]').remove();
     //关于计算
     $('#poj-settings-4').find('input').prop('disabled', 'disabled');

web/building_saas/pm/js/pm_newMain.js

@@ -2846,6 +2846,12 @@ function setDataToSideBar() {
 
 //获取建设项目的全部单位工程
 function getProjTenders(proj) {
+    if(proj.data.projType === projectType.tender){
+        proj = proj.parent.parent;
+    }
+    else if(proj.data.projType === projectType.engineering){
+        proj = proj.parent;
+    }
     let rst = [];
     let engineerings = proj.children || null;
     if (engineerings) {

web/common/html/header.html

@@ -35,7 +35,7 @@
             </li>
             <% if (action === 'index' && controller === 'main') {%>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench" data-toggle="tooltip" data-placement="bottom" data-original-title="工具"></i></a>
+                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-wrench" data-placement="bottom"></i> 工具</a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <a id="compleRationLib" class="dropdown-item" href="javascript:void(0);" data-toggle="modal" data-target="#comple-ration">定额库编辑器</a>
                     <a id="compleGljLib" class="dropdown-item" href="/complementaryGlj" target="_">人材机库编辑器</a>
@@ -43,7 +43,7 @@
             </li>
             <% } %>
             <li class="nav-item dropdown">
-                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o" data-toggle="tooltip" data-placement="bottom" data-original-title="帮助"></i></a>
+                <a class="nav-link dropdown-toggle" href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-question-circle-o" data-placement="bottom"></i> 帮助</a>
                 <div class="dropdown-menu dropdown-menu-right">
                     <a class="dropdown-item" href="#">帮助</a>
                     <a class="dropdown-item" href="#">升级说明</a>