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

@@ -11,7 +11,7 @@
 <template>
   <div :class="['lb-table', customClass]">
     <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable" :border='border'
-      :row-class-name="tableRowClassName" :show-header='showHeader' @row-dblclick="singleElection" v-bind="$attrs"
+      :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
       <el-table-column width="45" align="center" v-if="isRadio">
@@ -25,7 +25,7 @@
     </el-table>
 
     <el-table v-else ref="elTable" id="heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }"
-      :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-dblclick="singleElection" v-bind="$attrs"
+      :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
       :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
       :span-method="this.merge ? this.mergeMethod : this.spanMethod">
 
@@ -126,6 +126,7 @@
     methods: {
       // 单选
       singleElection (row) {
+        console.log("点击行");
         this.selected = this.data.indexOf(row);
       },
 

+<!--
+ * @Description  :宗地基本信息
+ * @Autor        : miaofang
+ * @LastEditTime : 2023-05-24 15:08:51
+-->
 <template>
   <div class="tableDivCss">
     <table cellpadding="0" cellspacing="0" class="tableCss">
@@ -188,6 +193,10 @@
     },
     methods: {
       loadData () {
+       if(this.propsParam.bsmSldy){
+          console.log("宗地基本信息");
+       }else{
+         console.log("登记簿里宗地基本信息");
           getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
           if (res.code === 200) {
             this.zdjbxx = res.result.zdjbxx;
@@ -198,6 +207,8 @@
           }
         })
        }
+
+      }
     }
   }
 </script>

@@ -27,7 +27,7 @@
     </div>
     <!-- 表格 -->
     <div class="from-clues-content loadingtext">
-      <lb-table ref="table" @row-dblclick="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
+    <lb-table ref="table" @row-click="handleRowClick" :page-size="pageData.pageSize" :calcHeight="300"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
@@ -46,7 +46,7 @@
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import jump from "./mixin/jump";
-  import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
+  import { startBusinessFlow, selectZdjbxx} from "@/api/ywbl.js";
   export default {
     mixins: [table, jump],
     props: {
@@ -61,6 +61,7 @@
           columns: datas.columns(),
           data: [],
         },
+         radioVal: "",
         bdcdysz: [],
         bsmSqyw:
           this.sqywInfo.nodetype === "djlx"
@@ -81,9 +82,23 @@
             let { total, records } = res.result;
             this.tableData.total = total;
             this.tableData.data = records;
+          //   this.tableData.columns.splice(0, 1,{
+          //   label: '选择',
+          //   width: '50px',
+          //   render: (h, scope) => {
+          //     return (
+          //       <div class="orgColumn">
+          //         <el-radio v-model={this.radioVal} label={scope.row.bdcdyh}>
+          //           &ensp;
+          //         </el-radio>
+          //       </div>
+          //     )
+          //   }
+          // })
           }
         });
       },
+
       submitForm () {
         if (this.bdcdysz.length == 0) {
           this.$alert("请至少选择一条数据");
@@ -114,6 +129,7 @@
       handleSelectionChange (val) {
         this.bdcdysz = val;
       },
+
     },
   };
 </script>