From ac65b2f2c48a3229800830d3810eaa28ffb973cd Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Thu, 30 May 2024 17:43:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E6=8F=90=E5=8D=87=E7=94=A8=E6=88=B7=E4=BD=93?=
 =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E6=8F=90=E9=AB=98=E6=93=8D=E4=BD=9C=E6=95=88?=
 =?UTF-8?q?=E7=8E=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/default/components/header/msg.vue |  6 +++---
 src/views/oa_Deal/index.vue                  | 10 ++++++----
 src/views/oa_Initiate/index.vue              |  1 +
 src/views/oa_message/index.vue               |  4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/layout/default/components/header/msg.vue b/src/layout/default/components/header/msg.vue
index f538a68..d06c87a 100644
--- a/src/layout/default/components/header/msg.vue
+++ b/src/layout/default/components/header/msg.vue
@@ -33,9 +33,9 @@ const getNums = async () => {
 
 }
 
-setInterval(() => {
-    getNums()
-}, 10000);
+// setInterval(() => {
+//     getNums()
+// }, 10000);
 getNums()
 
 </script>
diff --git a/src/views/oa_Deal/index.vue b/src/views/oa_Deal/index.vue
index 703590b..d6f377f 100644
--- a/src/views/oa_Deal/index.vue
+++ b/src/views/oa_Deal/index.vue
@@ -27,7 +27,7 @@
                     <el-table-column label="审批状态" prop="check_status_text" show-overflow-tooltip />
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
-                            <el-button type="primary" link @click="handDetail(row.id)">
+                            <el-button type="primary" link @click="handDetail(row)">
                                 详情
                             </el-button>
                         </template>
@@ -39,7 +39,7 @@
             </div>
         </el-card>
         <detailPopup v-if="showDetail" ref="detailRef" @success="showDetail = false, getLists()"
-            @close="showDetail = false, getLists()" />
+            @close="showDetail = false, getLists()" :typeName="typeName" />
     </div>
 </template>
 
@@ -55,6 +55,7 @@ import { apiOaoaApproveDetail } from "@/api/oa_Initiate"
 const detailRef = ref(null)
 // 是否显示编辑框
 const showDetail = ref(false)
+const typeName = ref('')
 
 
 // 查询条件
@@ -80,8 +81,9 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
     params: queryParams
 })
 
-const handDetail = async (id: any) => {
-    let res = await apiOaoaApproveDetail({ id })
+const handDetail = async (row: any) => {
+    typeName.value = row.type_name
+    let res = await apiOaoaApproveDetail({ id: row.id })
     showDetail.value = true
     await nextTick()
     detailRef.value?.open()
diff --git a/src/views/oa_Initiate/index.vue b/src/views/oa_Initiate/index.vue
index 8363948..1a65b35 100644
--- a/src/views/oa_Initiate/index.vue
+++ b/src/views/oa_Initiate/index.vue
@@ -104,6 +104,7 @@ const handleEdit = async (id: any, cate = '', extend = '') => {
     }
 }
 
+
 const handDetail = async (row: any, data = {}) => {
     typeName.value = row.type_name
     let res = await apiOaoaApproveDetail({ id: row.id })
diff --git a/src/views/oa_message/index.vue b/src/views/oa_message/index.vue
index 78e88b8..dd744b1 100644
--- a/src/views/oa_message/index.vue
+++ b/src/views/oa_message/index.vue
@@ -17,9 +17,9 @@
                     <el-table-column label="消息主题" prop="title" show-overflow-tooltip />
                     <el-table-column label="消息内容" prop="content" show-overflow-tooltip />
                     <el-table-column label="是否已读" prop="is_read" show-overflow-tooltip />
-                    <el-table-column label="阅读时间" prop="read_time" show-overflow-tooltip>
+                    <el-table-column label="阅读时间" show-overflow-tooltip>
                         <template #default="{ row }">
-                            {{ timeFormat(row.read_time, 'yyyy-mm-dd hh:MM') }}
+                            {{ row.read_time == 0 ? '' : timeFormat(row.read_time, 'yyyy-mm-dd hh:MM') }}
                         </template>
 
                     </el-table-column>