Merge branch 'master' of https://codeup.aliyun.com/bsdtec/biz-pc-cloud

src/api/integrated/notice.ts

@@ -0,0 +1,41 @@
+import request from "/@/utils/request"
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/integrated/notice/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/integrated/notice',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/integrated/notice/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/integrated/notice',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/integrated/notice',
+    method: 'put',
+    data: obj
+  })
+}
+

src/views/integrated/notice/form.vue

@@ -0,0 +1,136 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible"
+             :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="公告标题" prop="title">
+            <el-input v-model="form.title" placeholder="请输入公告标题"/>
+          </el-form-item>
+        </el-col>
+
+<!--        <el-col :span="12" class="mb20">-->
+<!--          <el-form-item label="公告图片" prop="picUrl">-->
+<!--            <upload-file v-model:imageUrl="form.picUrl"></upload-file>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+
+        <el-col :span="12" class="mb20">
+          <el-form-item label="是否置顶" prop="isTop">
+            <el-select v-model="form.isTop" placeholder="请选择是否置顶">
+              <el-option :value="item.value" :label="item.label" v-for="(item, index) in is_top"
+                         :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" class="mb20">
+          <el-form-item label="发布状态" prop="status">
+            <el-select v-model="form.status" placeholder="请选择状态 0已发布，1已下架">
+              <el-option :value="item.value" :label="item.label" v-for="(item, index) in push_status"
+                         :key="index"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="公告详情" prop="description">
+            <editor v-if="visible" v-model:get-html="form.description" placeholder="请输入公告详情"></editor>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+    <template #footer>
+        <span class="dialog-footer">
+          <el-button @click="visible = false">取消</el-button>
+          <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+        </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="NoticeDialog">
+import {useDict} from '/@/hooks/dict';
+import {useMessage} from "/@/hooks/message";
+import {getObj, addObj, putObj} from '/@/api/integrated/notice'
+import {rule} from '/@/utils/validate';
+
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+const {push_status, is_top} = useDict('push_status', 'is_top')
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  description: '',
+  status: '',
+  deptId: '',
+  feedbackId: '',
+  title: '',
+  picUrl: '',
+  isTop: '',
+  viewCount: '',
+});
+
+// 定义校验规则
+const dataRules = ref({})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取notice信息
+  if (id) {
+    form.id = id
+    getnoticeData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => {
+  });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await putObj(form) : await addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getnoticeData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>

src/views/integrated/notice/index.vue

@@ -0,0 +1,140 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row v-show="showSearch">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+      <el-form-item label="公告标题" prop="title" >
+        <el-input placeholder="请输入公告标题" v-model="state.queryForm.title" />
+      </el-form-item>
+          <el-form-item>
+            <el-button icon="search" type="primary" @click="getDataList">
+              查询
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'integrated_notice_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary"
+            v-auth="'integrated_notice_del'" @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'integrated_notice_export'"
+                @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border
+        :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
+				@selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="title" label="公告标题"  show-overflow-tooltip/>
+<!--          <el-table-column prop="description" label="公告详情"  show-overflow-tooltip/>-->
+          <el-table-column prop="status" label="发布状态" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="push_status" :value="scope.row.status"></dict-tag>
+            </template>
+          </el-table-column>
+<!--          <el-table-column prop="picUrl" label="公告图片"  show-overflow-tooltip/>-->
+          <el-table-column prop="isTop" label="是否置顶" show-overflow-tooltip>
+      <template #default="scope">
+                <dict-tag :options="is_top" :value="scope.row.isTop"></dict-tag>
+            </template>
+          </el-table-column>
+          <el-table-column prop="viewCount" label="浏览次数"  show-overflow-tooltip/>
+        <el-table-column label="操作" width="150">
+          <template #default="scope">
+            <el-button icon="edit-pen" text type="primary" v-auth="'integrated_notice_edit'"
+              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button>
+            <el-button icon="delete" text type="primary" v-auth="'integrated_notice_del'" @click="handleDelete([scope.row.id])">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemNotice">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { fetchList, delObjs } from "/@/api/integrated/notice";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+// 定义查询字典
+
+const { push_status,is_top } = useDict('push_status','is_top')
+// 定义变量内容
+const formDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+	tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/integrated/notice/export', Object.assign(state.queryForm, { ids: selectObjs }), 'notice.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+</script>