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

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

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

@@ -27,7 +27,7 @@
     </div>
     </div>
     <!-- 表格 -->
     <!-- 表格 -->
     <div class="from-clues-content loadingtext">
     <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"
         :current-page.sync="pageData.currentPage" :total="tableData.total" @size-change="handleSizeChange"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         @p-current-change="handleCurrentChange" @selection-change="handleSelectionChange" :column="tableData.columns"
         :data="tableData.data">
         :data="tableData.data">
@@ -46,7 +46,7 @@
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import { defaultParameters } from "../javascript/publicDefaultPar.js";
   import table from "@/utils/mixin/table";
   import table from "@/utils/mixin/table";
   import jump from "./mixin/jump";
   import jump from "./mixin/jump";
-  import { startBusinessFlow, selectZdjbxx } from "@/api/ywbl.js";
+  import { startBusinessFlow, selectZdjbxx} from "@/api/ywbl.js";
   export default {
   export default {
     mixins: [table, jump],
     mixins: [table, jump],
     props: {
     props: {
@@ -56,11 +56,12 @@
     data () {
     data () {
       return {
       return {
         queryForm: defaultParameters.defaultParameters(),
         queryForm: defaultParameters.defaultParameters(),
-        tableData: {
+         tableData: {
           total: 0,
           total: 0,
           columns: datas.columns(),
           columns: datas.columns(),
           data: [],
           data: [],
         },
         },
+         radioVal: "",
         bdcdysz: [],
         bdcdysz: [],
         bsmSqyw:
         bsmSqyw:
           this.sqywInfo.nodetype === "djlx"
           this.sqywInfo.nodetype === "djlx"
@@ -81,9 +82,23 @@
             let { total, records } = res.result;
             let { total, records } = res.result;
             this.tableData.total = total;
             this.tableData.total = total;
             this.tableData.data = records;
             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 () {
       submitForm () {
         if (this.bdcdysz.length == 0) {
         if (this.bdcdysz.length == 0) {
           this.$alert("请至少选择一条数据");
           this.$alert("请至少选择一条数据");
@@ -114,6 +129,7 @@
       handleSelectionChange (val) {
       handleSelectionChange (val) {
         this.bdcdysz = val;
         this.bdcdysz = val;
       },
       },
+
     },
     },
   };
   };
 </script>
 </script>