Merge branch 'dev'

 /*
  * @Description: 
  * @Autor: renchao
- * @LastEditTime: 2023-05-24 15:06:24
+ * @LastEditTime: 2023-08-08 09:36:08
  */
 import filter from '@/utils/filter.js'
 let vm = null
@@ -43,14 +43,6 @@ class data extends filter {
             return <div class='suspend'>异议挂起</div>
           }
           return <div class='allow'>进行中</div>
-          // switch (scope.row.lczt) {
-          //   case '1':
-          //     return <div class='allow'>进行中</div>
-          //   case '2':
-          //     return <div class='prohibit'>已结束</div>
-          //   case '3':
-          //     return <div class='allow'>进行中</div>
-          // }
         }
       },
       {
@@ -85,6 +77,7 @@ class data extends filter {
         prop: "ywrmc",
         label: "义务人",
         width: '120',
+        showOverflowTooltip: true
       },
       {
         prop: "zl",

@@ -128,7 +128,8 @@ class data extends filter {
       },
       {
         label: '操作',
-        width: '110',
+        width: '130',
+        fixed: 'right',
         render: (h, scope) => {
           return (
             <div>

@@ -39,6 +39,7 @@ class data extends filter {
       },
       {
         label: "在办环节",
+        minWidth: '100',
         render: (h, scope) => {
           if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null))
             return (