b50041c9 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents e0ff8a24 d5523614
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-16 14:10:35 4 * @LastEditTime: 2024-03-13 10:33:28
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
61 label="选择" 61 label="选择"
62 width="50"> 62 width="50">
63 <template slot-scope="scope"> 63 <template slot-scope="scope">
64 <el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bdcdyh">{{''}}</el-radio> 64 <el-radio v-model="radioVal" @change="handleSelect" @click.native.stop :label="scope.row.bhqkbsm">{{''}}</el-radio>
65 </template> 65 </template>
66 </el-table-column> 66 </el-table-column>
67 <el-table-column 67 <el-table-column
...@@ -100,6 +100,7 @@ ...@@ -100,6 +100,7 @@
100 </el-table-column> 100 </el-table-column>
101 <el-table-column 101 <el-table-column
102 property="qlrmc" 102 property="qlrmc"
103 width="160"
103 label="权利人"> 104 label="权利人">
104 </el-table-column> 105 </el-table-column>
105 <el-table-column 106 <el-table-column
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
129 <el-table-column 130 <el-table-column
130 label="操作" 131 label="操作"
131 fixed="right" 132 fixed="right"
132 width="80"> 133 width="60">
133 <template slot-scope="scope"> 134 <template slot-scope="scope">
134 <el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button> 135 <el-button type="text" icon="el-icon-edit-outline" @click="openBook(scope.row)">登记薄</el-button>
135 </template> 136 </template>
...@@ -301,11 +302,12 @@ ...@@ -301,11 +302,12 @@
301 * @author: renchao 302 * @author: renchao
302 */ 303 */
303 handleRowClick (row) { 304 handleRowClick (row) {
304 this.queryForm.bhqkbsm = row.bhqkbsm 305 this.radioVal = row.bhqkbsm
306 this.queryForm.bhqkbsm = row.bhqkbsm
305 selectHSplitMerge({ ...this.queryForm }).then((res) => { 307 selectHSplitMerge({ ...this.queryForm }).then((res) => {
306 this.$endLoading(); 308 this.$endLoading();
307 if (res.code === 200) { 309 if (res.code === 200) {
308 this.tableData.datastwo = res.result; 310 this.tableData.datastwo = res.result;
309 this.bdcdysz = this.tableData.datastwo 311 this.bdcdysz = this.tableData.datastwo
310 } 312 }
311 }) 313 })
......