31be28cd by renchao@pashanhoo.com

Merge branch 'dev'

2 parents e8653bfd 0d7d3bf0
1 <!-- 1 <!--
2 * @Description :工作台右侧表 2 * @Description :工作台右侧表
3 * @Autor : miaofang 3 * @Autor : miaofang
4 * @LastEditTime: 2023-07-04 13:42:46 4 * @LastEditTime: 2023-07-14 13:19:39
5 --> 5 -->
6 <template> 6 <template>
7 <div class="rightcard"> 7 <div class="rightcard">
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 </div> 13 </div>
14 </div> 14 </div>
15 <div class="card2 cardCon mt-10"> 15 <div class="card2 cardCon mt-10">
16 <div class="cardhead">新建国有房屋信息</div> 16 <div class="cardhead">日上报量统计</div>
17 <Rose /> 17 <Rose />
18 </div> 18 </div>
19 <div class="card3 cardCon mt-10"> 19 <div class="card3 cardCon mt-10">
......
...@@ -68,9 +68,23 @@ class data extends filter { ...@@ -68,9 +68,23 @@ class data extends filter {
68 minWidth: 150, 68 minWidth: 150,
69 }, 69 },
70 { 70 {
71 prop: "createdate", 71 prop: "slsj",
72 label: "创建时间", 72 label: "受理时间",
73 width: 140, 73 width: 140,
74 render: (h, scope) => {
75 if (scope.row.slsj != null && scope.row.slsj != '') {
76 return (
77 <div>
78 {scope.row.slsj.substring(0, 19)}
79 </div>
80 )
81 }
82 return (
83 <div>
84 /
85 </div>
86 )
87 }
74 }, 88 },
75 { 89 {
76 prop: "recflowid", 90 prop: "recflowid",
......
...@@ -44,9 +44,23 @@ class data extends filter { ...@@ -44,9 +44,23 @@ class data extends filter {
44 minWidth: 150, 44 minWidth: 150,
45 }, 45 },
46 { 46 {
47 prop: "createdate", 47 prop: "slsj",
48 label: "创建时间", 48 label: "受理时间",
49 width: 140, 49 width: 140,
50 render: (h, scope) => {
51 if (scope.row.slsj != null && scope.row.slsj != '') {
52 return (
53 <div>
54 {scope.row.slsj.substring(0, 19)}
55 </div>
56 )
57 }
58 return (
59 <div>
60 /
61 </div>
62 )
63 }
50 }, 64 },
51 { 65 {
52 prop: "recflowid", 66 prop: "recflowid",
......