新闻

src/api/base/news/index.ts

@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+// 公司新闻 VO
+export interface NewsVO {
+  id: number // 新闻id
+  newsName: string // 新闻名称
+  newsCreatetime: Date // 发布时间
+  newsImg: string // 轮换图片
+  newsContent: string // 发布内容
+  contentType: number // 新闻分类
+  newsStatus: string // 新闻图片状态
+  status: string // 新闻状态
+  deptId: number // 部门id
+}
+
+// 公司新闻 API
+export const NewsApi = {
+  // 查询公司新闻分页
+  getNewsPage: async (params: any) => {
+    return await request.get({ url: `/base/news/page`, params })
+  },
+
+  // 查询公司新闻详情
+  getNews: async (id: number) => {
+    return await request.get({ url: `/base/news/get?id=` + id })
+  },
+
+  // 新增公司新闻
+  createNews: async (data: NewsVO) => {
+    return await request.post({ url: `/base/news/create`, data })
+  },
+
+  // 修改公司新闻
+  updateNews: async (data: NewsVO) => {
+    return await request.put({ url: `/base/news/update`, data })
+  },
+
+  // 删除公司新闻
+  deleteNews: async (id: number) => {
+    return await request.delete({ url: `/base/news/delete?id=` + id })
+  },
+
+  // 导出公司新闻 Excel
+  exportNews: async (params) => {
+    return await request.download({ url: `/base/news/export-excel`, params })
+  },
+}

src/utils/dict.ts

@@ -152,6 +152,10 @@ export enum DICT_TYPE {
   BPM_PROCESS_LISTENER_TYPE = 'bpm_process_listener_type',
   BPM_PROCESS_LISTENER_VALUE_TYPE = 'bpm_process_listener_value_type',
 
+  // ========== PAY 模块 ==========
+  OA_NEWS_TYPE = 'oa_news_type',
+  OA_NEWS_IMG_STATUS = 'oa_news_img_status',
+  OA_NEWS_STATUS = 'oa_news_status',
   // ========== PAY 模块 ==========
   PAY_CHANNEL_CODE = 'pay_channel_code', // 支付渠道编码类型
   PAY_ORDER_STATUS = 'pay_order_status', // 商户支付订单状态

src/views/Home/Index.vue

@@ -27,26 +27,16 @@
           </div>
         </template>
         <el-skeleton :loading="loading" animated>
-          <el-card shadow="hover" style="margin-bottom: 10px;height: 200px">
+          <el-card shadow="hover" >
             <el-carousel :interval="4000" height="200px" @change="handleCarouselChange" ref="carousel">
-              <el-carousel-item v-for="item in image"  :key="item.id">
+              <el-carousel-item v-for="item in filteredListFoImg"  :key="item.id">
-                <el-image  style="width: 100%; height: 100%" :src="item.src" alt="无图片" :title="item.name"/>
+                <el-image  style="width: 100%; height: 100%" :src="item.newsImg" alt="无图片" :title="item.newsName"/>
               </el-carousel-item>
             </el-carousel>
           </el-card>
           <el-row>
-            <el-col :span="18">
+            <el-col :span="24">
-              <span v-if="image[pageNo - 1]">{{image[pageNo-1].title}}</span>
+              <span v-if="filteredListFoImg[pageNo - 1]">{{filteredListFoImg[pageNo-1].newsName}}</span>
-            </el-col>
-            <el-col :span="6">
-              <el-pagination
-                size="small"
-                layout="prev, pager, next"
-                v-model:current-page="pageNo"
-                :total="image.length"
-                :page-size="1"
-                @current-change="handlePageChange"
-              />
             </el-col>
           </el-row>
         </el-skeleton>
@@ -223,7 +213,7 @@
         <template #header >
           <div class="SystemThem" style="height: 2px;"></div>
           <div class="h-3 flex justify-between" style="height: 15px;margin: 0;padding: 0;">
-            <span style="display: inline-block;">公告</span>
+            <span style="display: inline-block;">新闻</span>
             <el-link
               type="primary"
               :underline="false"
@@ -235,14 +225,20 @@
           </div>
         </template>
         <el-skeleton :loading="loading" animated>
-          <el-row>
+          <div v-for="(item, index) in filteredListFoNews" :key="`dynamics-${index}`">
-            <el-col
+            <div class="flex items-center">
-              v-for="(item,index) in todo"
+              <div>
-              :key="`card-${index}`"
+                <div class="text-14px" @click="openDialog(item.contentType,item.id)">
-            >
+                  <dict-tag :type="DICT_TYPE.OA_NEWS_TYPE" :value="item.contentType" /> :
-              <span style="display: inline-block; margin-bottom: 10px;font-size: 15px;color: #105cfb" >* {{item.title}}</span>
+                  {{ item.newsName }}
-            </el-col>
+                </div>
-          </el-row>
+                <div class=" text-12px text-gray-400">
+                  {{ formatTime(item.newsCreatetime, 'yyyy-MM-dd') }}
+                </div>
+              </div>
+            </div>
+            <el-divider />
+          </div>
         </el-skeleton>
       </el-card>
       <el-card shadow="hover" class="mt-8px">
@@ -274,7 +270,6 @@
           </el-row>
         </el-skeleton>
       </el-card>
-<!--      <el-card shadow="hover" class="mt-8px">-->
       <el-card shadow="hover" class="mt-8px">
         <template #header >
           <div class="SystemThem" style="height: 2px;"></div>
@@ -313,29 +308,22 @@
       </el-card>
     </el-col>
   </el-row>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 80%;">
+    <el-form>
+      <el-form-item>
+        <span style="font-size: 20px; font-weight: bold;">{{formDataNews.newsName}}</span>
+        <el-divider style="border-top: none; margin: 0;"/>
+        <span style="font-size: 12px">发布时间: {{formatTime(formDataNews.newsCreatetime,'yyyy-MM-dd')}}</span>
+        <el-divider style="margin-top: 10px"/>
+        <span style="line-height: 1.2" v-html="formDataNews.newsContent"></span>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="dialogVisible = false">确 定</el-button>
+    </template>
+  </Dialog>
 </template>
-<style>
-.SystemThem {
-  background-color: var(--el-color-primary);
-}
-.custom-calendar {
-  height: 310px; /* 根据需要调整高度 */
-}
-.custom-calendar .el-calendar-table__row {
-   height: 40px; /* 设置行高度，根据需要调整 */
- }
-.custom-calendar .el-calendar-day {
-  height: 100%; /* 设置每个日历单元格的高度为100% */
-  display: flex; /* 使用 flexbox */
-  align-items: center; /* 垂直居中 */
-  justify-content: center; /* 水平居中 */
-}
-.custom-shadow-hover:hover {
-  box-shadow: 0 10px 20px rgba(0, 0, 0, 0.4) !important; /* 悬停时更深的阴影 */
-}
-</style>
 <script lang="ts" setup>
-import mn from '../../../src/assets/svgs/login-box-bg.svg'
 import { set } from 'lodash-es'
 import { EChartsOption } from 'echarts'
 
@@ -345,6 +333,9 @@ import {WorkplaceTotal, Project, Notice, Shortcut, Todo, Email} from './types'
 import { pieOptions, barOptions } from './echarts-data'
 import {dateFormatter2} from "@/utils/formatTime";
 import {CalendarDateType, CalendarInstance} from "element-plus";
+import {NewsApi, NewsVO} from "@/api/base/news";
+import {formatTime} from "../../utils";
+import {DICT_TYPE} from "@/utils/dict";
 
 defineOptions({ name: 'Home' })
 
@@ -354,13 +345,60 @@ const { setWatermark } = useWatermark()
 const loading = ref(true)
 const avatar = userStore.getUser.avatar
 const username = userStore.getUser.nickname
+const dialogVisible = ref(false) // 新闻展示弹窗是否显示
+const dialogTitle = ref("") // 新闻展示标题
 const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+const openDialog = async (type:number,id?:number) => {
+  dialogVisible.value = true;
+  dialogTitle.value = type === 1?"通知":"公告"
+  if (id){
+    formDataNews.value = await NewsApi.getNews(id)
+  }
+}
+const formDataNews = ref({
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: Date,
+  newsImg: undefined,
+  newsContent: undefined,
+  contentType: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+})
 // 获取统计数
 let totalSate = reactive<WorkplaceTotal>({
   project: 0,
   access: 0,
   todo: 0
 })
+const newsList = ref<NewsVO[]>([])//新闻列表数据
+const newsQueryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: [],
+  contentType: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+  createTime: [],
+})
+const getNewsList = async () => {
+  const newsData = await NewsApi.getNewsPage(newsQueryParams)
+  newsList.value = newsData.list
+  // console.log("data",newsData)
+}
+const filteredListFoImg = computed(() => {
+  return newsList.value.filter(item => item.newsStatus !== "0" && item.status!=="0");
+});
+const filteredListFoNews = computed(() => {
+  return newsList.value.filter(item => item.status!=="0");
+});
+onMounted(() => {
+  getNewsList()
+})
 const calendar = ref<CalendarInstance>()
 const selectDate = (val: CalendarDateType) => {
   if (!calendar.value) return
@@ -369,17 +407,8 @@ const selectDate = (val: CalendarDateType) => {
 const handleCarouselChange = async (currentIndex:number) => {
   pageNo.value=currentIndex+1
 
-}
-const handlePageChange = async (newPage:number) => {
-  const carousel = (document.querySelector('.el-carousel') as any);
-  carousel.setActiveItem(newPage - 1); // 设置轮播显示项与分页同步
-
 }
 const pageNo = ref<number | undefined>(1)
-const image = ref<Array<{ id: number; src: string; name: string; title: string }>>([
-  {id: 1, src: mn, name: '02',title:'首页图片展示标题1'},
-  {id: 2, src: mn, name: '03',title:'首页图片展示标题2'},
-])
 const getCount = async () => {
   const data = {
     project: 40,
@@ -647,3 +676,24 @@ const getAllApi = async () => {
 
 getAllApi()
 </script>
+
+<style>
+.SystemThem {
+  background-color: var(--el-color-primary);
+}
+.custom-calendar {
+  height: 310px; /* 根据需要调整高度 */
+}
+.custom-calendar .el-calendar-table__row {
+  height: 40px; /* 设置行高度，根据需要调整 */
+}
+.custom-calendar .el-calendar-day {
+  height: 100%; /* 设置每个日历单元格的高度为100% */
+  display: flex; /* 使用 flexbox */
+  align-items: center; /* 垂直居中 */
+  justify-content: center; /* 水平居中 */
+}
+.custom-shadow-hover:hover {
+  box-shadow: 0 10px 20px rgba(0, 0, 0, 0.4) !important; /* 悬停时更深的阴影 */
+}
+</style>

src/views/base/news/NewsForm.vue

@@ -0,0 +1,190 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 80%;">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="新闻名称" prop="newsName">
+        <el-input v-model="formData.newsName" placeholder="请输入新闻名称" />
+      </el-form-item>
+      <el-form-item label="新闻分类" prop="contentType">
+        <el-select v-model="formData.contentType" placeholder="请选择新闻分类">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.OA_NEWS_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="图片状态" prop="newsStatus">
+            <el-radio-group v-model="formData.newsStatus">
+              <el-radio
+                v-for="dict in getStrDictOptions(DICT_TYPE.OA_NEWS_IMG_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="新闻状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getStrDictOptions(DICT_TYPE.OA_NEWS_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="部门" prop="deptId">
+            <div class="pull-left" v-show="true" v-if="deptInfo">{{ deptInfo?.name }} </div>
+            <div class="pull-left" v-show="true" v-if="!deptInfo">获取失败 </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="发布时间" prop="newsCreatetime">
+            <el-date-picker
+              v-model="formData.newsCreatetime"
+              type="date"
+              value-format="x"
+              placeholder="选择发布时间"
+            />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-form-item label="轮换图片" prop="newsImg">
+        <UploadImg v-model="formData.newsImg" />
+      </el-form-item>
+      <el-form-item label="发布内容" prop="newsContent">
+        <Editor v-model="formData.newsContent" height="150px" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { NewsApi, NewsVO } from '@/api/base/news'
+import {getUserProfile} from "@/api/system/user/profile";
+import {DeptVO, getDept} from "@/api/system/dept";
+
+/** 公司新闻 表单 */
+defineOptions({ name: 'NewsForm' })
+
+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 deptInfo = ref({} as DeptVO ) // 部门信息
+const formData = ref({
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: undefined,
+  newsImg: undefined,
+  newsContent: undefined,
+  contentType: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+})
+const formRules = reactive({
+  newsName: [{ required: true, message: '新闻名称不能为空', trigger: 'blur' }],
+  newsImg: [{ required: true, message: '轮换图片不能为空', trigger: 'blur' }],
+  newsContent: [{ required: true, message: '发布内容不能为空', trigger: 'blur' }],
+  contentType: [{ required: true, message: '新闻分类不能为空', trigger: 'change' }],
+  newsStatus: [{ required: true, message: '新闻图片状态不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '新闻状态不能为空', trigger: 'blur' }],
+  deptId: [{ required: true, message: '部门id不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+//获取用户部门
+const getUserInfo = async () => {
+  if (formData.value.deptId == ''||formData.value.deptId == undefined){
+    const user = await getUserProfile();
+    formData.value.deptId = user.dept.id
+  }
+  if (formData.value.deptId != undefined){
+    deptInfo.value = await getDept(formData.value.deptId)
+  }
+}
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await NewsApi.getNews(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+
+  await getUserInfo()
+}
+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 NewsVO
+    // console.log("data",data);
+    if (formType.value === 'create') {
+      await NewsApi.createNews(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await NewsApi.updateNews(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    newsName: undefined,
+    newsCreatetime: undefined,
+    newsImg: undefined,
+    newsContent: undefined,
+    contentType: undefined,
+    newsStatus: undefined,
+    status: undefined,
+    deptId: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>

src/views/base/news/index.vue

@@ -0,0 +1,304 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+<!--      <el-form-item label="新闻id" prop="id">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.id"-->
+<!--          placeholder="请输入新闻id"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="新闻名称" prop="newsName">
+        <el-input
+          v-model="queryParams.newsName"
+          placeholder="请输入新闻名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+<!--      <el-form-item label="发布时间" prop="newsCreatetime">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.newsCreatetime"-->
+<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--          type="daterange"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期"-->
+<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--          class="!w-220px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="新闻分类" prop="contentType">
+        <el-select
+          v-model="queryParams.contentType"
+          placeholder="请选择新闻分类"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.OA_NEWS_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="新闻图片状态" prop="newsStatus">-->
+<!--        <el-select-->
+<!--          v-model="queryParams.newsStatus"-->
+<!--          placeholder="请选择新闻图片状态"-->
+<!--          clearable-->
+<!--          class="!w-240px"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="dict in getStrDictOptions(DICT_TYPE.OA_NEWS_IMG_STATUS)"-->
+<!--            :key="dict.value"-->
+<!--            :label="dict.label"-->
+<!--            :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+      <el-form-item label="新闻状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择新闻状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.OA_NEWS_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+<!--      <el-form-item label="部门id" prop="deptId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.deptId"-->
+<!--          placeholder="请输入部门id"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--          class="!w-240px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="创建时间" prop="createTime">-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.createTime"-->
+<!--          value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--          type="daterange"-->
+<!--          start-placeholder="开始日期"-->
+<!--          end-placeholder="结束日期"-->
+<!--          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--          class="!w-220px"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item>
+        <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['base:news:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['base:news:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+<!--      <el-table-column label="新闻id" align="center" prop="id" />-->
+      <el-table-column label="新闻名称" align="center" prop="newsName" />
+      <el-table-column
+        label="发布时间"
+        align="center"
+        prop="newsCreatetime"
+        :formatter="dateFormatter2"
+        width="180px"
+      />
+      <el-table-column label="轮换图片" align="center" prop="newsImg" >
+        <template #default="{ row }">
+          <el-image
+            class="h-80px w-80px"
+            lazy
+            :src="row.newsImg"
+            :preview-src-list="[row.newsImg]"
+            preview-teleported
+            fit="cover"
+          />
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="发布内容" align="center" prop="newsContent" />-->
+      <el-table-column label="新闻分类" align="center" prop="contentType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.OA_NEWS_TYPE" :value="scope.row.contentType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="图片状态" align="center" prop="newsStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.OA_NEWS_IMG_STATUS" :value="scope.row.newsStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="新闻状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.OA_NEWS_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="部门id" align="center" prop="deptId" />-->
+<!--      <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="['base:news:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['base:news:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <NewsForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+import { dateFormatter2} from '@/utils/formatTime'
+import download from '@/utils/download'
+import { NewsApi, NewsVO } from '@/api/base/news'
+import NewsForm from './NewsForm.vue'
+
+/** 公司新闻 列表 */
+defineOptions({ name: 'News' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<NewsVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  id: undefined,
+  newsName: undefined,
+  newsCreatetime: [],
+  contentType: undefined,
+  newsStatus: undefined,
+  status: undefined,
+  deptId: undefined,
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await NewsApi.getNewsPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await NewsApi.deleteNews(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await NewsApi.exportNews(queryParams)
+    download.excel(data, '公司新闻.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>