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

modules/all_models/bills.js

@@ -10,7 +10,6 @@ let billsSchema = new Schema({
     ParentID: String,
     NextSiblingID: String,
     projectID: {type: Number, index: true} ,
-    serialNo: Number,
     chapterID: Number,
     billsLibId: Number,
     code: String,

modules/all_models/std_over_height_lib.js

@@ -7,7 +7,6 @@
  * @date 2019/3/5
  * @version
  */
-//建设项目基本信息库
 const mongoose = require('mongoose');
 const Schema = mongoose.Schema;
 const oprSchema = require('../all_schemas/opr_schema');

modules/users/models/user_model.js

@@ -349,7 +349,7 @@ class UserModel extends BaseModel {
      * @return {version}
      */
     async getVersionFromUpgrade(ssoId, compilationId){
-        let version = '大司空云计价(免费公用版)';
+        let version = '大司空云计价(免费版)';
         let lock = 0;
         let userData = await this.findDataBySsoId(ssoId);
         if (userData.upgrade_list !== undefined) {

web/building_saas/main/js/views/project_glj_view.js

@@ -465,8 +465,9 @@ let projectGljObject = {
       gljId = null,
       gljType = null;
     if (!$('#mixRatio-nav').hasClass('active')) return;
-    me.mixRatioSpread.setActiveSheetIndex(0);
     if (!me.projectGljSpread) return;
+    if (!me.mixRatioSpread) return;
+    me.mixRatioSpread.setActiveSheetIndex(0);
     let sheet = me.projectGljSpread.getActiveSheet();
     let oldSel = me.mixRatioSheet.getSelections()[0];
     if (sheet.name() == 'projectGljSheet') { //projectGljSheet/materialSheet 工料机汇总和三材汇总表
@@ -504,6 +505,7 @@ let projectGljObject = {
   showRelatedRationDatas: function () {
     let me = this;
     if (!$('#ration-nav').hasClass('active')) return;
+    if(!me.mixRatioSpread) return;
     me.mixRatioSpread.setActiveSheetIndex(1);
     let projectGLJData = me.getProjectGLJSelected();
     let rationIDMap = {};

web/building_saas/pm/js/pm_share.js

@@ -813,7 +813,7 @@ const pmShare = (function () {
                   },
                   callback: function (key, opt) {
                       if($(".p-title").text().includes('免费')){
-                        hintBox.versionBox('此功能仅在专业版中提供，免费公用版可选择单位工程进行拷贝');
+                        hintBox.versionBox('此功能仅在专业版中提供，免费版可选择单位工程进行拷贝');
                         return;
                       }
                       copyContructionProject(tree.selected);

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('此功能仅在专业版中提供，免费版可选择单位工程进行分享。');
             } else {
                 curSharedUsers = sharedUsers;
                 initSharedView(sharedUsers);

web/users/html/index.html

@@ -33,7 +33,7 @@
       <!--banner-->
       <div class="hero bg-dark section " style="background-image: url(/web/users/images/bg_01.png);" id="home">
          <div class="container text-center">
-            <h1 class="text-white mb-4 f-50 ">市政计价免费公用版，永久免费</h1>
+            <h1 class="text-white mb-4 f-50 ">市政计价免费版，永久免费</h1>
             <p class="lead text-white mb-5">跨平台，打开浏览器即可使用，全新在线计价体验。
             <div class="btn_hero">
                <a href="/login" class="btn btn-danger mr-2">登录软件</a>

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">免费版 </h3>
                                       <!--<p class="card-text">-->
                                     <!--  <ul class="pl-3">
                                           <li>只可创建 50 个单位工程</li>