Merge branch 'dev'

 <!--
  * @Description  :工作台右侧表
  * @Autor        : miaofang
- * @LastEditTime: 2023-07-04 13:42:46
+ * @LastEditTime: 2023-07-14 13:19:39
 -->
 <template>
   <div class="rightcard">
@@ -13,7 +13,7 @@
       </div>
     </div>
     <div class="card2 cardCon mt-10">
-      <div class="cardhead">新建国有房屋信息</div>
+      <div class="cardhead">日上报量统计</div>
       <Rose />
     </div>
     <div class="card3 cardCon mt-10">

@@ -68,9 +68,23 @@ class data extends filter {
         minWidth: 150,
       },
       {
-        prop: "createdate",
-        label: "创建时间",
+        prop: "slsj",
+        label: "受理时间",
         width: 140,
+        render: (h, scope) => {
+          if (scope.row.slsj != null && scope.row.slsj != '') {
+            return (
+              <div>
+                {scope.row.slsj.substring(0, 19)}
+              </div>
+            )
+          }
+          return (
+            <div>
+              /
+            </div>
+          )
+        }
       },
       {
         prop: "recflowid",

@@ -44,9 +44,23 @@ class data extends filter {
         minWidth: 150,
       },
       {
-        prop: "createdate",
-        label: "创建时间",
+        prop: "slsj",
+        label: "受理时间",
         width: 140,
+        render: (h, scope) => {
+          if (scope.row.slsj != null && scope.row.slsj != '') {
+            return (
+              <div>
+                {scope.row.slsj.substring(0, 19)}
+              </div>
+            )
+          }
+          return (
+            <div>
+              /
+            </div>
+          )
+        }
       },
       {
         prop: "recflowid",