Merge remote-tracking branch 'origin/master'

@@ -186,11 +186,11 @@
         created() {
         created() {
         },
         },
         methods: {
         methods: {
-            currentChange: function (val) {
+            currentChange(val) {
                 this.queryData.pageNo = val;
                 this.queryData.pageNo = val;
                 this.getData(this.queryData);
                 this.getData(this.queryData);
             },
             },
-            reset: function () {
+            reset(){
                 this.queryData = {
                 this.queryData = {
                     bdcdyh: "",
                     bdcdyh: "",
                     bdcqzh: "",
                     bdcqzh: "",
@@ -204,23 +204,23 @@
                 };
                 };
                 this.getData(this.queryData)
                 this.getData(this.queryData)
             },
             },
-            getData: function (data) {
+            getData(data){
                 data['dylxs'] = this.dylxs;
                 data['dylxs'] = this.dylxs;
                 getSearchList(data).then(res => {
                 getSearchList(data).then(res => {
                     this.Data = res.result.records
                     this.Data = res.result.records
                     this.total = res.result.total;
                     this.total = res.result.total;
                 })
                 })
             },
             },
-            search: function () {
+            search(){
                 this.getData(this.queryData)
                 this.getData(this.queryData)
             },
             },
-            addData: function (val) {
+            addData(val){
                 this.$emit("getData", val)
                 this.$emit("getData", val)
                 if (this.isZdClose) {
                 if (this.isZdClose) {
                     this.close();
                     this.close();
                 }
                 }
             },
             },
-            close: function () {
+            close(){
                 this.$emit('close')
                 this.$emit('close')
                 this.reset();
                 this.reset();
             }
             }

@@ -756,4 +756,7 @@
         color: blue;
         color: blue;
         text-decoration: underline;
         text-decoration: underline;
     }
     }
+    /deep/ .el-select {
+        width: 100%;
+    }   
 </style>
 </style>

@@ -34,9 +34,25 @@
                 label="房屋结构">
                 label="房屋结构">
         </el-table-column>
         </el-table-column>
       <el-table-column
       <el-table-column
-              prop="mj"
+              prop="jzmj"
               label="面积">
               label="面积">
       </el-table-column>
       </el-table-column>
+        <el-table-column
+                prop="tnjzmj"
+                label="套内建筑面积">
+        </el-table-column>
+        <el-table-column
+                prop="ftjzmj"
+                label="分摊建筑面积">
+        </el-table-column>
+        <el-table-column
+                prop="dxbfjzmj"
+                label="地下部分建筑面积">
+        </el-table-column>
+        <el-table-column
+                prop="qtjzmj"
+                label="其它建筑面积">
+        </el-table-column>
     </el-table>
     </el-table>
   </div>
   </div>
 </template>
 </template>