From 403da33c30fc628c1608b96d95efdc12e70c3b06 Mon Sep 17 00:00:00 2001 From: pyt <626651354@qq.com> Date: 星期三, 26 二月 2025 15:40:23 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide --- management/src/pages/message-notification/index.jsx | 62 ++++++++++++++++++++++++------- 1 files changed, 48 insertions(+), 14 deletions(-) diff --git a/management/src/pages/message-notification/index.jsx b/management/src/pages/message-notification/index.jsx index 14e63b0..77e4ad4 100644 --- a/management/src/pages/message-notification/index.jsx +++ b/management/src/pages/message-notification/index.jsx @@ -1,9 +1,9 @@ import { PageContainer, ProTable } from '@ant-design/pro-components'; import { buildProTableDataSource, sendRequest, showDelConfirm } from '@/utils/antdUtils'; -import { Button, message, Space } from 'antd'; +import { Button, message, Space, Select } from 'antd'; import { useRef, useState } from 'react'; import { Access, history, useAccess } from 'umi'; -import { getList, updateStatus, deleteBanner } from './service' +import { getList, setStatus } from './service' const Banner = () => { const actionRef = useRef(); @@ -12,42 +12,76 @@ const columns = [ { title: '诉求标题', - dataIndex: 'bannerName' + dataIndex: 'title' }, { title: '承办者', - dataIndex: 'bannerName1' + dataIndex: 'undertakerUser' }, { title: '联系方式', - dataIndex: 'bannerName' + dataIndex: 'phone' }, { title: '所在单位', - dataIndex: 'bannerName' + dataIndex: 'department', + renderFormItem: (_, { type, defaultRender, ...rest }, form) => { + return ( + <Select + key="searchSelect" + allowClear + placeholder="请选择" + filterOption={false} + options={[{ label: '市级', value: '1' }, { label: '区县', value: '2' }, { label: '街道', value: '3' }, { label: '社区', value: '4' }, { label: '党员', value: '5' }]} + > + </Select > + ) + }, + render: (_, record) => { + return record.department + } }, { title: '所属职位', - dataIndex: 'bannerName' + dataIndex: 'position', + renderFormItem: (_, { type, defaultRender, ...rest }, form) => { + return ( + <Select + key="searchSelect" + allowClear + placeholder="请选择" + filterOption={false} + options={[{ label: '市级', value: '1' }, { label: '区县', value: '2' }, { label: '街道', value: '3' }, { label: '社区', value: '4' }, { label: '党员', value: '5' }]} + > + </Select > + ) + }, + render: (_, record) => { + return record.position + } }, { title: '诉求应处理时间', - dataIndex: 'bannerName', + dataIndex: 'responseTime', hideInSearch: true, }, { title: '提示类型', - dataIndex: 'bannerName', + dataIndex: 'promptType', hideInSearch: true, + valueEnum: { + '1': { text: '临期提醒' }, + '2': { text: '超时提醒' }, + } }, { title: '状态', - dataIndex: 'listingStatus', + dataIndex: 'readStatus', hideInSearch: true, valueEnum: { - '上架中': { text: '已读' }, - '已下架': { text: '未读' }, + '1': { text: '已读' }, + '0': { text: '未读' }, } }, { @@ -61,11 +95,11 @@ type="link" onClick={() => { showDelConfirm(async () => { - let status = await sendRequest(deleteBanner, record.id) + let status = await sendRequest(setStatus, record.id) if (status) { actionRef.current.reload(); } - }, '确认标记已读所选信息吗?'); + }, '确认将所选信息标记为已读吗?'); }} > 标记已读 -- Gitblit v1.7.1