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

public/common_constants.js

@@ -81,7 +81,7 @@
         DAILY_PATROL_FEE: 35,
         // 日常保养费
         DAILY_UPKEEP_FEE: 36,
-        // 信息化系统养护费
+        // 信息化系统w维护费
         INFORMATIZATION_MAINTENANCE_FEE: 37,
         // 技术状况评定费
         TECH_ASSESSMENT_FEE: 38,

web/building_saas/main/js/views/importBills.js

@@ -161,13 +161,10 @@ const importBills = (function(){
         let rst = [];
         let curRoot = null;
         for (let row = 0; row < rowCount; row++) {
-            let code = dataTable[row][colMapping.code] && dataTable[row][colMapping.code].value ? String(dataTable[row][colMapping.code].value) : null,
+            let code = dataTable[row][colMapping.code] && dataTable[row][colMapping.code].value ? String(dataTable[row][colMapping.code].value).trim() : null,
                 name = dataTable[row][colMapping.name] ? dataTable[row][colMapping.name].value : null,
                 unit = dataTable[row][colMapping.unit] ? dataTable[row][colMapping.unit].value : null,
                 quantity = dataTable[row][colMapping.quantity] ? dataTable[row][colMapping.quantity].value : null;
-            if (code === '602') {
-                debugger;
-            }
             if (!code) {    //没有编号的数据，名称必须为:清单 第xx章，认为新的表根节点
                 if (name && /清单 第\d+章/.test(name)) {
                     curRoot = {code: null, name: name, ID: uuid.v1(), ParentID: -1, NextSiblingID: -1, parent: null};