Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/users/models/user_model.js

@@ -348,7 +348,8 @@ class UserModel extends BaseModel {
      */
     async getVersionFromUpgrade(ssoId, compilationId) {
         let title = config[process.env.NODE_ENV].title?config[process.env.NODE_ENV].title:"纵横公路养护云造价";
-        let version = title+'(学习版)';//'纵横公路养护造价(免费云版)'; 2019-03-28 需求修改，听说不知道多久的以后还会改回来--勿删！！！！！
+        let versionText = title === '纵横公路云造价'?'免费版':'学习版';
+        let version = `${title}(${versionText})`;//'纵横公路养护造价(免费云版)'; 2019-03-28 需求修改，听说不知道多久的以后还会改回来--勿删！！！！！
         let lock = 0;
         let userData = await this.findDataBySsoId(ssoId);
         if (userData.upgrade_list !== undefined) {

public/common_util.js

@@ -128,7 +128,13 @@
         const standardIntPart = temp.reverse().join('');
         return `${standardIntPart}${decimalPart ? '.' + decimalPart : ''}`;
     }
-
+    //判断是否公路云
+    function isGLYun(){
+        return $('title').text().indexOf("纵横公路云造价")!= -1 
+    }
+    function getVersionText(){
+        return isGLYun()?"免费版":"学习版"
+    }
     return {
         isDef,
         isEmptyVal,
@@ -138,5 +144,7 @@
         getSortedTreeData,
         handleFullscreen,
         standardNumber,
+        isGLYun,
+        getVersionText
     };
 });

web/building_saas/complementary_glj_lib/html/tools-gongliaoji.html

@@ -154,7 +154,6 @@
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.excheck.js"></script>
     <script type="text/javascript" src="/lib/ztree/jquery.ztree.exedit.js"></script>
     <!--inject:js-->
-    <script src="/web/building_saas/js/global.js"></script>
     <!-- zTree -->
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>
     <script type="text/javascript" src="/public/web/treeDataHelper.js"></script>

web/building_saas/complementary_ration_lib/html/anzhuang.html

@@ -188,7 +188,6 @@
     <script src="/public/web/tree_sheet/tree_sheet_helper.js"></script>
     <script src="/public/web/sheet/sheet_common.js"></script>
     <script src="/public/web/common_ajax.js"></script>
-    <script src="/web/building_saas/complementary_ration_lib/js/global.js"></script>
     <script src="/web/building_saas/complementary_ration_lib/js/installation.js"></script>
     <!--endinject-->
 </body>

web/building_saas/complementary_ration_lib/html/main.html

@@ -40,7 +40,6 @@
     <script src="/lib/popper/popper.min.js"></script>
     <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
-    <script src="/web/building_saas/js/global.js"></script>
     <!-- zTree -->
     <script type="text/javascript" src="/public/web/date_util.js"></script>
     <script type="text/javascript" src="/public/web/common_ajax.js"></script>

web/building_saas/main/html/main.html

@@ -2059,7 +2059,6 @@
     <!-- JS. -->
     <!--<script src="/lib/popper/popper.min.js"></script>
     <script src="/lib/bootstrap/bootstrap.min.js"></script>-->
-    <script src="/web/building_saas/js/global.js"></script>
     <script src="/web/common/components/share/index.js"></script>
     <!--报表 zTree -->
 

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

@@ -2330,7 +2330,7 @@ let displayLevel = function(nodes, depth, type){
 $('#open-export-modal').click(() => {
     CommonHeader.doAfterValidateVersion(
         () => $('#interface-export-modal').modal('show'),
-        () => alert('学习版不提供此功能。')
+        () => alert(`${commonUtil.getVersionText()}不提供此功能。`)
     );
 });
 

web/building_saas/pm/html/project-management.html

@@ -756,7 +756,6 @@
 <script>GC.Spread.Sheets.LicenseKey = '<%- LicenseKey %>';</script>
 <!-- inject:js -->
 <script type="text/javascript" src="/public/web/syntax-detection.js"></script>
-<script src="/web/building_saas/js/global.js"></script>
 <script src="/public/web/uuid.js"></script>
 <script src="/public/billsUtil.js"></script>
 <script src="/public/web/date_util.js"></script>

web/building_saas/pm/js/pm_newMain.js

@@ -343,7 +343,7 @@ const projTreeObj = {
             callback: function () {
                 CommonHeader.doAfterValidateVersion(
                     () => $('#interface-import-modal').modal('show'),
-                    () => alert('学习版不提供此功能。')
+                    () => alert(`${commonUtil.getVersionText()}不提供此功能。`)
                 );
                 //$('#interface-import-modal').modal('show');
             }

web/building_saas/pm/js/pm_share.js

@@ -799,7 +799,7 @@ const pmShare = (function () {
                     },
                     callback: function (key, opt) {
                         if ($(".p-title").text().includes('学习')) {
-                            hintBox.versionBox('此功能仅在专业版中提供，学习版可选择单个分段进行拷贝。');
+                            hintBox.versionBox(`此功能仅在专业版中提供，${commonUtil.getVersionText()}可选择单个分段进行拷贝。`);
                             return;
                         }
                         copyContructionProject(tree.selected);

web/building_saas/report/js/rpt_main.js

@@ -937,7 +937,7 @@ let rptControlObj = {
         }
     },
     checkAndGetExcel: function () {
-        if (zTreeOprObj.isFreeUser) {
+        if (zTreeOprObj.isFreeUser && !commonUtil.isGLYun()) {//2020-11-25  zhang 公路云版，免费版允许打印、导出报表
             hintBox.versionBox('对不起，您当前使用的是学习版，不提供导出、打印报表功能，请联系我们的客服人员。');
             return;
         }
@@ -1039,8 +1039,8 @@ let rptControlObj = {
     },
     getPDFPre: function () {
         let me = rptControlObj;
-        if (zTreeOprObj.isFreeUser) {
-            hintBox.versionBox('对不起，您当前使用的是学习公用版，不提供导出、打印报表功能，请联系我们的客服人员。');
+        if (zTreeOprObj.isFreeUser && !commonUtil.isGLYun()) {//2020-11-25  zhang 公路云版，免费版允许打印、导出报表
+            hintBox.versionBox('对不起，您当前使用的是学习版，不提供导出、打印报表功能，请联系我们的客服人员。');
             return;
         }
         if (rptTplObj.pdfFont['SmartSimsun'].length === 2) {

web/building_saas/report/js/rpt_print.js

@@ -4,7 +4,7 @@
 
 let rptPrintHelper = {
     preview: function () {
-        if (zTreeOprObj.isFreeUser) {
+        if (zTreeOprObj.isFreeUser && !commonUtil.isGLYun()) {//2020-11-25  zhang 公路云版，免费版允许打印、导出报表
             hintBox.versionBox('对不起，您当前使用的是学习版，不提供导出、打印报表功能，请联系我们的客服人员。');
             return;
         }

web/common/components/share/index.js

@@ -480,7 +480,7 @@ const SHARE_TO = (() => {
             $('#share-hint').text('');
             const { isFree, sharedUsers, recentUsers, contacts } = await getInitalData(projectID);
             if (isFree) {
-                hintBox.versionBox('此功能仅在专业版中提供，学习版可选择单个分段进行分享。');
+                hintBox.versionBox(`此功能仅在专业版中提供，${commonUtil.getVersionText()}可选择单个分段进行分享。`);
             } else {
                 curSharedUsers = sharedUsers;
                 initSharedView(sharedUsers);

web/common/html/header.html

@@ -328,6 +328,7 @@
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
 <script src="/lib/bootstrap/bootstrap-submenu.js"></script>
 <script type="text/javascript" src="/web/building_saas/js/moment.min.js"></script>
+<script type="text/javascript" src="/web/building_saas/js/global.js"></script>
 <script type="text/javascript" src="/web/building_saas/js/message.js"></script>
 <script type="text/javascript" src="/public/web/scMathUtil.js"></script>
 <script type="text/javascript" src="/public/web/gljUtil.js"></script>

web/src/html/pm/project-management.html

@@ -498,7 +498,6 @@
 <!-- inject:js -->
 <script src="/lib/popper/popper.min.js"></script>
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
-<script src="/web/building_saas/js/global.js"></script>
 <script src="/public/web/date_util.js"></script>
 <script src="/public/web/tree_table/tree_table.js"></script>
 <script type="text/javascript" src="/public/web/common_ajax.js"></script>

web/users/html/login-infoinput.html

@@ -74,7 +74,6 @@
 <script src="/lib/jquery/jquery-3.2.1.min.js"></script>
 <script src="/lib/popper/popper.min.js"></script>
 <script src="/lib/bootstrap/bootstrap.min.js"></script>
-<script src="/web/building_saas/js/global.js"></script>
 <script src="/web/users/js/user.js"></script>
 </body>
 

web/users/html/user-buy.html

@@ -51,7 +51,7 @@
                             <div class="col-sm-5 mb-5">
                                 <div class="card free-version">
                                   <div class=" card-body">
-                                    <h3 class="card-title">学习版 </h3>
+                                    <h3 class="card-title" id ="freeVersionText">学习版 </h3>
                                       <!--<p class="card-text">-->
                                     <!--  <ul class="pl-3">
                                           <li>只可创建 50 个单位工程</li>
@@ -134,7 +134,6 @@
         </div>
     </div>
     <!-- JS. -->
-  <script src="/web/building_saas/js/global.js"></script>
   <script src="/web/users/js/user.js"></script>
 </body>
 <script type="text/javascript">

web/users/html/user-info.html

@@ -111,7 +111,6 @@
     </div>
 </div>
 <!-- JS. -->
-<script src="/web/building_saas/js/global.js"></script>
 <script src="/web/users/js/user.js"></script>
 </body>
 <script type="text/javascript">

web/users/html/user-safe.html

@@ -137,7 +137,6 @@
     </div>
 </div>
 </body>
-<script src="/web/building_saas/js/global.js"></script>
 <script src="/web/users/js/user.js"></script>
 <script type="text/javascript">
     autoFlashHeight();

web/users/html/user-set.html

@@ -79,7 +79,6 @@
         </div>
     </div>
     <!-- JS. -->
-    <script src="/web/building_saas/js/global.js"></script>
 </body>
 <script type="text/javascript">
     autoFlashHeight();

web/users/js/user.js

@@ -12,7 +12,7 @@ $(document).ready(function() {
             return false;
         }
     });
-
+    $("#freeVersionText").text(commonUtil.getVersionText());
     $("input").blur(function () {
         cleanError();
     });