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

@@ -104,7 +104,11 @@
         </el-table-column>
         <el-table-column
           property="syqmj"
-          label="使用权面积">
+          label="面积">
+        </el-table-column>
+         <el-table-column
+          property="qlytmc"
+          label="用途">
         </el-table-column>
         <el-table-column
           property="zl"
@@ -283,8 +287,8 @@
        */
       handleRowClick (row) {
         this.queryForm.bhqkbsm = row.bhqkbsm
-        this.radioVal = row.bdcdyh
-        row.bglx = '1'
+        //this.radioVal = row.bdcdyh
+        //row.bglx = '1'
         selectZdjbxxSplitMerge({ ...this.queryForm }).then((res) => {
           this.$endLoading();
           if (res.code === 200) {

@@ -81,7 +81,7 @@ class data extends filter {
       },
       {
         prop: "qlmjmc",
-        width: '100',
+        width: 100,
         label: "使用权面积",
       },
       {
@@ -198,7 +198,12 @@ class datatwo extends filter {
       {
         prop: "qlmjmc",
         width: 100,
-        label: "使用权面积",
+        label: "面积",
+      },
+      {
+        prop: "qlytmc",
+        width: 100,
+        label: "用途",
       },
       {
         prop: "zl",