Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -18,51 +18,54 @@
     >
       <el-table-column prop="index" width="50" :render-header="renderHeader">
         <template slot-scope="scope">
-          <div style="text-align: center">
-            {{ scope.$index + 1 }}
-          </div>
+          <div style="text-align: center">{{ scope.$index + 1 }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="bdcdyh" label="不动产单元号" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">
-            {{ scope.row.bdcdyh }}
-          </div>
+          <div style="text-align: center">{{ scope.row.bdcdyh }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="xmmc" label="项目名称" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">
-            {{ scope.row.xmmc }}
-          </div>
+          <div style="text-align: center">{{ scope.row.xmmc }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="zcs" label="总层数" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">{{ scope.row.zcs }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="ytmc" label="房屋用途" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">{{ scope.row.ytmc }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="fwjgmc" label="房屋结构" min-width="100">
+        <template slot-scope="scope">
+          <div style="text-align: center">{{ scope.row.fwjgmc }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="jzmj" label="建筑面积" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">
-            {{ scope.row.jzmj }}
-          </div>
+          <div style="text-align: center">{{ scope.row.jzmj }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="ytmc" label="用途名称" min-width="100">
+      <el-table-column prop="jgsj" label="竣工时间" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">
-            {{ scope.row.ytmc }}
-          </div>
+          <div style="text-align: center">{{ scope.row.jgsj }}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="fwjgmc" label="房屋结构名称" min-width="100">
+      <el-table-column prop="zts" label="总套数" min-width="100">
         <template slot-scope="scope">
-          <div style="text-align: center">
-            {{ scope.row.fwjgmc }}
-          </div>
+          <div style="text-align: center">{{ scope.row.zts }}</div>
         </template>
       </el-table-column>
     </el-table>
   </div>
 </template>
 <script>
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
 
 export default {
   computed: {
@@ -84,11 +87,10 @@ export default {
     return {
       // 键名转换，方法默认是label和children进行树状渲染
       key: 0,
-      tableDataList: []
+      tableDataList: [],
     };
   },
-  mounted() {
-  },
+  mounted() {},
   watch: {
     tableData: {
       handler: function (val, oldVal) {
@@ -133,7 +135,7 @@ export default {
           )}
         </div>
       );
-    }
+    },
   },
 };
 </script>

@@ -102,7 +102,6 @@
                 :default-expand-level="1"
                 :show-count="true"
                 :options="dictData['A9']" />
-
             </el-form-item>
           </el-col>
         </el-row>