Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2550874a by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents c75cb622 762f710d
Inline Side-by-side
Showing 3 changed files with 5 additions and 10 deletions
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-05-24 15:06:24 4 * @LastEditTime: 2023-08-08 09:36:08
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -43,14 +43,6 @@ class data extends filter { ...@@ -43,14 +43,6 @@ class data extends filter {
43 return <div class='suspend'>异议挂起</div> 43 return <div class='suspend'>异议挂起</div>
44 } 44 }
45 return <div class='allow'>进行中</div> 45 return <div class='allow'>进行中</div>
46 // switch (scope.row.lczt) {
47 // case '1':
48 // return <div class='allow'>进行中</div>
49 // case '2':
50 // return <div class='prohibit'>已结束</div>
51 // case '3':
52 // return <div class='allow'>进行中</div>
53 // }
54 } 46 }
55 }, 47 },
56 { 48 {
...@@ -85,6 +77,7 @@ class data extends filter { ...@@ -85,6 +77,7 @@ class data extends filter {
85 prop: "ywrmc", 77 prop: "ywrmc",
86 label: "义务人", 78 label: "义务人",
87 width: '120', 79 width: '120',
80 showOverflowTooltip: true
88 }, 81 },
89 { 82 {
90 prop: "zl", 83 prop: "zl",
......
...@@ -128,7 +128,8 @@ class data extends filter { ...@@ -128,7 +128,8 @@ class data extends filter {
128 }, 128 },
129 { 129 {
130 label: '操作', 130 label: '操作',
131 width: '110', 131 width: '130',
132 fixed: 'right',
132 render: (h, scope) => { 133 render: (h, scope) => {
133 return ( 134 return (
134 <div> 135 <div>
......
...@@ -39,6 +39,7 @@ class data extends filter { ...@@ -39,6 +39,7 @@ class data extends filter {
39 }, 39 },
40 { 40 {
41 label: "在办环节", 41 label: "在办环节",
42 minWidth: '100',
42 render: (h, scope) => { 43 render: (h, scope) => {
43 if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null)) 44 if ((scope.row.zbhj != '' && scope.row.zbhj != null) || (scope.row.userName != '' && scope.row.userName != null))
44 return ( 45 return (
......