Merge branch 'master' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/taicangZongzhi-PC into Lvtianfang

src/views/netManage/workDynamic/index.vue

@@ -84,7 +84,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="区域" align="center" prop="areaId">
         <template slot-scope="scope">
-          <span>{{ scope.row.areaId | filterTown }}</span>
+          {{ $filterTown(JSON.parse(scope.row.areaId)) }}
         </template>
       </el-table-column>
       <el-table-column label="类型" align="center" prop="type" />