Merge branch 'dev'

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-26 15:45:06
+ * @LastEditTime: 2023-10-11 13:56:35
 -->
 <template>
   <div>
@@ -203,7 +203,6 @@
        * @author: renchao
        */
       deleClick (index, row) {
-        debugger
         this.tableDataList.splice(index, 1)
         this.$emit('upDateQlrxxList', this.tableDataList)
       },

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 12:55:07
+ * @LastEditTime: 2023-10-11 10:59:12
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -29,7 +29,7 @@ class data extends filter {
         {
           prop: "bdcqzlx",
           label: "不动产权证类型",
-          width: '130',
+          width: '120',
           render: (h, scope) => {
             return (
               <div>
@@ -40,7 +40,7 @@ class data extends filter {
           }
         },
         {
-           label: "权利类型",
+          label: "权利类型",
           width: '100',
           render: (h, scope) => {
             return (
@@ -58,11 +58,18 @@ class data extends filter {
         {
           prop: "bdcqzh",
           label: "不动产权证号",
-          width: '200',
+          width: '190',
         },
         {
-          prop: "qlr",
-          label: "权利人"
+          label: "权利人",
+          minWidth: '120',
+          render: (h, scope) => {
+            return (
+              <el-tooltip effect="dark" content={scope.row.qlr} placement="top" popper-class="tooltip-width ">
+                <span class="ellipsis-table"> {scope.row.qlr}</span>
+              </el-tooltip>
+            )
+          }
         },
         {
           prop: "ywr",

 <!--
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-02 10:02:57
+ * @LastEditTime: 2023-10-11 14:58:09
 -->
 <template>
   <div class="from-clues">
     <!-- 表单部分 国有建设用地使用权 -->
     <div class="from-clues-header">
-      <el-form :model="queryForm" ref="queryForm" label-width="120px">
+      <el-form :model="queryForm" ref="queryForm" label-width="100px">
         <el-row>
-          <el-col :span="10">
+          <el-col :span="8">
             <el-form-item label="不动产单元号">
-              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width300px">
+              <el-input placeholder="请输入不动产单元号" maxlength="28" v-model="queryForm.bdcdyh" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="坐落">
-              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width300px">
+          <el-col :span="8">
+            <el-form-item label="坐落" label-width="60px">
+              <el-input placeholder="请输入坐落" v-model.trim="queryForm.zl" clearable class="width100">
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4" class="btnColRight">
+          <el-col :span="8" class="btnColRight">
             <el-form-item>
-              <!-- <el-button type="primary" @click="resetForm(true)">重置</el-button> -->
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
           </el-col>

 /*
 * @Description:
 * @Autor: renchao
- * @LastEditTime: 2023-10-10 14:20:14
+ * @LastEditTime: 2023-10-11 11:29:42
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -69,12 +69,26 @@ class data extends filter {
         label: "共有方式",
       },
       {
-        prop: "qlrmc",
         label: "使用权人",
+        width: '105',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrmc} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlrmc}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
-        prop: "qlrzjhm",
         label: "证件号",
+        width: '105',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.qlrzjhm} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.qlrzjhm}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         prop: "qlxzmc",