Browse Source

1.升级说明文件由pdf文件转换为在线文档。
2.补充定额库里调用新增的定额,使用复制整块、粘贴整块的定额编号应是带“补”字,现是借字

vian 5 years ago
parent
commit
c3ba0c822f
2 changed files with 4 additions and 4 deletions
  1. 3 3
      web/building_saas/main/js/models/ration.js
  2. 1 1
      web/common/html/header.html

+ 3 - 3
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;
         };
 

+ 1 - 1
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>-->