Explorar o código

Merge branch '3.0.1_online'

zhangweicheng %!s(int64=5) %!d(string=hai) anos
pai
achega
48b03f9c58

+ 1 - 1
web/building_saas/main/js/models/project_glj.js

@@ -584,7 +584,7 @@ ProjectGLJ.prototype.priceCalc = function (glj,dataMap,tpriceList) {
 };
 
 
-ProjectGLJ.prototype.m_updateUnitPrice = function (datas,isFromFeeRate) {//批量更新
+ProjectGLJ.prototype.m_updateUnitPrice = function (datas,isFromFeeRate=false) {//批量更新
     let me = this;
     let gljList = [];
     for(let d of datas){

+ 1 - 1
web/building_saas/pm/js/pm_share.js

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