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

modules/all_models/std_price_info_areas.js

@@ -0,0 +1,10 @@
+// 信息价地区（一个费用定额共用地区）
+const mongoose = require('mongoose');
+
+const Schema = mongoose.Schema;
+const priceInfoArea = new Schema({
+    ID: String,
+    compilationID: String,
+    name: String
+}, {versionKey: false});
+mongoose.model('std_price_info_areas', priceInfoArea, 'std_price_info_areas');

modules/all_models/std_price_info_class.js

@@ -7,7 +7,7 @@ const priceInfoClass = new Schema({
     ParentID: String,
     NextSiblingID: String,
     name: String,
-    area: String,
+    areaID: String,
     libID: String
 }, {versionKey: false});
 mongoose.model('std_price_info_class', priceInfoClass, 'std_price_info_class');

modules/all_models/std_price_info_items.js

@@ -14,7 +14,7 @@ const priceInfoItems = new Schema({
     noTaxPrice: String, // 不含税价格
     // 以下冗余数据为方便前台信息价功能处理
     period: String, // 期数 eg: 2020-05
-    area: String, // 地区
+    areaID: String, // 地区
     compilationID: String, // 费用定额
     remark: String
 }, {versionKey: false});

modules/all_models/std_price_info_lib.js

@@ -6,10 +6,6 @@ const priceInfoLib = new Schema({
     ID: String,
     name: String,
     period: String, // 期数 eg: 2020-05
-    areas: { // 地区
-        type: Array,
-        default: []
-    },
     compilationID: String,
     createDate: Number,
 }, {versionKey: false});

web/building_saas/main/js/models/ration.js

@@ -885,12 +885,12 @@ var Ration = {
         } ;
         //获取定额前缀
         ration.prototype.getRationPrefix = function(defaultLibID, ration){
-            if(defaultLibID !== ration.libID){
-                return rationPrefix.borrow;
-            }
             if(ration.from && ration.from === rationFrom.cpt){
                 return rationPrefix.complementary;
             }
+            if(defaultLibID !== ration.libID){
+                return rationPrefix.borrow;
+            }
             return rationPrefix.none;
         };
 

web/common/html/header.html

@@ -80,7 +80,7 @@
                     <!--<a class="dropdown-item" href="/web/common/html/pdfViewer.html?type=userGuide" target="_blank">用户手册</a>
                     <a class="dropdown-item" href="/web/common/html/pdfViewer.html?type=upgradeGuide" target="_blank">升级说明</a>-->
                     <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dsk_yhsc" target="_blank">用户手册</a>
-                    <a class="dropdown-item" href="/public/share/upgradeGuide/upgradeGuide.pdf" target="_blank">升级说明</a>
+                    <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dasikongupdate/dasikongupdate-1c6lsks1552q8" target="_blank">升级说明</a>
                     <a class="dropdown-item" href="http://zhzdwk.com/special/detail/36" target="_blank">计价依据</a>
                     <a class="dropdown-item" href="https://smartcost.com.cn/" target="_blank">纵横官网</a>
                     <!--  <a class="dropdown-item" href="#">动画教程</a>-->