Merge branch 'dev'

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-08-29 13:04:44
+ * @LastEditTime: 2023-10-31 08:52:14
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -109,7 +109,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '100',
+        width: '80',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>
@@ -120,8 +121,6 @@ class data extends filter {
       }
     ]
   }
-
-
 }
 let datas = new data()
 export {

@@ -35,6 +35,7 @@ class data extends filter {
       {
         prop: "status",
         label: "状态",
+        width: '120',
         render: (h, scope) => {
           return (
             <div>
@@ -93,8 +94,15 @@ class data extends filter {
         label: "共有情况",
       },
       {
-        prop: "qlrmc",
         label: "权利人",
+        width: '100',
+        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",
@@ -104,6 +112,7 @@ class data extends filter {
       {
         prop: "ywrmc",
         label: "义务人",
+        width: '100',
       },
       {
         prop: "ywrzjhm",
@@ -112,6 +121,7 @@ class data extends filter {
       },
       {
         prop: "qlxzmc",
+        width: '100',
         label: "权利性质",
       },
       {
@@ -121,6 +131,7 @@ class data extends filter {
       {
         prop: "qlytmc",
         label: "用途",
+        width: '100',
       },
       {
         label: "坐落",

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-15 17:25:11
+ * @LastEditTime: 2023-10-31 08:50:23
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -123,8 +123,9 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '110',
+        width: '80',
         align: 'center',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>

 /*
 * @Description: 土地所有权对象处理
 * @Autor: ssq
- * @LastEditTime: 2023-08-29 13:10:12
+ * @LastEditTime: 2023-10-31 08:48:59
 */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -75,12 +75,26 @@ class data extends filter {
         label: "共有方式",
       },
       {
-        prop: "qlrmc",
         label: "使用权人",
+        width: 100,
+        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: 100,
+        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",
@@ -105,7 +119,6 @@ class data extends filter {
         label: '操作',
         width: '80',
         align: 'center',
-        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>

 /*
  * @Description:
  * @Autor: renchao
- * @LastEditTime: 2023-09-07 10:04:33
+ * @LastEditTime: 2023-10-31 08:56:52
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -35,6 +35,7 @@ class data extends filter {
       {
         prop: "status",
         label: "状态",
+        width: '120',
         render: (h, scope) => {
           return (
             <div>
@@ -93,9 +94,15 @@ class data extends filter {
         label: "房屋面积(㎡)",
       },
       {
-        prop: "zl",
         label: "坐落",
-        minWidth: '130'
+        minWidth: '150',
+        render: (h, scope) => {
+          return (
+            <el-tooltip effect="dark" content={scope.row.zl} placement="top" popper-class="tooltip-width ">
+              <span class="ellipsis-table"> {scope.row.zl}</span>
+            </el-tooltip>
+          )
+        }
       },
       {
         label: '操作',

@@ -101,7 +101,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '100',
+        width: '80',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>
@@ -112,8 +113,6 @@ class data extends filter {
       }
     ]
   }
-
-
 }
 let datas = new data()
 export {