sc

cj

src/api/clue/settle.js

@@ -24,3 +24,8 @@ export const getMallSettleDetail = async (id) => {
 export const batchSaveSettle = async (data) => {
   return await request.post({ url: '/admin-api/crm/sign-settlement/batch/save', data })
 }
+
+// 修改结算
+export const updateSettle = async (data) => {
+  return await request.post({ url: '/admin-api/crm/sign-settlement/update/money', data })
+}

src/api/login/index.ts

@@ -71,3 +71,10 @@ export const getAppInfo = (instanceId: number) => {
     url: '/admin-api/system/serviceInstance/getInstanceInfo?instanceId=' + instanceId
   })
 }
+
+export const bindWx = (data: any) => {
+  return request.post({
+    url: '/admin-api/system/user/bind/wx',
+    data
+  })
+}

src/api/system/notify/message/index.ts

@@ -1,5 +1,4 @@
 import request from '@/config/axios'
-import qs from 'qs'
 
 export interface NotifyMessageVO {
   id: number
@@ -16,35 +15,39 @@ export interface NotifyMessageVO {
 }
 
 // 查询站内信消息列表
-export const getNotifyMessagePage = async (params: PageParam) => {
+export const getNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/page', params })
 }
 
 // 获得我的站内信分页
-export const getMyNotifyMessagePage = async (params: PageParam) => {
+export const getMyNotifyMessagePage = async (params: any) => {
   return await request.get({ url: '/admin-api/system/notify-message/my-page', params })
 }
 
 // 批量标记已读
-export const updateNotifyMessageRead = async (ids) => {
+export const updateNotifyMessageRead = async (data: any) => {
   return await request.put({
-    url:
+    url: '/admin-api/system/notify-message/update-read?',
-      '/admin-api/system/notify-message/update-read?' +
+    data
-      qs.stringify({ ids: ids }, { indices: false })
   })
 }
 
 // 标记所有站内信为已读
-export const updateAllNotifyMessageRead = async () => {
+export const updateAllNotifyMessageRead = async (data: any) => {
-  return await request.put({ url: '/admin-api/system/notify-message/update-all-read' })
+  return await request.put({ url: '/admin-api/system/notify-message/update-all-read', data })
 }
 
 // 获取当前用户的最新站内信列表
-export const getUnreadNotifyMessageList = async () => {
+export const getUnreadNotifyMessageList = async (params: any) => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list' })
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-list', params })
 }
 
 // 获得当前用户的未读站内信数量
-export const getUnreadNotifyMessageCount = async () => {
+export const getUnreadNotifyMessageCount = async (params: any) => {
-  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count' })
+  return await request.get({ url: '/admin-api/system/notify-message/get-unread-count', params })
+}
+
+// 获取详情
+export const getNotifyMessageDetail = async (id: number) => {
+  return await request.get({ url: '/admin-api/system/notify-message/get', params: { id } })
 }

src/config/axios/service.ts

@@ -205,6 +205,8 @@ service.interceptors.response.use(
       if (msg === '无效的刷新令牌') {
         // hard coding：忽略这个提示，直接登出
         console.log(msg)
+      } else if (code == 18888) {
+        return { data }
       } else {
         ElNotification.error({ title: msg })
         if (code == 403) {

src/layout/components/Message/src/Message.vue

@@ -1,6 +1,9 @@
 <script lang="ts" name="Message" setup>
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
+import { useUserStore } from '@/store/modules/user'
+
+const userStore = useUserStore()
 
 const { push } = useRouter()
 const activeName = ref('notice')
@@ -9,16 +12,21 @@ const list = ref<any[]>([]) // 消息列表
 
 // 获得消息列表
 const getList = async () => {
-  list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
+  const data = await NotifyMessageApi.getUnreadNotifyMessageList({
+    roleId: userStore.getUser?.currentRole
+  })
+  list.value = data.list
   // 强制设置 unreadCount 为 0，避免小红点因为轮询太慢，不消除
   unreadCount.value = 0
 }
 
 // 获得未读消息数
 const getUnreadCount = async () => {
-  NotifyMessageApi.getUnreadNotifyMessageCount().then((data) => {
+  NotifyMessageApi.getUnreadNotifyMessageCount({ roleId: userStore.getUser?.currentRole }).then(
-    unreadCount.value = data
+    (data) => {
-  })
+      unreadCount.value = data
+    }
+  )
 }
 
 // 跳转我的站内信
@@ -34,9 +42,9 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  // msgInterval.value = setInterval(() => {
+  msgInterval.value = setInterval(() => {
-  //   getUnreadCount()
+    getUnreadCount()
-  // }, 1000 * 60 * 2)
+  }, 1000 * 60 * 2)
 })
 
 onUnmounted(() => {
@@ -56,10 +64,9 @@ onUnmounted(() => {
           <div class="message-list">
             <template v-for="item in list" :key="item.id">
               <div class="message-item">
-                <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
                 <div class="message-content">
                   <span class="message-title">
-                    {{ item.templateNickname }}：{{ item.templateContent }}
+                    {{ item.title }}
                   </span>
                   <span class="message-date">
                     {{ formatDate(item.createTime) }}
@@ -94,7 +101,7 @@ onUnmounted(() => {
   .message-item {
     display: flex;
     align-items: center;
-    padding: 20px 0;
+    padding: 5px 0;
     border-bottom: 1px solid var(--el-border-color-light);
 
     &:last-child {
@@ -113,6 +120,7 @@ onUnmounted(() => {
 
       .message-title {
         margin-bottom: 5px;
+        font-weight: bold;
       }
 
       .message-date {

src/permission.js

@@ -17,6 +17,7 @@ const { loadStart, loadDone } = usePageLoading()
 const whiteList = [
   '/login',
   '/mp-login',
+  '/nm-detail',
   '/social-login',
   '/auth-redirect',
   '/bind',

src/router/modules/remaining.ts

@@ -181,6 +181,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/nm-detail',
+    component: () => import('@/views/Profile/NotifyMessageDetail.vue'),
+    name: 'NMDetail',
+    meta: {
+      hidden: true,
+      title: '通知详情',
+      noTagsView: true
+    }
+  },
   {
     path: '/403',
     component: () => import('@/views/Error/403.vue'),

src/store/modules/user.ts

@@ -9,6 +9,7 @@ interface UserVO {
   id: number
   avatar: string
   nickname: string
+  currentRole: number
 }
 interface UserInfoVO {
   permissions: string[]
@@ -25,7 +26,8 @@ export const useUserStore = defineStore('admin-user', {
     user: {
       id: 0,
       avatar: '',
-      nickname: ''
+      nickname: '',
+      currentRole: 0
     }
   }),
   getters: {
@@ -72,7 +74,8 @@ export const useUserStore = defineStore('admin-user', {
       this.user = {
         id: 0,
         avatar: '',
-        nickname: ''
+        nickname: '',
+        currentRole: 0
       }
     },
     refresh() {

src/views/Basic/Dept/index.vue

@@ -23,7 +23,11 @@
     <el-table-column prop="name" label="部门名称" />
     <el-table-column prop="leader" label="负责人" width="120" />
     <el-table-column prop="sort" label="排序" width="200" />
-    <el-table-column prop="status" label="状态" width="100" />
+    <el-table-column prop="status" label="状态" width="100">
+      <template #default="{ row }">
+        {{ ['启用', '禁用'][row.status] }}
+      </template>
+    </el-table-column>
     <el-table-column label="创建时间" prop="createTime" width="180" :formatter="dateFormatter" />
     <el-table-column label="操作" class-name="fixed-width" width="240">
       <template #default="scope">

src/views/Basic/Role/Comp/ReportDaily.vue

@@ -3,8 +3,8 @@
     <el-form :model="form" ref="formRef" :rules="rules" label-width="auto" v-loading="formLoading">
       <el-form-item label="开启通知">
         <el-radio-group v-model="form.status">
-          <el-radio :label="1"> 开启 </el-radio>
+          <el-radio :label="0"> 开启 </el-radio>
-          <el-radio :label="0"> 关闭 </el-radio>
+          <el-radio :label="1"> 关闭 </el-radio>
         </el-radio-group>
       </el-form-item>
 

src/views/Basic/User/DeptTree.vue

@@ -1,11 +1,4 @@
 <template>
-  <div class="head-container">
-    <el-input v-model="deptName" class="mb-20px" clearable placeholder="请输入部门名称">
-      <template #prefix>
-        <Icon icon="ep:search" />
-      </template>
-    </el-input>
-  </div>
   <div class="head-container">
     <el-tree
       ref="treeRef"
@@ -26,7 +19,6 @@ import { ElTree } from 'element-plus'
 import * as DeptApi from '@/api/system/dept'
 import { defaultProps, handleTree } from '@/utils/tree'
 
-const deptName = ref('')
 const deptList = ref<Tree[]>([]) // 树形结构
 const treeRef = ref<InstanceType<typeof ElTree>>()
 

src/views/Basic/User/UserForm.vue

@@ -139,7 +139,8 @@ const formData = ref({
   remark: '',
   status: CommonStatusEnum.ENABLE,
   roleIds: [],
-  hireDate: ''
+  hireDate: '',
+  isNewUserConfirm: false
 })
 const formRules = ref<any>({
   username: [{ required: true, message: '登录账号不能为空', trigger: 'blur' }],
@@ -192,8 +193,14 @@ const submitForm = async () => {
   try {
     const data = formData.value as unknown as UserApi.UserVO
     if (formType.value === 'create') {
-      await UserApi.createUser(data)
+      const resp = await UserApi.createUser(data)
-      message.success(t('common.createSuccess'))
+      if (resp.code == 18888) {
+        await message.confirm(resp.msg)
+        formData.value.isNewUserConfirm = true
+        submitForm()
+      } else {
+        message.success(t('common.createSuccess'))
+      }
     } else {
       await UserApi.updateUser(data)
       message.success(t('common.updateSuccess'))
@@ -220,7 +227,8 @@ const resetForm = () => {
     remark: '',
     status: CommonStatusEnum.ENABLE,
     roleIds: [],
-    hireDate: formatDate(new Date(), 'YYYY-MM-DD')
+    hireDate: formatDate(new Date(), 'YYYY-MM-DD'),
+    isNewUserConfirm: false
   }
   formRef.value?.resetFields()
 }

src/views/Clue/Order/Comp/MallSettle.vue

@@ -157,16 +157,38 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
-      <el-table-column
+      <el-table-column prop="createTime" label="支出日期" width="140px">
-        prop="createTime"
+        <template #default="{ row, col }">
-        label="支出日期"
+          <el-date-picker
-        width="120px"
+            v-if="row.edit"
-        :formatter="dateFormatter"
+            v-model="row.createTime"
-      />
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.createTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="signProduct" label="成交产品" min-width="150px" />
       <el-table-column prop="signSpecs" label="成交规格" min-width="150px" />
       <el-table-column prop="supplier" label="供应商" min-width="150px" />
-      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.settlementPrice"
+            size="small"
+            :min="0"
+            :controls="false"
+            style="width: 100%"
+          />
+          <div v-else>{{ row.settlementPrice }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -199,6 +221,19 @@
           </el-popover>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.settlementState == '待结算'"
+            type="primary"
+            text
+            v-hasPermi="['clue:order:settle-update']"
+            @click="handleUpdate(row)"
+          >
+            {{ row.edit ? '保存' : '修改' }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"
@@ -318,6 +353,28 @@ function getSummaries(param) {
   return sums
 }
 
+async function handleUpdate(row) {
+  if (row.edit) {
+    // 删除的二次确认
+    await message.confirm('是否确认修改结算数据？')
+    // 保存
+    SettleApi.updateSettle({
+      settlementId: row.settlementId,
+      settlementPrice: row.settlementPrice,
+      createTime: row.createTime
+    })
+      .then(() => {
+        message.success('修改成功')
+        getList()
+      })
+      .finally(() => {
+        row.edit = false
+      })
+  } else {
+    row.edit = true
+  }
+}
+
 const selectList = ref([])
 function handleSelectionChange(val) {
   selectList.value = [...val]

src/views/Clue/Order/Comp/Reback.vue

@@ -7,6 +7,9 @@
       <el-form-item>
         <el-input v-model="searchForm.name" placeholder="线索名称" clearable />
       </el-form-item>
+      <el-form-item>
+        <el-input v-model="searchForm.mobile" placeholder="联系方式" clearable />
+      </el-form-item>
       <el-form-item>
         <el-select v-model="searchForm.state" placeholder="审核状态" clearable style="width: 120px">
           <el-option label="待审核" :value="1" />
@@ -133,8 +136,8 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="60" :selectable="(row) => row.state == 1" />
-      <el-table-column prop="signId" label="成交单号" min-width="180px" />
+      <el-table-column prop="signId" label="成交单号" min-width="150px" />
-      <el-table-column prop="name" label="线索名称" width="150px" />
+      <el-table-column prop="name" label="线索名称" width="120px" />
       <el-table-column prop="phone" label="联系方式" width="120px" />companyProfit
       <el-table-column prop="money" label="回款金额" min-width="120px">
         <template #default="{ row }">
@@ -207,6 +210,12 @@
         label="转化人"
         min-width="90"
       />
+      <el-table-column
+        v-if="appStore.getAppInfo?.instanceType == 1"
+        prop="area"
+        label="区域"
+        min-width="90"
+      />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column
         prop="dealDate"
@@ -218,9 +227,24 @@
       <el-table-column
         prop="applyTime"
         label="申请时间"
-        min-width="120px"
+        min-width="140px"
         :formatter="dateFormatter"
-      />
+      >
+        <template #default="{ row, col }">
+          <el-date-picker
+            v-if="row.edit"
+            v-model="row.applyTime"
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.applyTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="checkUser" label="审核人" min-width="90" />
       <el-table-column
         prop="checkTime"
@@ -297,7 +321,7 @@ import DialogBatchAudit from './DialogBatchAudit.vue'
 
 import { removeNullField } from '@/utils'
 import { useAppStore } from '@/store/modules/app'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, formatDate } from '@/utils/formatTime'
 
 const userStore = useUserStore()
 const message = useMessage() // 消息弹窗
@@ -316,6 +340,7 @@ const searchForm = ref({
   applyTime: [],
   applyUser: undefined,
   checkTime: [],
+  phone: undefined,
   pageNo: 1,
   pageSize: 20
 })
@@ -343,6 +368,7 @@ function handleReset() {
     applyTime: [],
     applyUser: undefined,
     checkTime: [],
+    mobile: undefined,
     pageNo: 1,
     pageSize: 20
   }
@@ -438,7 +464,8 @@ async function handleUpdate(row) {
       money: row.money,
       companyProfit: row.companyProfit,
       personProfit: row.personProfit,
-      isPayoff: row.isPayoffValue
+      isPayoff: row.isPayoffValue,
+      applyTime: formatDate(row.applyTime)
     })
       .then(() => {
         message.success('修改成功')

src/views/Clue/Order/Comp/SchoolSettle.vue

@@ -158,16 +158,38 @@
       <el-table-column prop="phone" label="联系方式" width="120px" />
       <el-table-column prop="signUserName" label="登记人" min-width="90" />
       <el-table-column prop="dealDate" label="成交日期" width="120px" :formatter="dateFormatter" />
-      <el-table-column
+      <el-table-column prop="createTime" label="支出日期" width="140px">
-        prop="createTime"
+        <template #default="{ row, col }">
-        label="支出日期"
+          <el-date-picker
-        width="120px"
+            v-if="row.edit"
-        :formatter="dateFormatter"
+            v-model="row.createTime"
-      />
+            type="date"
+            size="small"
+            format="YYYY-MM-DD"
+            value-format="YYYY-MM-DD"
+            style="width: 110px"
+            :clearable="false"
+            placeholder="选择日期"
+          />
+          <div v-else>{{ dateFormatter(row, col, row.createTime) }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="signSchool" label="成交驾校" min-width="150px" />
       <el-table-column prop="signPlace" label="成交场地" min-width="150px" />
       <el-table-column prop="signClass" label="成交班型" min-width="150px" />
-      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px" />
+      <el-table-column prop="settlementPrice" label="结算单价" min-width="150px">
+        <template #default="{ row }">
+          <el-input-number
+            v-if="row.edit"
+            v-model="row.settlementPrice"
+            size="small"
+            :min="0"
+            :controls="false"
+            style="width: 100%"
+          />
+          <div v-else>{{ row.settlementPrice }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="settlementNum" label="结算数量" min-width="150px" />
       <el-table-column prop="settlementMoney" label="结算金额" min-width="150px" />
       <el-table-column label="费用备注" width="90px">
@@ -200,6 +222,19 @@
           </el-popover>
         </template>
       </el-table-column>
+      <el-table-column label="操作" width="100px" fixed="right">
+        <template #default="{ row }">
+          <el-button
+            v-if="row.settlementState == '待结算'"
+            type="primary"
+            text
+            v-hasPermi="['clue:order:settle-update']"
+            @click="handleUpdate(row)"
+          >
+            {{ row.edit ? '保存' : '修改' }}
+          </el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       v-model:limit="searchForm.pageSize"
@@ -301,6 +336,28 @@ async function getList() {
   }
 }
 
+async function handleUpdate(row) {
+  if (row.edit) {
+    // 删除的二次确认
+    await message.confirm('是否确认修改结算数据？')
+    // 保存
+    SettleApi.updateSettle({
+      settlementId: row.settlementId,
+      settlementPrice: row.settlementPrice,
+      createTime: row.createTime
+    })
+      .then(() => {
+        message.success('修改成功')
+        getList()
+      })
+      .finally(() => {
+        row.edit = false
+      })
+  } else {
+    row.edit = true
+  }
+}
+
 function getSummaries(param) {
   const { columns } = param
   const sums = []

src/views/Login/MPLogin.vue

@@ -9,12 +9,17 @@
         <el-input v-model="form.password" placeholder="请输入密码" show-password type="password" />
       </el-form-item>
     </el-form>
-    <el-button type="primary" class="w-full" @click="onSubmit">授权登陆</el-button>
+    <el-button type="primary" :disabled="formLoading" class="w-full" @click="onSubmit">
-    <div v-if="form.code">code: {{ form.code }}</div>
+      授权登陆
+    </el-button>
   </div>
 </template>
 
 <script setup name="MPLogin">
+import { bindWx } from '@/api/login'
+
+const message = useMessage() // 消息弹窗
+
 const form = ref({
   code: undefined,
   username: undefined,
@@ -38,13 +43,29 @@ const params = ref({
   scope: 'snsapi_base' // snsapi_base 静默授权获取 open id ；snsapi_userinfo 需要用户授权，获取详细信息
   // state:'code', // a-zA-Z0-9的参数值，最多128字节
 })
-function onSubmit() {
+
+const formLoading = ref(false)
+async function onSubmit() {
   // 这些需要判断没有 code 情况拉起授权登陆，有就结束放在重复拉起授权登陆
   if (!form.value.code) {
     const access_url = WX_AUTH_URL + `${new URLSearchParams(params.value)}` + REDIRECT
     location.href = access_url
   } else {
-    alert(`授权成功!`)
+    // 校验表单
+    if (!formRef.value) return
+    const valid = await formRef.value.validate()
+    if (!valid) return
+    // 提交请求
+    formLoading.value = true
+    try {
+      await bindWx(form.value)
+      message.success('绑定成功')
+      window.close()
+    } catch (error) {
+      console.log(error)
+    } finally {
+      formLoading.value = false
+    }
   }
 }
 

src/views/Profile/NotifyMessage.vue

@@ -1,7 +1,193 @@
 <template>
-  <div> 站内信 </div>
+  <!-- 搜索工作栏 -->
+  <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="0">
+    <el-form-item>
+      <el-select
+        v-model="queryParams.messageType"
+        placeholder="消息类型"
+        clearable
+        filterable
+        @change="handleQuery"
+      >
+        <el-option
+          v-for="item in typeOptions"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-select
+        v-model="queryParams.readStatus"
+        placeholder="状态"
+        clearable
+        filterable
+        @change="handleQuery"
+      >
+        <el-option label="已读" :value="true" />
+        <el-option label="未读" :value="false" />
+      </el-select>
+    </el-form-item>
+    <el-form-item>
+      <el-button :disabled="selectedIds.length == 0" @click="handleUpdateList">
+        标记已读
+      </el-button>
+      <el-button @click="handleUpdateAll"> 全部已读 </el-button>
+    </el-form-item>
+  </el-form>
+
+  <el-text class="mb-10px" type="danger">tips: 双击展示消息详情</el-text>
+
+  <!-- 列表 -->
+  <el-table
+    ref="tableRef"
+    v-loading="loading"
+    :data="list"
+    row-key="id"
+    @selection-change="handleSelectionChange"
+    @row-dblclick="handleDetail"
+  >
+    <el-table-column type="selection" :selectable="selectable" reserve-selection width="60px" />
+    <el-table-column label="类型" align="left" prop="messageTypeName" width="200px" />
+    <el-table-column label="标题" align="left" prop="title" />
+    <el-table-column
+      label="时间"
+      align="left"
+      prop="createTime"
+      width="180"
+      :formatter="dateFormatter"
+    />
+    <el-table-column label="状态" align="left" width="100px">
+      <template #default="{ row }">
+        <el-tag :type="row.readStatus ? 'success' : 'info'">
+          {{ row.readStatus ? '已读' : '未读' }}
+        </el-tag>
+      </template>
+    </el-table-column>
+  </el-table>
+  <!-- 分页 -->
+  <Pagination
+    :total="total"
+    v-model:page="queryParams.pageNo"
+    v-model:limit="queryParams.pageSize"
+    @pagination="getList"
+  />
 </template>
+<script lang="ts" setup name="NotifyMessage">
+import { dateFormatter } from '@/utils/formatTime'
+import * as NotifyMessageApi from '@/api/system/notify/message'
+import { useUserStore } from '@/store/modules/user'
+import { getGeneralSysDictData } from '@/api/system/dict/dict.data'
 
-<script setup name="NotifyMessage"></script>
+const router = useRouter()
 
-<style lang="scss" scoped></style>
+const userStore = useUserStore()
+const message = useMessage() // 消息
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref<any[]>([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 20,
+  messageType: undefined,
+  readStatus: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NotifyMessageApi.getMyNotifyMessagePage({
+      ...queryParams,
+      roleId: userStore.getUser?.currentRole
+    })
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 某一行，是否允许选中 */
+const selectable = (row: any) => {
+  return !row.readStatus
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+async function handleDetail(row: any) {
+  if (!row.readStatus) {
+    await handleReadOne(row.id)
+  }
+  const url = router.resolve({
+    path: '/nm-detail',
+    query: { id: row.id }
+  })
+  window.open(url.href, '_blank')
+}
+
+const tableRef = ref() // 表格的 Ref
+const selectedIds = ref<number[]>([]) // 表格的选中 ID 数组
+
+/** 标记一条站内信已读 */
+const handleReadOne = async (id: number) => {
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: [id]
+  })
+  await getList()
+}
+
+/** 标记全部站内信已读 **/
+const handleUpdateAll = async () => {
+  await NotifyMessageApi.updateAllNotifyMessageRead({
+    roleId: userStore.getUser?.currentRole
+  })
+  message.success('全部已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 标记一些站内信已读 **/
+const handleUpdateList = async () => {
+  if (selectedIds.value.length === 0) {
+    return
+  }
+  await NotifyMessageApi.updateNotifyMessageRead({
+    ids: selectedIds.value,
+    roleId: userStore.getUser?.currentRole
+  })
+  message.success('批量已读成功！')
+  tableRef.value.clearSelection()
+  await getList()
+}
+
+/** 当表格选择项发生变化时会触发该事件  */
+const handleSelectionChange = (array: NotifyMessageApi.NotifyMessageVO[]) => {
+  selectedIds.value = []
+  if (!array) {
+    return
+  }
+  array.forEach((row) => selectedIds.value.push(row.id))
+}
+
+const typeOptions = ref<any[]>([])
+
+function getOptions() {
+  getGeneralSysDictData('message_type').then((data) => {
+    typeOptions.value = data
+  })
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getOptions()
+  getList()
+})
+</script>

src/views/Profile/NotifyMessageDetail.vue

@@ -0,0 +1,89 @@
+<!--
+ * @Author: riverQiu
+ * @Date: 2024-09-11 18:42:37
+ * @LastEditors: riverQiu
+ * @LastEditTime: 2024-09-11 19:03:23
+ * @Description: 
+-->
+<template>
+  <div class="container">
+    <ContentWrap style="max-width: 1000px; margin: 0 auto">
+      <div class="text-center">
+        <div class="mb-10px" style="font-size: 24px; letter-spacing: 2px">
+          {{ info.title }}
+        </div>
+        <el-text>
+          {{ formatDate(info.createTime, 'YYYY-MM-DD hh:mm:ss') }}
+        </el-text>
+      </div>
+      <el-divider direction="horizontal" />
+
+      <div v-dompurify-html="info.content"></div>
+    </ContentWrap>
+  </div>
+</template>
+
+<script setup name="NMDetail">
+import { getNotifyMessageDetail, updateNotifyMessageRead } from '@/api/system/notify/message'
+import { formatDate } from '@/utils/formatTime'
+
+const route = useRoute()
+const info = ref({})
+
+function init() {
+  getNotifyMessageDetail(route.query.id).then((data) => {
+    info.value = data
+    if (!data.readStatus) {
+      handleReadOne(data.id)
+    }
+  })
+}
+
+/** 标记一条站内信已读 */
+const handleReadOne = async (id) => {
+  await updateNotifyMessageRead({
+    ids: [id]
+    // roleId: userStore.getUser?.currentRole
+  })
+  await getList()
+}
+
+onMounted(() => {
+  init()
+})
+</script>
+
+<style lang="scss" scoped>
+.container {
+  padding: 20px;
+  max-height: 100%;
+  overflow-y: auto;
+}
+:deep(p) {
+  font-size: 14px;
+}
+:deep(table) {
+  margin-top: 10px;
+  border-collapse: separate;
+  text-indent: initial;
+  border-spacing: 1px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(th) {
+  font-size: 14px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(td) {
+  font-size: 12px;
+  text-align: left;
+  border-width: 1px;
+  box-sizing: border-box;
+}
+:deep(.el-card__body) {
+  padding: 20px 10px;
+}
+</style>