Merge branch 'budget' of http://192.168.1.41:3000/SmartCost/ConstructionCost into budget

web/building_saas/main/js/views/main_tree_col.js

@@ -255,7 +255,7 @@ let MainTreeCol = {
                 if (calcTools.isTitleBills(node)) {
                     return true;
                 }
-                if(node.data.type==billType.DXFY||node.data.type==billType.FB||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、分部、清单父项行，工程量只读。
+                if(node.data.type==billType.DXFY||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、分部、清单父项行，工程量只读。
                     return true;
                 }
             }else if(MainTreeCol.readOnly.glj(node) || OVER_HEIGHT.isOverHeight(node)){

web/building_saas/main/js/views/quantity_edit_view.js

@@ -143,6 +143,7 @@ let quantityEditObj = {
 
     },
     checkingAndUpdate(quantityEXP,node){
+        debugger
         let me = this;
        /* if(quantityEXP === node.data.quantityEXP){ //没有变化，不做任何操作
             projectObj.mainController.refreshTreeNode([node]);
@@ -197,6 +198,7 @@ let quantityEditObj = {
                 let exp = new Expression('');
                 exp.Expression(evalString);
                 value = Number(exp.Evaluate());
+                if(isNaN(value)) throw new Error("输入的表达式有误");
             }
             return value;
         }catch (error){

web/building_saas/pm/js/pm_import.js

@@ -313,7 +313,6 @@ const importView = (() => {
         });
         //下一步
         $('#import-next').click(function () {
-            debugger;
             let file = $('#customFile')[0].files[0];
             if (!file) {
                 showUploadAlert(false, '请选择导入文件。');

web/building_saas/pm/js/pm_newMain.js

@@ -3921,7 +3921,6 @@ function AddTender() {
 
         //let valuation = $("#valuation").val();
         let valuation = curValuation;   //跟建设项目一样的计价规则
-        debugger;
 
         let engineeringName = $("#tender-engineering").val();
         if (!engineeringName || engineeringName === '') {

web/over_write/js/chongqing_2018_import.js

@@ -1606,7 +1606,6 @@ const importXML = (() => {
 
     //从xml文件中提取数据
     async function extractData(file, escape = false) {
-        debugger;
         //将二进制文件转换成字符串
         let xmlStr = await util.readAsTextSync(file);
         if (escape) {