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

config/gulpConfig.js

@@ -15,6 +15,7 @@ module.exports = {
         'public/web/PerfectLoad.js',
         'lib/lodash/lodash.js',
         'public/web/commonAlert.js',
+        'public/web/headerOpr.js',
         'lib/jquery-editable-select/jquery.editable-select.min.js'
     ],
     common_css:[

modules/pm/controllers/pm_controller.js

@@ -67,6 +67,8 @@ module.exports = {
         });
     },
     getProjects: async function(req, res){
+        console.log(`req.session.sessionCompilation`);
+        console.log(req.session.sessionCompilation);
          await ProjectsData.getUserProjects(req.session.sessionUser.id, req.session.sessionCompilation._id, function(err, message, projects){
             if (projects) {
                 callback(req, res, err, message, projects);

modules/users/controllers/cld_controller.js

@@ -22,7 +22,12 @@ class CLDController {
      * @return {Promise.<void>}
      */
     async getCategoryStaff(request, response) {
+        const zongBuCategoryID = 12;
         let category = request.query.category;
+        if (!category || category == -1) {
+            category = request.session.sessionCompilation && request.session.sessionCompilation.categoryID ? request.session.sessionCompilation.categoryID : zongBuCategoryID;
+            console.log(category);
+        }
         try {
             let cldModel = new CLDModel();
             let result = await cldModel.getCategoryStaff(category);

public/web/headerOpr.js

@@ -0,0 +1,66 @@
+'use strict';
+
+/**
+ *
+ *
+ * @author Zhong
+ * @date 2018/11/30
+ * @version
+ */
+
+//header相关的公共操作接口
+const CommonHeader = (function () {
+    //帮助-联系客服
+    const csDom = $('#customerService');
+    //获取办事处客服列表
+    //@param {Number}category @return {void}
+    function getCategoryList(category = -1, titile = '') {
+        if (titile) {
+            $('#upgrade-title').text(titile);
+        }
+        $.ajax({
+            type: 'get',
+            url: '/cld/getCategoryStaff?category=' + category,
+            dataType: 'json',
+            timeout: 5000,
+            success: function (response) {
+                if (response.error !== 0) {
+                    alert('获取CLD人员信息失败！');
+                } else {
+                    let staffList = response.data;
+                    let staffhtml = '';
+                    $.each(staffList, function (key, staff) {
+                        staffhtml += '<div class="col-4 mb-4"> ' +
+                            '<div class="card"> ' +
+                            '<div class="card-body"> ' +
+                            '<h4 class="card-title">' + staff.username + '</h4> ' +
+                            '<h6 class="card-subtitle mb-2 text-muted">' + staff.category + '</h6> ' +
+                            '</div> ' +
+                            '<ul class="list-group list-group-flush"> ' +
+                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> ' + staff.qq + '</li> ' +
+                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> ' + staff.telephone + '</li> ' +
+                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> ' + staff.phone + '</li> ' +
+                            '</ul> </div> </div>';
+                    });
+                    $('#staffList').html(staffhtml);
+                    $('#activ').modal('show');
+                }
+            },
+            error: function () {
+                console.log('请求超时');
+            }
+        })
+    }
+    //绑定事件
+    //@return {void}
+    function addEventListener(){
+        csDom.click(function () {
+            getCategoryList(-1, '联系客服');
+        });
+    }
+    return {getCategoryList, addEventListener}
+})();
+
+$(document).ready(function(){
+    CommonHeader.addEventListener();
+});

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

@@ -84,12 +84,10 @@ var blockLibObj = {
             me.mainSpread.destroy();
             me.mainSpread = null;
         };
-
         if (me.billSpread) {
             me.billSpread.destroy();
             me.billSpread = null;
         };
-
         if (me.rationSpread) {
             me.rationSpread.destroy();
             me.rationSpread = null;
@@ -100,10 +98,8 @@ var blockLibObj = {
         me.mainSheet = me.mainSpread.getSheet(0);
         me.mainSheet.name('blockLibSheet');
         sheetCommonObj.spreadDefaultStyle(me.mainSpread);
-        // me.mainSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onCellDoubleClick);
-        me.mainSpread.bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
 
-        var showblockTree = function (datas) {
+        function showBlockTree(datas) {
             me.mainTree = idTree.createNew({id: 'ID', pid: 'ParentID', nid: 'NextSiblingID', rootId: -1, autoUpdate: false});
             me.mainTreeController = TREE_SHEET_CONTROLLER.createNew(me.mainTree, me.mainSheet, me.mainSetting);
             me.mainTree.loadDatas(datas);
@@ -114,16 +110,7 @@ var blockLibObj = {
                 blockLibObj.loadDetailDatas(node);
             });
         };
-
-/*        CommonAjax.post('/complementaryRation/api/getRationTree', {userId: userID, rationRepId: rationLibID}, function (datas) {
-            showblockTree(datas);
-            $.bootstrapLoading.end();
-        }, function () {
-            showblockTree([]);
-            $.bootstrapLoading.end();
-        });*/
-
-        showblockTree(me.mainDatas);
+        showBlockTree(me.mainDatas);
 
         me.billSpread = sheetCommonObj.buildSheet($('#div_block_bill')[0], me.billSetting, 1);
         me.billSheet = me.billSpread.getSheet(0);
@@ -137,6 +124,9 @@ var blockLibObj = {
 
         me.loadTreeContextMenu();
 
+        me.mainSpread.bind(GC.Spread.Sheets.Events.EnterCell, me.onEnterCell);
+        me.mainSpread.bind(GC.Spread.Sheets.Events.CellDoubleClick, this.onCellDoubleClick);
+
         $.bootstrapLoading.end();
     },
     loadDetailDatas: function (node){
@@ -529,6 +519,10 @@ var blockLibObj = {
     onEnterCell: function (sender, args) {
         let me = blockLibObj;
         me.mainTree.selected = me.mainTree.items[me.mainSheet.getActiveRowIndex()];
+    },
+    onCellDoubleClick: function (sender, args) {
+        let me = blockLibObj;
+        //
     }
 };
 

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

@@ -1503,7 +1503,7 @@ var projectObj = {
                 },
                 "createBlocks":{
                     name:'生成组价模板',
-                    icon: 'fa-edit',
+                    icon: 'fa-puzzle-piece',
                     disabled:function (key,opt) {
                         let selected = project.mainTree.selected;
                         return selected.sourceType != ModuleNames.bills;

web/common/html/header.html

@@ -53,13 +53,13 @@
             <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-placement="bottom"></i> 帮助</a>
                 <div class="dropdown-menu dropdown-menu-right">
-                    <a class="dropdown-item" href="#">帮助</a>
+                    <!--<a class="dropdown-item" href="#">帮助</a>
                     <a class="dropdown-item" href="#">升级说明</a>
-                    <a class="dropdown-item" href="#">重庆市2008定额说明</a>
-                    <a class="dropdown-item" href="#">纵横官网</a>
-                    <a class="dropdown-item" href="#">动画教程</a>
-                    <a class="dropdown-item" href="#">联系客服</a>
-                    <a class="dropdown-item" href="#">关于</a>
+                    <a class="dropdown-item" href="#">重庆市2008定额说明</a>-->
+                    <a class="dropdown-item" href="https://smartcost.com.cn/" target="_blank">纵横官网</a>
+                  <!--  <a class="dropdown-item" href="#">动画教程</a>-->
+                    <a id="customerService" class="dropdown-item" href="javascript:void(0);">联系客服</a>
+                  <!--  <a class="dropdown-item" href="#">关于</a>-->
                 </div>
             </li>
           <!--  <li class="nav-item">
@@ -141,6 +141,105 @@
         </div>
     </div>
 </div>
+<!--激活产品 & 售后服务 & 联系客服-->
+<!--办事处客服列表-->
+<div class="modal fade" id="activ" data-backdrop="static" style="display: none;" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="upgrade-title">联系销售代表激活</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">×</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row px-3" id="staffList">
+                    <div class="col-4 mb-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="card-title">刘飞</h4>
+                                <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                            </div>
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="col-4 mb-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="card-title">姜栋</h4>
+                                <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                            </div>
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="col-4 mb-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="card-title">冯娟</h4>
+                                <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                            </div>
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="col-4 mb-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="card-title">何耀</h4>
+                                <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                            </div>
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="col-4 mb-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="card-title">杨克松</h4>
+                                <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                            </div>
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                            </ul>
+                        </div>
+                    </div>
+                    <div class="col-4 mb-4">
+                        <div class="card">
+                            <div class="card-body">
+                                <h4 class="card-title">黄俊杰</h4>
+                                <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
+                            </div>
+                            <ul class="list-group list-group-flush">
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
+                                <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
+                            </ul>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
+            </div>
+        </div>
+    </div>
+</div>
 <!-- inject:js -->
 <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
 <script type="text/javascript" src="/lib/jquery-ui/jquery-ui.min.js"></script>
@@ -153,6 +252,6 @@
 <script type="text/javascript" src="/public/web/PerfectLoad.js"></script>
 <script type="text/javascript" src="/lib/lodash/lodash.js"></script>
 <script type="text/javascript" src="/public/web/commonAlert.js"></script>
+<script type="text/javascript" src="/public/web/headerOpr.js"></script>
 <script type="text/javascript" src="/lib/jquery-editable-select/jquery.editable-select.min.js"></script>
-
 <!-- endinject -->

web/users/html/login.html

@@ -76,6 +76,7 @@
                     <h5 class="modal-title">验证手机号</h5>
                 </div>
                 <div class="modal-body">
+                    <p class=""><i class="text-danger fa fa-exclamation-triangle"></i> 您的通行账号未绑定手机号，请先验证手机号进行绑定。</p>
                     <input type="hidden" id="check_ssoId" value="" />
                     <div class="form-row">
                         <div class="form-group col-md-8">
@@ -96,8 +97,8 @@
                     </div>
                 </div>
                 <div class="modal-footer">
-                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                     <button class="btn btn-primary" id="check-code">确定</button>
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">取消</button>
                 </div>
             </div>
         </div>

web/users/html/user-buy.html

@@ -110,104 +110,6 @@
             </div>
         </div>
     </div>
-    <!--激活产品 & 售后服务-->
-    <div class="modal fade" id="activ" data-backdrop="static" style="display: none;" aria-hidden="true">
-        <div class="modal-dialog modal-lg" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                  <h5 class="modal-title" id="upgrade-title">联系销售代表激活</h5>
-                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                    <span aria-hidden="true">×</span>
-                  </button>
-                </div>
-                <div class="modal-body">
-                  <div class="row px-3" id="staffList">
-                    <div class="col-4 mb-4">
-                      <div class="card">
-                        <div class="card-body">
-                          <h4 class="card-title">刘飞</h4>
-                          <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
-                        </div>
-                        <ul class="list-group list-group-flush">
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
-                        </ul>
-                      </div>
-                    </div>
-                    <div class="col-4 mb-4">
-                      <div class="card">
-                        <div class="card-body">
-                          <h4 class="card-title">姜栋</h4>
-                          <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
-                        </div>
-                        <ul class="list-group list-group-flush">
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
-                        </ul>
-                      </div>
-                    </div>
-                    <div class="col-4 mb-4">
-                      <div class="card">
-                        <div class="card-body">
-                          <h4 class="card-title">冯娟</h4>
-                          <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
-                        </div>
-                        <ul class="list-group list-group-flush">
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
-                        </ul>
-                      </div>
-                    </div>
-                    <div class="col-4 mb-4">
-                      <div class="card">
-                        <div class="card-body">
-                          <h4 class="card-title">何耀</h4>
-                          <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
-                        </div>
-                        <ul class="list-group list-group-flush">
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
-                        </ul>
-                      </div>
-                    </div>
-                    <div class="col-4 mb-4">
-                      <div class="card">
-                        <div class="card-body">
-                          <h4 class="card-title">杨克松</h4>
-                          <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
-                        </div>
-                        <ul class="list-group list-group-flush">
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
-                        </ul>
-                      </div>
-                    </div>
-                    <div class="col-4 mb-4">
-                      <div class="card">
-                        <div class="card-body">
-                          <h4 class="card-title">黄俊杰</h4>
-                          <h6 class="card-subtitle mb-2 text-muted">广东办</h6>
-                        </div>
-                        <ul class="list-group list-group-flush">
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> 914630468</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> 15812644017</li>
-                          <li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> 0756-3850891</li>
-                        </ul>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div class="modal-footer">
-                  <button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
-                </div>
-            </div>
-        </div>
-    </div>
     <!-- JS. -->
   <script src="/web/building_saas/js/global.js"></script>
   <script src="/web/users/js/user.js"></script>

web/users/js/user.js

@@ -26,38 +26,7 @@ $(document).ready(function() {
         } else {
             $('#upgrade-title').text('联系销售代表激活');
         }
-        $.ajax({
-            type: 'get',
-            url: '/cld/getCategoryStaff?category=' + category,
-            dataType: 'json',
-            timeout: 5000,
-            success: function (response) {
-                if (response.error !== 0) {
-                    alert('获取CLD人员信息失败！');
-                } else {
-                    let staffList = response.data;
-                    let staffhtml = '';
-                    $.each(staffList, function (key, staff) {
-                        staffhtml += '<div class="col-4 mb-4"> ' +
-                            '<div class="card"> ' +
-                            '<div class="card-body"> ' +
-                            '<h4 class="card-title">' + staff.username + '</h4> ' +
-                            '<h6 class="card-subtitle mb-2 text-muted">' + staff.category + '</h6> ' +
-                            '</div> ' +
-                            '<ul class="list-group list-group-flush"> ' +
-                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="腾讯QQ"><i class="fa fa-qq"></i> ' + staff.qq + '</li> ' +
-                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="手机号码"><i class="fa fa-tablet"></i> ' + staff.telephone + '</li> ' +
-                            '<li class="list-group-item" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="固定电话"><i class="fa fa-phone"></i> ' + staff.phone + '</li> ' +
-                            '</ul> </div> </div>';
-                    });
-                    $('#staffList').html(staffhtml);
-                    $('#activ').modal('show');
-                }
-            },
-            error: function () {
-                console.log('请求超时');
-            }
-        })
+        CommonHeader.getCategoryList(category);
     })
 });