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

@@ -44,7 +44,7 @@
       <lb-table ref="table"  @row-dblclick="handleRowClick" :pagination = false :page-size="pageData.pageSize" :calcHeight="300"
       <lb-table ref="table"  @row-dblclick="handleRowClick" :pagination = false :page-size="pageData.pageSize" :calcHeight="300"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange"  :column="tableData.columns"
         @p-current-change="handleCurrentChange"  :column="tableData.columns"
-        :data="tableData.data">
+        :data="tableData.data" heightNumSetting :maxHeight="350" :minHeight="350" >
       </lb-table>
       </lb-table>
     </div>
     </div>
     <div class="from-clues-content loadingtext">分割合并后宗地信息
     <div class="from-clues-content loadingtext">分割合并后宗地信息
@@ -85,7 +85,7 @@
         render: (h, scope) => {
         render: (h, scope) => {
           return (
           return (
             <div class="orgColumn">
             <div class="orgColumn">
-              <el-radio v-model={this.radioVal} label={scope.row.bhqkbsm}>
+              <el-radio v-model={this.radioVal} label={scope.row.bsmQlxx}>
                 &ensp;
                 &ensp;
               </el-radio>
               </el-radio>
             </div>
             </div>
@@ -114,18 +114,19 @@
     methods: {
     methods: {
       // 单选事件
       // 单选事件
       close(){
       close(){
-       console.log("ddddd",this.radioVal);
-       console.log("...this.queryForm",this.queryForm);
-       this.queryForm.bhqkbsm=this.radioVal
-        // delete this.queryForm.sqywbm
-          selectZdjbxxSplitMergeLast({ ...this.queryForm,}).then((res) => {
+      this.tableData.data.forEach(e => {
+        if(e.bsmQlxx=this.radioVal){
+           this.queryForm.bhqkbsm=e.bhqkbsm
+          //  获取分割合并后宗地信息
+          selectZdjbxxSplitMergeLast({ ...this.queryForm}).then((res) => {
           this.$endLoading();
           this.$endLoading();
           if (res.code === 200) {
           if (res.code === 200) {
-            let { total, records } = res.result;
-            this.tableData.total = total;
-            this.tableData.datastwo = [...res.result,...res.result];
+            this.tableData.datastwo = res.result;
+          }
+        });
         }
         }
        });
        });
+
       },
       },
       queryClick () {
       queryClick () {
         this.$startLoading();
         this.$startLoading();
@@ -135,7 +136,7 @@
           if (res.code === 200) {
           if (res.code === 200) {
             let { total, records } = res.result;
             let { total, records } = res.result;
             this.tableData.total = total;
             this.tableData.total = total;
-            this.tableData.data = [...res.result,...res.result];
+            this.tableData.data = res.result;
           }
           }
         });
         });
       },
       },
@@ -170,6 +171,7 @@
         val.forEach((item, index) => {
         val.forEach((item, index) => {
           item.bsmSsql = item.bsmQlxx;
           item.bsmSsql = item.bsmQlxx;
           item.ybdcqzsh = item.bdcqzh;
           item.ybdcqzsh = item.bdcqzh;
+          item.bglx="1";
         });
         });
         this.bdcdysz = val;
         this.bdcdysz = val;
       },
       },