zhongzewei 6 år sedan
förälder
incheckning
41d2b8781a

+ 2 - 2
web/building_saas/main/js/models/calc_base.js

@@ -1350,7 +1350,7 @@ let cbParser = {
             }
             }
         }
         }
         for(let i = 0, len = exps.length; i < len; i++){
         for(let i = 0, len = exps.length; i < len; i++){
-            exp = exp.replace(new RegExp(exps[i].orgExp, 'g'), exps[i].newExp);
+            exp = exp.replace(new RegExp(`${exps[i].orgExp}\\b`, 'g'), exps[i].newExp);
         }
         }
         return exp;
         return exp;
     },
     },
@@ -1370,7 +1370,7 @@ let cbParser = {
             }
             }
         }
         }
         for(let i = 0, len = exps.length; i < len; i++){
         for(let i = 0, len = exps.length; i < len; i++){
-            exp = exp.replace(new RegExp(exps[i].orgExp, 'g'), exps[i].newExp);
+            exp = exp.replace(new RegExp(`${exps[i].orgExp}\\b`, 'g'), exps[i].newExp);
         }
         }
         return exp;
         return exp;
     },
     },

+ 1 - 0
web/building_saas/main/js/views/project_view.js

@@ -3122,6 +3122,7 @@ function disableTools(){
     $('a[data-target="#copy-lv"]').remove();
     $('a[data-target="#copy-lv"]').remove();
     $('#standardSelect').prop('disabled', 'disabled');
     $('#standardSelect').prop('disabled', 'disabled');
     $('#cascadeSet').prop('disabled', 'disabled');
     $('#cascadeSet').prop('disabled', 'disabled');
+    $('#changeConfirm').prop('disabled', 'disabled');
     //计算程序标准
     //计算程序标准
     $('#calcProgramFileSelect').prop('disabled', 'disabled');
     $('#calcProgramFileSelect').prop('disabled', 'disabled');
     //调价
     //调价