From 7079c85c48050242def8a43eb9a8d37de0fc4655 Mon Sep 17 00:00:00 2001
From: Flow <958079825@qq.com>
Date: Tue, 17 Jun 2025 17:12:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=BB=E5=8F=96=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/doctornotice/index.ts                 |   5 +
 .../vip/doctornotice/DoctornoticeForm.vue     | 209 +++++-------------
 src/views/vip/doctornotice/index.vue          |  44 ++--
 3 files changed, 86 insertions(+), 172 deletions(-)

diff --git a/src/api/doctornotice/index.ts b/src/api/doctornotice/index.ts
index a018a8f99..acd1578a5 100644
--- a/src/api/doctornotice/index.ts
+++ b/src/api/doctornotice/index.ts
@@ -53,4 +53,9 @@ export const DoctornoticeApi = {
   exportDoctornotice: async (params) => {
     return await request.download({ url: `/system/doctornotice/export-excel`, params })
   },
+
+  // 根据用户ID查询更新读取状态
+  updateReadStatus: async (userid: number, readstatus: number) => {
+    return await request.get({ url: `/system/doctornotice/updateReadStatus?userid=` + userid + '&readstatus=' + readstatus })
+  },
 }
diff --git a/src/views/vip/doctornotice/DoctornoticeForm.vue b/src/views/vip/doctornotice/DoctornoticeForm.vue
index 78f9fb203..0c15dd0aa 100644
--- a/src/views/vip/doctornotice/DoctornoticeForm.vue
+++ b/src/views/vip/doctornotice/DoctornoticeForm.vue
@@ -1,105 +1,46 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
-      ref="formRef"
-      :model="formData"
-      :rules="formRules"
-      label-width="100px"
-      v-loading="formLoading"
-    >
-      <el-form-item label="设备ID" prop="deviceid">
-        <el-input v-model="formData.deviceid" placeholder="请输入设备ID" />
-      </el-form-item>
-      <el-form-item label="接收通知的用户ID" prop="userid">
-        <el-input v-model="formData.userid" placeholder="请输入接收通知的用户ID" />
-      </el-form-item>
-      <el-form-item label="发送通知的医生ID" prop="doctorid">
-        <el-input v-model="formData.doctorid" placeholder="请输入发送通知的医生ID" />
-      </el-form-item>
-      <el-form-item label="发送时间" prop="datatime">
-        <el-date-picker
-          v-model="formData.datatime"
-          type="date"
-          value-format="x"
-          placeholder="选择发送时间"
-        />
-      </el-form-item>
-      <el-form-item label="通知类型(1:异常提醒,2:建议提醒,3:复查提醒)" prop="noticetype">
-        <el-select v-model="formData.noticetype" placeholder="请选择通知类型(1:异常提醒,2:建议提醒,3:复查提醒)">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="通知标题" prop="noticetitle">
-        <el-input v-model="formData.noticetitle" placeholder="请输入通知标题" />
-      </el-form-item>
-      <el-form-item label="通知内容" prop="noticecontent">
-        <Editor v-model="formData.noticecontent" height="150px" />
-      </el-form-item>
-      <el-form-item label="通知级别(1:普通,2:重要,3:紧急)" prop="noticelevel">
-        <el-input v-model="formData.noticelevel" placeholder="请输入通知级别(1:普通,2:重要,3:紧急)" />
-      </el-form-item>
-      <el-form-item label="读取状态(0:未读,1:已读)" prop="readstatus">
-        <el-radio-group v-model="formData.readstatus">
-          <el-radio value="1">请选择字典生成</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="读取时间" prop="readtime">
-        <el-date-picker
-          v-model="formData.readtime"
-          type="date"
-          value-format="x"
-          placeholder="选择读取时间"
-        />
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-date-picker
-          v-model="formData.createtime"
-          type="date"
-          value-format="x"
-          placeholder="选择创建时间"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatetime">
-        <el-date-picker
-          v-model="formData.updatetime"
-          type="date"
-          value-format="x"
-          placeholder="选择更新时间"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createby">
-        <el-input v-model="formData.createby" placeholder="请输入创建人" />
-      </el-form-item>
-      <el-form-item label="更新人" prop="updateby">
-        <el-input v-model="formData.updateby" placeholder="请输入更新人" />
-      </el-form-item>
-      <el-form-item label="是否删除(0:未删除,1:已删除)" prop="isdeleted">
-        <el-input v-model="formData.isdeleted" placeholder="请输入是否删除(0:未删除,1:已删除)" />
-      </el-form-item>
-    </el-form>
+  <Dialog title="通知详情" v-model="dialogVisible" @close="handleClose">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="设备ID">{{ formData.deviceid }}</el-descriptions-item>
+      <el-descriptions-item label="用户ID">{{ formData.userid }}</el-descriptions-item>
+      <el-descriptions-item label="用户姓名">{{ formData.username }}</el-descriptions-item>
+      <el-descriptions-item label="医生ID">{{ formData.doctorid }}</el-descriptions-item>
+      <el-descriptions-item label="发送时间">{{ formatTime(formData.datatime) }}</el-descriptions-item>
+      <el-descriptions-item label="通知类型">
+        {{ formData.noticetype === 1 ? '异常提醒' : formData.noticetype === 2 ? '建议提醒' : '复查提醒' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="通知标题">{{ formData.noticetitle }}</el-descriptions-item>
+      <el-descriptions-item label="通知内容">{{ formData.noticecontent }}</el-descriptions-item>
+      <el-descriptions-item label="通知级别">
+        {{ formData.noticelevel === 1 ? '普通' : formData.noticelevel === 2 ? '重要' : '紧急' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="读取状态">
+        {{ formData.readstatus === 0 ? '未读' : '已读' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="读取时间">{{ formatTime(formData.readtime) }}</el-descriptions-item>
+      <el-descriptions-item label="创建时间">{{ formatTime(formData.createtime) }}</el-descriptions-item>
+      <el-descriptions-item label="更新时间">{{ formatTime(formData.updatetime) }}</el-descriptions-item>
+      <el-descriptions-item label="创建人">{{ formData.createby }}</el-descriptions-item>
+    </el-descriptions>
     <template #footer>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button @click="dialogVisible = false">关 闭</el-button>
     </template>
   </Dialog>
 </template>
+
 <script setup lang="ts">
-import { DoctornoticeApi, DoctornoticeVO } from '@/api/doctornotice'
+import { DoctornoticeApi } from '@/api/doctornotice'
+import dayjs from 'dayjs'
 
 /** 医生通知 表单 */
 defineOptions({ name: 'DoctornoticeForm' })
 
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
 const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   deviceid: undefined,
-  userid: undefined,
+  userid: 0,
+  username: undefined,
   doctorid: undefined,
   datatime: undefined,
   noticetype: undefined,
@@ -112,83 +53,37 @@ const formData = ref({
   updatetime: undefined,
   createby: undefined,
   updateby: undefined,
-  isdeleted: undefined,
 })
-const formRules = reactive({
-  deviceid: [{ required: true, message: '设备ID不能为空', trigger: 'blur' }],
-  userid: [{ required: true, message: '接收通知的用户ID不能为空', trigger: 'blur' }],
-  doctorid: [{ required: true, message: '发送通知的医生ID不能为空', trigger: 'blur' }],
-  datatime: [{ required: true, message: '发送时间不能为空', trigger: 'blur' }],
-  noticetype: [{ required: true, message: '通知类型(1:异常提醒,2:建议提醒,3:复查提醒)不能为空', trigger: 'change' }],
-  noticetitle: [{ required: true, message: '通知标题不能为空', trigger: 'blur' }],
-  noticecontent: [{ required: true, message: '通知内容不能为空', trigger: 'blur' }],
-  createtime: [{ required: true, message: '创建时间不能为空', trigger: 'blur' }],
-  updatetime: [{ required: true, message: '更新时间不能为空', trigger: 'blur' }],
-})
-const formRef = ref() // 表单 Ref
+
+/** 格式化时间 */
+const formatTime = (timestamp: number | undefined) => {
+  if (!timestamp) return ''
+  return dayjs(timestamp).format('YYYY-MM-DD HH:mm:ss')
+}
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (id: number) => {
   dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
-  formType.value = type
-  resetForm()
-  // 修改时，设置数据
-  if (id) {
-    formLoading.value = true
-    try {
-      formData.value = await DoctornoticeApi.getDoctornotice(id)
-    } finally {
-      formLoading.value = false
-    }
-  }
-}
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  await formRef.value.validate()
-  // 提交请求
-  formLoading.value = true
   try {
-    const data = formData.value as unknown as DoctornoticeVO
-    if (formType.value === 'create') {
-      await DoctornoticeApi.createDoctornotice(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await DoctornoticeApi.updateDoctornotice(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
+    formData.value = await DoctornoticeApi.getDoctornotice(id)
+  } catch (error) {
+    console.error('获取通知详情失败:', error)
   }
 }
 
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    deviceid: undefined,
-    userid: undefined,
-    doctorid: undefined,
-    datatime: undefined,
-    noticetype: undefined,
-    noticetitle: undefined,
-    noticecontent: undefined,
-    noticelevel: undefined,
-    readstatus: undefined,
-    readtime: undefined,
-    createtime: undefined,
-    updatetime: undefined,
-    createby: undefined,
-    updateby: undefined,
-    isdeleted: undefined,
+/** 关闭弹窗时更新读取状态 */
+const handleClose = async () => {
+  if (formData.value.id && formData.value.readstatus === 0) {
+    try {
+      await DoctornoticeApi.updateReadStatus(formData.value.userid, 1)
+      // 触发父组件刷新列表
+      emit('success')
+    } catch (error) {
+      console.error('更新读取状态失败:', error)
+    }
   }
-  formRef.value?.resetFields()
 }
+
+const emit = defineEmits(['success'])
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 </script>
\ No newline at end of file
diff --git a/src/views/vip/doctornotice/index.vue b/src/views/vip/doctornotice/index.vue
index 3ee40d3c8..82e813fe2 100644
--- a/src/views/vip/doctornotice/index.vue
+++ b/src/views/vip/doctornotice/index.vue
@@ -10,17 +10,22 @@ v-model="queryParams.datatime" value-format="YYYY-MM-DD HH:mm:ss" type="daterang
       </el-form-item>
       <el-form-item label="通知类型" prop="noticetype">
         <el-select v-model="queryParams.noticetype" placeholder="请选择通知类型" clearable class="!w-240px">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="异常提醒" :value="1" />
+          <el-option label="建议提醒" :value="2" />
+          <el-option label="复查提醒" :value="3" />
         </el-select>
       </el-form-item>
       <el-form-item label="通知级别" prop="noticelevel">
         <el-select v-model="queryParams.noticelevel" placeholder="请选择通知级别" clearable class="!w-240px">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="普通" :value="1" />
+          <el-option label="重要" :value="2" />
+          <el-option label="紧急" :value="3" />
         </el-select>
       </el-form-item>
       <el-form-item label="读取状态" prop="readstatus">
         <el-select v-model="queryParams.readstatus" placeholder="请选择读取状态" clearable class="!w-240px">
-          <el-option label="请选择字典生成" value="" />
+          <el-option label="未读" :value="0" />
+          <el-option label="已读" :value="1" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -46,21 +51,30 @@ type="success" plain @click="handleExport" :loading="exportLoading"
       <el-table-column label="用户ID" align="center" prop="userid" />
       <el-table-column label="用户姓名" align="center" prop="username" />
       <el-table-column label="发送时间" align="center" prop="datatime" :formatter="dateFormatter" width="180px" />
-      <el-table-column label="通知类型" align="center" prop="noticetype" />
+      <el-table-column label="通知类型" align="center" prop="noticetype">
+        <template #default="scope">
+          {{ scope.row.noticetype === 1 ? '异常提醒' : scope.row.noticetype === 2 ? '建议提醒' : '复查提醒' }}
+        </template>
+      </el-table-column>
       <el-table-column label="通知标题" align="center" prop="noticetitle" />
       <el-table-column label="通知内容" align="center" prop="noticecontent" />
-      <el-table-column label="通知级别" align="center" prop="noticelevel" />
-      <el-table-column label="读取状态" align="center" prop="readstatus" />
+      <el-table-column label="通知级别" align="center" prop="noticelevel">
+        <template #default="scope">
+          {{ scope.row.noticelevel === 1 ? '普通' : scope.row.noticelevel === 2 ? '重要' : '紧急' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="读取状态" align="center" prop="readstatus">
+        <template #default="scope">
+          <el-tag :type="scope.row.readstatus === 0 ? 'danger' : 'success'">
+            {{ scope.row.readstatus === 0 ? '未读' : '已读' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createtime" :formatter="dateFormatter" width="180px" />
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
-          <el-button
-link type="primary" @click="openForm('update', scope.row.id)"
-            v-hasPermi="['system:doctornotice:update']">
-            编辑
-          </el-button>
-          <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['system:doctornotice:delete']">
-            删除
+          <el-button link type="primary" @click="openForm(scope.row.id)">
+            查看
           </el-button>
         </template>
       </el-table-column>
@@ -144,8 +158,8 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (id: number) => {
+  formRef.value.open(id)
 }
 
 /** 删除按钮操作 */