1

src/views/customerManagement/numberManagement/index.vue

@@ -58,7 +58,7 @@
       <el-col :span="24" style="margin-top: 20px">
         <el-button size="small" class="ch-button" style="float: right; margin-top: 4px" @click="downLoad"><i class="el-icon-menu" />&nbsp;选房通知单</el-button>
         <el-button size="small" class="ch-button-danger" style="float: right; margin-top: 4px;margin-right: 10px;" @click="handleDelete"><i class="el-icon-menu" />&nbsp;删除</el-button>
-        <el-button disabled size="small" class="ch-button-export" style="float: right;margin-top: 4px" @click="batchImport()"><i class="el-icon-menu" />&nbsp;批量导入</el-button>
+        <el-button size="small" class="ch-button-export" style="float: right;margin-top: 4px" @click="batchImport()"><i class="el-icon-menu" />&nbsp;批量导入</el-button>
         <el-button size="small" class="ch-button-add" style="float: right; margin-right: 10px; margin-top: 4px" @click="handleAdd()"><i class="el-icon-menu" />&nbsp;新增</el-button>
         <el-button size="small" class="ch-button" style="float: right; margin-top: 4px" @click="handleSearch()"><i class="el-icon-menu" />&nbsp;查询</el-button>
         <el-button size="small" class="ch-button-warning" style="float: right;margin-top: 4px" @click="handleReset()"><i class="el-icon-menu" />&nbsp;重置</el-button>

src/views/parkAssets/component/uploadCost.vue

@@ -772,10 +772,11 @@ export default {
             document.body.removeChild(elink)
         },
         getItemJson(item) {
-            item.groupNameStr = item.groupName.replace('{', '').replace('}', '')
-            item.discNameStr = item.discName ? item.discName.replace('{', '').replace('}', '') : ''
-            item.buildNumStr = item.buildNum ? item.buildNum.replace('{', '').replace('}', '') : ''
-            item.roomNoStr = item.roomNo ? item.roomNo.replace('{', '').replace('}', '') : ''
+            item.groupNameStr = item.groupName ? item.groupName.replace('{', '')
+                .replace('}', '').replace('null', '') : ''
+            item.discNameStr = item.discName ? item.discName.replace('{', '').replace('}', '').replace('null', '') : ''
+            item.buildNumStr = item.buildNum ? item.buildNum.replace('{', '').replace('}', '').replace('null', '') : ''
+            item.roomNoStr = item.roomNo ? item.roomNo.replace('{', '').replace('}', '').replace('null', '') : ''
             return item
         }
     }