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

modules/main/models/bills.js

@@ -181,13 +181,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

@@ -88,6 +88,7 @@ Project.prototype.save = function(datas, callback){
             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;

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>

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/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')

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>