Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-16 14:02:08
+ * @LastEditTime: 2024-01-17 10:00:41
 -->
 <template>
   <div class="from-clues">

@@ -92,7 +92,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -135,7 +135,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+              <el-button type="text" icon="el-icon-film" onClick={(event) => { event.stopPropagation(); vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
             </div>
           )
         }

@@ -152,7 +152,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -130,7 +130,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-11-14 14:15:21
+ * @LastEditTime: 2024-01-17 09:59:04
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -129,7 +129,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-10-18 15:03:39
+ * @LastEditTime: 2024-01-17 10:02:13
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -104,7 +104,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+              <el-button type="text" icon="el-icon-film" onClick={(event) => { event.stopPropagation(); vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
             </div>
           )
         }

 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-10-11 11:29:42
+ * @LastEditTime: 2024-01-17 09:44:35
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -128,8 +128,8 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
-            </div>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
+            </div >
           )
         }
       },

@@ -101,7 +101,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -100,7 +100,7 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '150'
-      },{
+      }, {
         label: '操作',
         width: '80',
         align: 'center',
@@ -108,7 +108,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -95,7 +95,7 @@ class data extends filter {
         prop: "zl",
         label: "坐落",
         minWidth: '110'
-      },{
+      }, {
         label: '操作',
         width: '80',
         align: 'center',
@@ -103,7 +103,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -122,7 +122,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -112,7 +112,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -106,7 +106,7 @@ class data extends filter {
         render: (h, scope) => {
           return (
             <div>
-              <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openBook(scope.row) }}>登记薄</el-button>
+              <el-button type="text" icon="el-icon-edit-outline" onClick={(event) => { event.stopPropagation(); vm.openBook(scope.row) }}>登记薄</el-button>
             </div>
           )
         }

@@ -143,7 +143,7 @@ class data extends filter {
           return (
             <div>
               <el-button type="text" icon="el-icon-edit-outline" onClick={() => { vm.openDialog(scope.row) }}>登记薄</el-button>
-              <el-button type="text" icon="el-icon-film" onClick={() => { vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
+              <el-button type="text" icon="el-icon-film" onClick={(event) => { event.stopPropagation(); vm.handleLpbClick(scope.row) }}>楼盘表</el-button>
             </div>
           )
         }