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

Conflicts:
	modules/main/models/project.js
	web/building_saas/main/html/main.html

modules/complementary_ration_lib/models/sectionTreeModel.js

@@ -122,10 +122,10 @@ class SectionTreeDao {
                     await compleRationSectionTreeModel.create(updateObj.updateData);
                 }
                 else if(updateObj.updateType === 'update'){
-                    await compleRationSectionTreeModel.update({userId: userID, rationRepId: updateObj.updateData.rationRepId, ID: updateObj.updateData.ID}, updateObj.updateData);
-                    if(updateObj.updateData.deleteInfo){
-                        await compleRationModel.update({userId: userID, sectionId: updateObj.updateData.ID},
-                            {$set: {deleteInfo: {deleted: true, deleteBy: userID, deleteDateTime: Date.now()}}}, {multi: true});
+                    if(!updateObj.updateData.deleteInfo){
+                        await compleRationSectionTreeModel.update({userId: userID, ID: updateObj.updateData.ID}, updateObj.updateData);
+                    } else {
+                        await compleRationSectionTreeModel.remove({userId: userID, ID: updateObj.updateData.ID});
                     }
                 }
             }

modules/main/models/bills.js

@@ -182,13 +182,13 @@ class billsModel extends baseModel {
         let deleteInfo = {deleted: true, deleteDateTime: new Date(), deleteBy: userID};
         if(bill_ids.length > 0){
             //删除bills
-            await me.model.updateMany({ID: {$in: bill_ids}, deleteInfo: null}, {$set: {deleteInfo: deleteInfo}});
+            await me.model.deleteMany({ID: {$in: bill_ids}});
             //删除bill-quantity_detail
             await quantityDelModel.deleteMany({billID: {$in: bill_ids}});
         }
         if(ration_ids.length > 0){
             //删除rations
-            await rationModel.updateMany({ID: {$in: ration_ids}, deleteInfo: null}, {$set: {deleteInfo: deleteInfo}});
+            await rationModel.deleteMany({ID: {$in: ration_ids}});
             //删除ration-glj
             await rationGljModel.deleteMany({rationID: {$in: ration_ids}});
             //删除ration-coe

modules/main/models/project.js

@@ -87,6 +87,7 @@ Project.prototype.save = function(datas, callback){
         if (!err){
             callback(null, '', results)
         } else{
+          
             console.log(err);
             callback(1, 'save project failed', null)
         }

modules/users/controllers/user_controller.js

@@ -57,8 +57,6 @@ class UserController extends BaseController {
                 real_name: request.body.real_name,
                 province: request.body.province,
                 company: request.body.company,
-                company_type: request.body.company_type,
-                company_scale: request.body.company_scale,
                 version: request.body.version
             };
             let sessionUser = request.session.sessionUser;

public/scHintBox.html

@@ -77,6 +77,12 @@
         font: function(str){
             return `<span style='color:red;font-weight:bold;font-size:15px'> ${str} </span>`;
         },
+        fontRed: function(str){
+            return `<span style='color:red;'> ${str} </span>`;
+        },
+        fontBlue: function(str){
+            return `<span style='color:blue;'> ${str} </span>`;
+        },
         error: function (err) {   // 注意：该方法只能用在valueBox()的doOK回调函数中。
             $('#hintBox_error').text(err);
             $('#hintBox_error').show(200);

web/building_saas/complementary_ration_lib/html/dinge.html

@@ -573,6 +573,26 @@
         </div>
     </div>
 </div>
+<div class="modal fade" id="delRationAlert" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <input type="hidden"  value="123">
+    <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">
+                <h5 class="text-danger">是否删除当前节点及其子项？</h5>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" id="delRationConfirm">确认</button>
+                <button type="button" class="btn btn-secondary"  data-dismiss="modal">取消</button>
+            </div>
+        </div>
+    </div>
+</div>
 <!-- JS. -->
 <script src = "/lib/spreadjs/sheets/gc.spread.sheets.all.11.1.2.min.js"></script>
 <script>GC.Spread.Sheets.LicenseKey =  '<%- LicenseKey %>';</script>

web/building_saas/complementary_ration_lib/html/gongliao.html

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

web/building_saas/complementary_ration_lib/js/global.js

@@ -12,7 +12,7 @@ function autoFlashHeight(){
     $(".main-data-top").height($(window).height()-headerHeight-toolsBar-bottomContentHeight-2);
     $(".main-data-top-fluid").height($(window).height()-headerHeight-bottomContentHeight-2);
     $(".main-data").height($(window).height()-headerHeight);
-    $(".main-side .tab-content").height($(window).height()-headerHeight-38);
+    $(".main-side .tab-content").height($(window).height()-headerHeight-29);
     $('#partialBody').height($(window).height()-headerHeight-toolsBar - 60);
     let partialWidth = $('#tablePartial').width();
     $('#tablePartial').find('th:eq(0)').width(partialWidth * 0.06);

web/building_saas/complementary_ration_lib/js/ration.js

@@ -267,15 +267,14 @@ let rationOprObj = {
                         callback: function(){},
                         items: {
                             "delete": {name: "删除", disabled: delDis, icon: "fa-remove", callback: function (key, opt) {
-
                                 let removeInfo = `确定要删除定额 “${ration.code}” 及其下的所有数据吗？`;
                                 $('#delRationAlert').find('.modal-body h5').text(removeInfo);
                                 $('#delRationAlert').modal('show');
+                                $('#delRationConfirm').unbind('click');
                                 $('#delRationConfirm').bind('click', function () {
                                     me.rationsCodes.splice(me.rationsCodes.indexOf(ration.code.toString()), 1);
                                     me.mixDel = 1;
                                     me.mixUpdateRequest([], [], [ration.ID]);
-                                    $('#delRationConfirm').unbind('click');
                                     $('#delRationAlert').modal('hide');
                                 });
                             }}
@@ -471,12 +470,12 @@ let rationOprObj = {
                 if(rObj.code && rObj.code.toString().trim().length > 0){
                     if(me.rationsCodes.indexOf(rObj.code.toString()) === -1){
                         //jobContent
-                        if(jobContentOprObj && jobContentOprObj.currentSituation === jobContentOprObj.situations.ALL){
+                       /* if(jobContentOprObj && jobContentOprObj.currentSituation === jobContentOprObj.situations.ALL){
                             rObj.jobContent = jobContentOprObj.currentJobContent ? jobContentOprObj.currentJobContent : '';
                         }
                         if(annotationOprObj && annotationOprObj.currentSituation === annotationOprObj.situations.ALL){
                             rObj.annotation = annotationOprObj.currentAnnotation ? annotationOprObj.currentAnnotation : '';
-                        }
+                        }*/
                         me.setInitPrc(rObj);
                         if (rObj.code && rObj.code !== '') {
                             rObj.code = rObj.code.toUpperCase();
@@ -534,12 +533,12 @@ let rationOprObj = {
                 if(!cacheSection[rowIdx] && info.cellRange.col === 0 ){
                     if(me.rationsCodes.indexOf(items[i].code.toString()) === -1){
                         //jobConten
-                        if(jobContentOprObj && jobContentOprObj.currentSituation === jobContentOprObj.situations.ALL){
+                        /*if(jobContentOprObj && jobContentOprObj.currentSituation === jobContentOprObj.situations.ALL){
                             items[i].jobContent = jobContentOprObj.currentJobContent ? jobContentOprObj.currentJobContent : '';
                         }
                         if(annotationOprObj && annotationOprObj.currentSituation === annotationOprObj.situations.ALL){
                             items[i].annotation = annotationOprObj.currentAnnotation ? annotationOprObj.currentAnnotation : '';
-                        }
+                        }*/
                         me.setInitPrc(items[i]);
                         addArr.push(items[i]);
                         me.rationsCodes.push(items[i].code.toString());
@@ -582,12 +581,12 @@ let rationOprObj = {
                     //是否含有已存在的编号
                     if(me.rationsCodes.indexOf(items[i].code.toString()) === -1){
                         //jobConten
-                        if(jobContentOprObj && jobContentOprObj.currentSituation === jobContentOprObj.situations.ALL){
+                       /* if(jobContentOprObj && jobContentOprObj.currentSituation === jobContentOprObj.situations.ALL){
                             items[i].jobContent = jobContentOprObj.currentJobContent ? jobContentOprObj.currentJobContent : '';
                         }
                         if(annotationOprObj && annotationOprObj.currentSituation === annotationOprObj.situations.ALL){
                             items[i].annotation = annotationOprObj.currentAnnotation ? annotationOprObj.currentAnnotation : '';
-                        }
+                        }*/
                         me.setInitPrc(items[i]);
                         addArr.push(items[i]);
                     }
@@ -647,7 +646,7 @@ let rationOprObj = {
             me.rationSelInit(curRow);
             //add
             //jobContent
-            if(jobContentOprObj ){
+            /*if(jobContentOprObj ){
                 jobContentOprObj.currentRationItems = cacheSection;
                 jobContentOprObj.setRadiosDisabled(cacheSection.length > 0 ? false : true, jobContentOprObj.radios);
                 if(cacheSection.length === 0){
@@ -667,7 +666,7 @@ let rationOprObj = {
                 if(annotationOprObj.currentSituation === annotationOprObj.situations.PARTIAL){
                     annotationOprObj.buildTablePartial(annotationOprObj.fzTablePartial, annotationOprObj.getGroup(cacheSection));
                 }
-            }
+            }*/
             me.showRationItems(me.currentSectionId);
             me.mixUpdate = 0;
             me.mixDel = 0;
@@ -684,10 +683,10 @@ let rationOprObj = {
             me.currentSectionId = sectionID;
             if (me.currentRations["_SEC_ID_" + sectionID]) {
                 //jobContent--
-                jobContentOprObj.currentRationItems = me.currentRations["_SEC_ID_" + sectionID];
-                jobContentOprObj.rationJobContentOpr(me.currentRations["_SEC_ID_" + sectionID]);
+               /* jobContentOprObj.currentRationItems = me.currentRations["_SEC_ID_" + sectionID];
+                jobContentOprObj.rationJobContentOpr(me.currentRations["_SEC_ID_" + sectionID]);*/
                 //annotation
-                annotationOprObj.rationAnnotationOpr(me.currentRations["_SEC_ID_" + sectionID]);
+                //annotationOprObj.rationAnnotationOpr(me.currentRations["_SEC_ID_" + sectionID]);
                 me.showRationItems(sectionID);
                 sectionTreeObj.removeBtn.removeClass('disabled');
                 if(callback){
@@ -698,10 +697,10 @@ let rationOprObj = {
                     me.currentRations["_SEC_ID_" + sectionID] = rstData;
                     me.sortByCode(me.currentRations["_SEC_ID_" + sectionID]);
                     //job--
-                    jobContentOprObj.currentRationItems = me.currentRations["_SEC_ID_" + sectionID];
-                    jobContentOprObj.rationJobContentOpr(me.currentRations["_SEC_ID_" + sectionID]);
+                    /*jobContentOprObj.currentRationItems = me.currentRations["_SEC_ID_" + sectionID];
+                    jobContentOprObj.rationJobContentOpr(me.currentRations["_SEC_ID_" + sectionID]);*/
                     //annotation
-                    annotationOprObj.rationAnnotationOpr(me.currentRations["_SEC_ID_" + sectionID]);
+                    //annotationOprObj.rationAnnotationOpr(me.currentRations["_SEC_ID_" + sectionID]);
                     me.showRationItems(sectionID);
                     sectionTreeObj.removeBtn.removeClass('disabled');
                     if(callback) {

web/building_saas/complementary_ration_lib/js/section_tree.js

@@ -274,7 +274,7 @@ let sectionTreeObj = {
             me.setColor(me.cache);
             me.sheet.setFormatter(-1, 0, '@');
             me.initSelection(me.tree.selected);
-            explanatoryOprObj.bindEvents($('#explanationShow'), $('#ruleTextShow'));
+            //explanatoryOprObj.bindEvents($('#explanationShow'), $('#ruleTextShow'));
         };
         let errFunc = function () {
 

web/building_saas/main/html/main.html

@@ -77,13 +77,13 @@
           <div class="tab-content">
             <div class="tab-pane active" id="zaojiashu" role="tabpanel">
               <!--造价书-->
-              <div class="toolsbar px-1 d-flex justify-content-between">
+              <div class="toolsbar px-1 d-flex justify-content-between" id="headerToolsBar">
                   <div class="tools-btn btn-group align-top">
                     <!--<a href="javascript:void(0)" class="btn btn-sm" title="复制" ><i class="fa fa-files-o" aria-hidden="true"></i></a>
                     <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>-->
                       <span class="btn btn-light btn-sm" data-toggle="tooltip" data-original-title="项目属性" data-placement="bottom">
-                        <a href="javascript:void(0);" id="openProjSet" data-target="#poj-set" data-toggle="modal"><i class="fa fa-cog"></i></a>
+                        <a href="javascript:void(0);" id="openProjSet"><i class="fa fa-cog"></i></a>
                     </span>
                     <span class="btn btn-light btn-sm" id="importSpan" data-toggle="tooltip" data-original-title="导入" data-placement="bottom">
                         <a class="dropdown-toggle" href="#" data-toggle="dropdown"><i class="fa fa-cloud-upload"></i></a>
@@ -99,8 +99,8 @@
                       <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>
                       <div class="btn-group ml-2">
-                          <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">更多</a>
-                          <div class="dropdown-menu dropright">
+                          <a class="dropdown-toggle" data-toggle="dropdown" href="#" id="moreMenuA" role="button" aria-haspopup="true" aria-expanded="false">更多</a>
+                          <div class="dropdown-menu dropright" id="moreMenu">
                               <a id="displayA" href="javascript:void(0);" data-toggle="dropdown" class="dropdown-item dropdown-toggle"><i class="fa fa-list-ol"></i> 显示至...</a>
                               <div id="subDisplay" class="dropdown-menu dropdown-menu-left" style="min-width: 6.5rem; position: absolute; transform: translate3d(158px, 3px, 0px); top: 0px; left: 0px; will-change: transform;" x-placement="right-start">
                                   <a class="dropdown-item btn-sm" href="javascript:void(0);" id="displayDXFY">大项费用</a>
@@ -153,19 +153,22 @@
                          <!-- <li class="nav-item">
                               <a class="nav-link px-3" href="javascript:void(0)" id = 'stdBillsTab' relaPanel="#qd">清单规则</a>
                           </li>-->
-                          <li class="nav-item" id = "li_stdRationTab">
-                              <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id="stdRationTab" relaPanel="#de">定额库</a>
+                          <li class="nav-item" id="li_stdRationTab">
+                              <a class="nav-link px-1 right-nav-link" href="javascript:void(0)" id="stdRationTab"
+                                 relaPanel="#de">定额库</a>
                           </li>
                           <li class="nav-item dropdown">
                               <!--<a class="nav-link dropdown-toggle more" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">更多</a>-->
                               <div class="dropdown-menu">
                                   <a class="dropdown-item  right-nav-link"  href="javascript:void(0)" id = 'locateTab' relaPanel="#locate">查找定位</a>
                                   <!-- <a class="dropdown-item" data-toggle="tab" href="#sqpz" role="tab">书签批注</a>-->
+                                
                               </div>
                           </li>
+
                           <script>
                               //2018-11-23  zhang 模板库移动到更多下拉框
-                              if (G_SHOW_BLOCK_LIB){
+                              if (G_SHOW_BLOCK_LIB) {
                                   $("#locateTab").after('<a class="dropdown-item right-nav-link" href="javascript:void(0)" ' +
                                       'id="blockLibTab" relaPanel="#kmbk">块模板库</a>');
                               }

web/building_saas/main/js/main.js

@@ -59,10 +59,10 @@ function getMainResizeEles() {
     };
     mainResizeEles.limit = {
         min: 150,
-        max: `$(window).height()-$('.header').height()-$('.toolsbar').height()-150-10`,
+        max: `$(window).height()-$('.header').height()-$('#headerToolsBar').height()-150-10`,
         notTopSpread: 0,
         notBottomSpread: $('#bottom_div ul').height(),
-        totalHeight: `$(window).height()-$('.header').height()-$('.toolsbar').height()-10`
+        totalHeight: `$(window).height()-$('.header').height()-$('#headerToolsBar').height()-10`
     };
     return mainResizeEles;
 }

web/building_saas/main/js/views/block_lib.js

@@ -27,7 +27,7 @@ var blockLibObj = {
                 "font":["Arial"]
             },
             "data":{
-                "field":"name",
+                "field":"nodeName",
                 "vAlign":1,
                 "hAlign":0,
                 "font":"Arial"
@@ -70,14 +70,14 @@ var blockLibObj = {
         $.bootstrapLoading.start();
         let me = this;
         me.mainDatas = [
-            {ID: 1, ParentID: -1, NextSiblingID: 2, name: '分类1', type: 1},
-            {ID: 2, ParentID: -1, NextSiblingID: 3, name: '分类2', type: 1},
-            {ID: 3, ParentID: -1, NextSiblingID: 4, name: '分类3', type: 1},
+            {ID: 1, ParentID: -1, NextSiblingID: 2, nodeName: '分类1', type: 1},
+            {ID: 2, ParentID: -1, NextSiblingID: 3, nodeName: '分类2', type: 1},
+            {ID: 3, ParentID: -1, NextSiblingID: 4, nodeName: '分类3', type: 1},
             // {ID: 105, ParentID: 1, NextSiblingID: 106, name: '块1', type: 2},
             // {ID: 106, ParentID: 1, NextSiblingID: 107, name: '块2', type: 2},
-            {ID: 7, ParentID: -1, NextSiblingID: 8, name: '分类7', type: 1},
-            {ID: 9, ParentID: -1, NextSiblingID: -1, name: '分类9', type: 1}//,
-            // {ID: 201, ParentID: 52, NextSiblingID: -1, name: '块201', type: 2}
+            {ID: 7, ParentID: -1, NextSiblingID: 8, nodeName: '分类7', type: 1},
+            {ID: 9, ParentID: -1, NextSiblingID: -1, nodeName: '分类9', type: 1}//,
+            // {ID: 201, ParentID: 52, NextSiblingID: -1, nodeName: '块201', type: 2}
         ];
 
         if (me.mainSpread) {
@@ -366,7 +366,7 @@ var blockLibObj = {
 
         let newNode = tree.insert(pID, nID);
         newNode.data.type = nodeType;
-        newNode.data.fileName = nodeName;
+        newNode.data.nodeName = nodeName;
         if (nodeType == 2){
             let bill = source.datas[0];
             newNode.data.compilationID = source.compilationID;
@@ -401,7 +401,7 @@ var blockLibObj = {
         let idx = tree.items.indexOf(newNode);
         sheet.addRows(idx, 1);
         sheet.getRange(idx, 0, 1, 1).locked(true);
-        sheet.setValue(idx, 0, newNode.data.fileName);
+        sheet.setValue(idx, 0, newNode.data.nodeName);
         sheet.setSelection(idx, 0, 1, 1);
 
         sheet.resumeEvent();
@@ -409,7 +409,7 @@ var blockLibObj = {
     },
     reName: function (node, newName){
         if (newName == '') return;
-        node.data.fileName = newName;
+        node.data.nodeName = newName;
         let idx = blockLibObj.mainTree.items.indexOf(node);
         blockLibObj.mainSheet.setValue(idx, 0, newName);
     },
@@ -455,10 +455,11 @@ var blockLibObj = {
                     name: '一对一克隆',
                     icon: "fa-battery-empty",
                     disabled: function () {
-
+                        let ok = me.curIsBlock() && calcTools.isLeafBill(projectObj.project.mainTree.selected);
+                        return !ok;
                     },
                     visible: function(key, opt){
-                        return me.curIsBlock();
+                        return true;
                     },
                     callback: function (key, opt) {
                         me.onCellDoubleClick();
@@ -468,10 +469,11 @@ var blockLibObj = {
                     name: '一对多克隆',
                     icon: "fa-battery-half",
                     disabled: function () {
-
+                        let ok = me.curIsBlock() && calcTools.isParentBill(projectObj.project.mainTree.selected);
+                        return !ok;
                     },
                     visible: function(key, opt){
-                        return me.curIsBlock();
+                        return true;
                     },
                     callback: function (key, opt) {
 
@@ -481,10 +483,11 @@ var blockLibObj = {
                     name: '多对多克隆',
                     icon: "fa-battery-full",
                     disabled: function () {
-
+                        let ok = me.curIsCategory() && calcTools.isParentBill(projectObj.project.mainTree.selected);
+                        return !ok;
                     },
                     visible: function(key, opt){
-                        return me.curIsCategory();
+                        return true;
                     },
                     callback: function (key, opt) {
 
@@ -500,7 +503,10 @@ var blockLibObj = {
                         return true;
                     },
                     callback: function (key, opt) {
-                        me.delete();
+                        let name = hintBox.fontRed(me.mainTree.selected.data.nodeName);
+                        hintBox.infoBox('操作确认', `确定要删除"${name}"吗？`, 2, function () {
+                            me.delete();
+                        });
                     }
                 },
                 "moveBlock": {
@@ -510,7 +516,8 @@ var blockLibObj = {
                         return true;
                     },
                     visible: function(key, opt){
-                        return me.curIsBlock();
+                        // return me.curIsBlock();
+                        return false;
                     },
                     callback: function (key, opt) {
 
@@ -565,12 +572,12 @@ $(document).ready(function(){
 
     $('#btn_block_reName').on('click', function (){
         let select = blockLibObj.mainTree.selected;
-        $('#input_block_reName').val(select.data.fileName);
+        $('#input_block_reName').val(select.data.nodeName);
     });
 
     $('#btn_block_reName_OK').on('click', function (){
         let select = blockLibObj.mainTree.selected;
-        let oldName = select.data.fileName;
+        let oldName = select.data.nodeName;
         let newName = $('#input_block_reName').val();
         if (oldName != newName) blockLibObj.reName(select, newName);
     });

web/building_saas/main/js/views/project_property_basicInfo.js

@@ -477,9 +477,6 @@ $(document).ready(function () {
     });
 
     $('#poj-set').on('hidden.bs.modal', function (e) {
-        setTimeout(function () {
-            $('[data-toggle="tooltip"]').tooltip('hide');
-        }, 50);
         //destroy Spread
         if(basicInfoView.workBook){
             basicInfoView.workBook.destroy();
@@ -491,7 +488,10 @@ $(document).ready(function () {
     $('#tab_poj-settings-basicInfo').on('shown.bs.tab', function () {
         basicInfoView.workBook.refresh();
     });
-
+    $('#openProjSet').click(function () {
+        $('[data-toggle="tooltip"]').tooltip('hide');
+        $('#poj-set').modal('show');
+    })
    /* $('#property_ok').bind('click', function () {
         if(basicInfoView.toUpdate(basicInfoView.orgDatas, basicInfoView.datas)){
             basicInfoView.a_updateInfo(basicInfoView.toSaveDatas(basicInfoView.datas));

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

@@ -2161,25 +2161,26 @@ let displayLevel = function(nodes, depth, type){
         TREE_SHEET_HELPER.refreshNodesVisible(refreshNodes, projectObj.mainSpread.getActiveSheet(), true)
     });
 };
-/*let enterDisplayA = false,
-    enterSubDisplay = false;
+$('body').click(function () {
+    //点击完后隐藏子菜单
+   if ($('#subDisplay').is(':visible')) {
+       $('#subDisplay').removeClass('show');
+   }
+});
+let enterDisplayA = false;
 //鼠标移到显示至，自动弹出子菜单
-$('#displayA').mouseenter(function () {
+$('#displayA').mouseenter(function (e) {
     enterDisplayA = true;
-   $('#subDisplay').addClass('show');
-});
-$('#subDisplay').mouseenter(function () {
-    enterSubDisplay = true;
-});
-$('#subDisplay').mouseleave(function () {
-    enterSubDisplay = true;
+    $('#subDisplay').addClass('show');
 });
 $('#displayA').mouseleave(function () {
     enterDisplayA = false;
-    if (!enterSubDisplay) {
-        $('#subDisplay').removeClass('show');
-    }
-});*/
+});
+$('#moreMenu > a').mouseenter(function () {
+   if (!enterDisplayA) {
+       $('#subDisplay').removeClass('show');
+   }
+});
 
 $('#displayDXFY').click(function () {
    displayLevel(projectObj.project.mainTree.items, 0, 'DXFY')
@@ -2939,7 +2940,7 @@ $(function () {
             if (Categories.length <= 0) return result;
 
             for (let c of Categories){
-                result += '<option value="'+ c.data.ID +'">'+ c.data.name +'</option>';
+                result += '<option value="'+ c.data.ID +'">'+ c.data.nodeName +'</option>';
             };
             return result;
         };

web/users/html/login-infoinput.html

@@ -40,7 +40,7 @@
                             <% })%>
                         </select>
                     </div>
-                    <div class="form-group">
+                    <!--<div class="form-group">
                         <a class="btn btn-link" data-toggle="collapse" href="#moreinfo" aria-expanded="false"
                            aria-controls="moreinfo">更多选项</a>
                     </div>
@@ -61,7 +61,7 @@
                                 <% })%>
                             </select>
                         </div>
-                    </div>
+                    </div>-->
                     <div class="form-group">
                         <button class="btn btn-primary btn-block" type="submit">下一步</button>
                     </div>

web/users/html/user-info.html

@@ -58,7 +58,7 @@
                                 <% })%>
                             </select>
                         </div>
-                        <div class="form-group">
+                    <!--    <div class="form-group">
                             <label class="form-control-label">企业类型</label>
                             <select class="form-control" name="company_type">
                                 <option value="">请选择企业类型</option>
@@ -75,7 +75,7 @@
                                 <option value="<%= index %>" <% if(index === userData.company_scale) {%>selected="selected"<% } %>><%= companyScale %></option>
                                 <% })%>
                             </select>
-                        </div>
+                        </div>-->
                         <div class="form-group mt-3">
                             <button class="btn btn-primary" type="submit">确认</button>
                         </div>