xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 10:56:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化公告管理，修改创建人查询的错误等等其他显示问题

Browse Source
This commit is contained in:
zhoumingfa 2025-02-21 16:00:54 +08:00
parent 2c70db1498
commit a100b1ab12
12 changed files with 102 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
View File

@ -28,7 +28,7 @@ public class NoticeQueryForm extends PageParam {
private String documentNumber; private String documentNumber;
@Schema(description = "创建人") @Schema(description = "创建人")
private Long createUserId; private String createUserName;
@Schema(description = "删除标识") @Schema(description = "删除标识")
private Boolean deletedFlag; private Boolean deletedFlag;

4
smart-admin-api-java17-springboot3/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
View File

@ -208,6 +208,10 @@ public class NoticeService {
} }
NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class); NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class);
NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(noticeEntity.getNoticeTypeId());
updateFormVO.setNoticeTypeName(noticeType.getNoticeTypeName());
updateFormVO.setPublishFlag(updateFormVO.getPublishTime() != null && updateFormVO.getPublishTime().isBefore(LocalDateTime.now()));
if (!updateFormVO.getAllVisibleFlag()) { if (!updateFormVO.getAllVisibleFlag()) {
List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId); List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId);
List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType())) List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType()))

55
smart-admin-api-java17-springboot3/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
View File

@ -2,6 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao"> <mapper namespace="net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao">
<!-- 查询结果列 -->
<sql id="base_columns">
t_notice.notice_id,
t_notice.notice_type_id,
t_notice.title,
t_notice.all_visible_flag,
t_notice.scheduled_publish_flag,
t_notice.publish_time,
t_notice.content_text,
t_notice.content_html,
t_notice.attachment,
t_notice.page_view_count,
t_notice.user_view_count,
t_notice.source,
t_notice.author,
t_notice.document_number,
t_notice.deleted_flag,
t_notice.create_user_id,
t_notice.update_time,
t_notice.create_time
</sql>
<!-- ================================== 可见范围相关 ================================== --> <!-- ================================== 可见范围相关 ================================== -->
<insert id="insertVisibleRange"> <insert id="insertVisibleRange">
@ -35,32 +57,30 @@
<!-- 后管分页查询资讯 --> <!-- 后管分页查询资讯 -->
<select id="query" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO"> <select id="query" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO">
SELECT SELECT
t_notice.* , <include refid="base_columns"/>,
t_notice_type.notice_type_name as noticeTypeName, t_notice_type.notice_type_name as noticeTypeName,
t_employee.actual_name as createUserName, t_employee.actual_name as createUserName
t_department.name as departmentName
FROM t_notice FROM t_notice
left join t_notice_type on t_notice_type.notice_type_id = t_notice.notice_type_id LEFT JOIN t_notice_type on t_notice.notice_type_id = t_notice_type.notice_type_id
left join t_employee on t_notice.create_user_id = t_employee.employee_id LEFT JOIN t_employee on t_notice.create_user_id = t_employee.employee_id
left join t_department on t_employee.department_id = t_department.department_id
<where> <where>
<if test="query.noticeTypeId != null"> <if test="query.noticeTypeId != null">
AND t_notice_type.notice_type_id = #{query.noticeTypeId} AND t_notice_type.notice_type_id = #{query.noticeTypeId}
</if> </if>
<if test="query.keywords != null and query.keywords !=''"> <if test="query.keywords != null and query.keywords != ''">
AND ( INSTR(t_notice.title,#{query.keywords}) AND ( INSTR(t_notice.title,#{query.keywords})
OR INSTR(t_notice.author,#{query.keywords}) OR INSTR(t_notice.author,#{query.keywords})
OR INSTR(t_notice.source,#{query.keywords}) OR INSTR(t_notice.source,#{query.keywords})
) )
</if> </if>
<if test="query.documentNumber != null and query.documentNumber !=''"> <if test="query.documentNumber != null and query.documentNumber != ''">
AND INSTR(t_notice.document_number, #{query.documentNumber}) AND INSTR(t_notice.document_number, #{query.documentNumber})
</if> </if>
<if test="query.createUserId != null"> <if test="query.createUserName != null and query.createUserName != ''">
AND t_notice.create_user_id = #{createUserId} AND t_employee.actual_name = #{query.createUserName}
</if> </if>
<if test="query.deletedFlag != null"> <if test="query.deletedFlag != null">
and t_notice.deleted_flag = #{query.deletedFlag} AND t_notice.deleted_flag = #{query.deletedFlag}
</if> </if>
<if test="query.createTimeBegin != null"> <if test="query.createTimeBegin != null">
AND DATE_FORMAT(t_notice.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{query.createTimeBegin}, AND DATE_FORMAT(t_notice.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{query.createTimeBegin},
@ -84,10 +104,9 @@
</select> </select>
<!-- ================================== 通知公告【员工查看】相关 ================================== --> <!-- ================================== 通知公告【员工查看】相关 ================================== -->
<select id="queryEmployeeNotice" <select id="queryEmployeeNotice" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
select select
t_notice.*, <include refid="base_columns"/>,
t_notice_type.notice_type_name, t_notice_type.notice_type_name,
(select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and (select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and
t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag
@ -142,12 +161,11 @@
</where> </where>
order by t_notice.publish_time desc order by t_notice.publish_time desc
</select> </select>
<select id="queryEmployeeNotViewNotice" <select id="queryEmployeeNotViewNotice" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
select * from select * from
( (
select select
t_notice.*, <include refid="base_columns"/>,
t_notice_type.notice_type_name, t_notice_type.notice_type_name,
(select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and (select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and
t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag
@ -198,8 +216,7 @@
) t where viewFlag = 0 ) t where viewFlag = 0
order by t.publish_time desc order by t.publish_time desc
</select> </select>
<select id="queryNoticeViewRecordList" <select id="queryNoticeViewRecordList" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
select t_notice_view_record.*, select t_notice_view_record.*,
t_employee.actual_name as employeeName, t_employee.actual_name as employeeName,
t_department.name as departmentName t_department.name as departmentName

2
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/form/NoticeQueryForm.java
View File

@ -28,7 +28,7 @@ public class NoticeQueryForm extends PageParam {
private String documentNumber; private String documentNumber;
@Schema(description = "创建人") @Schema(description = "创建人")
private Long createUserId; private String createUserName;
@Schema(description = "删除标识") @Schema(description = "删除标识")
private Boolean deletedFlag; private Boolean deletedFlag;

4
smart-admin-api-java8-springboot2/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/service/NoticeService.java
View File

@ -208,6 +208,10 @@ public class NoticeService {
} }
NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class); NoticeUpdateFormVO updateFormVO = SmartBeanUtil.copy(noticeEntity, NoticeUpdateFormVO.class);
NoticeTypeVO noticeType = noticeTypeService.getByNoticeTypeId(noticeEntity.getNoticeTypeId());
updateFormVO.setNoticeTypeName(noticeType.getNoticeTypeName());
updateFormVO.setPublishFlag(updateFormVO.getPublishTime() != null && updateFormVO.getPublishTime().isBefore(LocalDateTime.now()));
if (!updateFormVO.getAllVisibleFlag()) { if (!updateFormVO.getAllVisibleFlag()) {
List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId); List<NoticeVisibleRangeVO> noticeVisibleRangeList = noticeDao.queryVisibleRange(noticeId);
List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType())) List<Long> employeeIdList = noticeVisibleRangeList.stream().filter(e -> NoticeVisibleRangeDataTypeEnum.EMPLOYEE.getValue().equals(e.getDataType()))

55
smart-admin-api-java8-springboot2/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeMapper.xml
View File

@ -2,6 +2,28 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao"> <mapper namespace="net.lab1024.sa.admin.module.business.oa.notice.dao.NoticeDao">
<!-- 查询结果列 -->
<sql id="base_columns">
t_notice.notice_id,
t_notice.notice_type_id,
t_notice.title,
t_notice.all_visible_flag,
t_notice.scheduled_publish_flag,
t_notice.publish_time,
t_notice.content_text,
t_notice.content_html,
t_notice.attachment,
t_notice.page_view_count,
t_notice.user_view_count,
t_notice.source,
t_notice.author,
t_notice.document_number,
t_notice.deleted_flag,
t_notice.create_user_id,
t_notice.update_time,
t_notice.create_time
</sql>
<!-- ================================== 可见范围相关 ================================== --> <!-- ================================== 可见范围相关 ================================== -->
<insert id="insertVisibleRange"> <insert id="insertVisibleRange">
@ -35,32 +57,30 @@
<!-- 后管分页查询资讯 --> <!-- 后管分页查询资讯 -->
<select id="query" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO"> <select id="query" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeVO">
SELECT SELECT
t_notice.* , <include refid="base_columns"/>,
t_notice_type.notice_type_name as noticeTypeName, t_notice_type.notice_type_name as noticeTypeName,
t_employee.actual_name as createUserName, t_employee.actual_name as createUserName
t_department.name as departmentName
FROM t_notice FROM t_notice
left join t_notice_type on t_notice_type.notice_type_id = t_notice.notice_type_id LEFT JOIN t_notice_type on t_notice.notice_type_id = t_notice_type.notice_type_id
left join t_employee on t_notice.create_user_id = t_employee.employee_id LEFT JOIN t_employee on t_notice.create_user_id = t_employee.employee_id
left join t_department on t_employee.department_id = t_department.department_id
<where> <where>
<if test="query.noticeTypeId != null"> <if test="query.noticeTypeId != null">
AND t_notice_type.notice_type_id = #{query.noticeTypeId} AND t_notice_type.notice_type_id = #{query.noticeTypeId}
</if> </if>
<if test="query.keywords != null and query.keywords !=''"> <if test="query.keywords != null and query.keywords != ''">
AND ( INSTR(t_notice.title,#{query.keywords}) AND ( INSTR(t_notice.title,#{query.keywords})
OR INSTR(t_notice.author,#{query.keywords}) OR INSTR(t_notice.author,#{query.keywords})
OR INSTR(t_notice.source,#{query.keywords}) OR INSTR(t_notice.source,#{query.keywords})
) )
</if> </if>
<if test="query.documentNumber != null and query.documentNumber !=''"> <if test="query.documentNumber != null and query.documentNumber != ''">
AND INSTR(t_notice.document_number, #{query.documentNumber}) AND INSTR(t_notice.document_number, #{query.documentNumber})
</if> </if>
<if test="query.createUserId != null"> <if test="query.createUserName != null and query.createUserName != ''">
AND t_notice.create_user_id = #{createUserId} AND t_employee.actual_name = #{query.createUserName}
</if> </if>
<if test="query.deletedFlag != null"> <if test="query.deletedFlag != null">
and t_notice.deleted_flag = #{query.deletedFlag} AND t_notice.deleted_flag = #{query.deletedFlag}
</if> </if>
<if test="query.createTimeBegin != null"> <if test="query.createTimeBegin != null">
AND DATE_FORMAT(t_notice.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{query.createTimeBegin}, AND DATE_FORMAT(t_notice.create_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{query.createTimeBegin},
@ -84,10 +104,9 @@
</select> </select>
<!-- ================================== 通知公告【员工查看】相关 ================================== --> <!-- ================================== 通知公告【员工查看】相关 ================================== -->
<select id="queryEmployeeNotice" <select id="queryEmployeeNotice" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
select select
t_notice.*, <include refid="base_columns"/>,
t_notice_type.notice_type_name, t_notice_type.notice_type_name,
(select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and (select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and
t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag
@ -142,12 +161,11 @@
</where> </where>
order by t_notice.publish_time desc order by t_notice.publish_time desc
</select> </select>
<select id="queryEmployeeNotViewNotice" <select id="queryEmployeeNotViewNotice" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeEmployeeVO">
select * from select * from
( (
select select
t_notice.*, <include refid="base_columns"/>,
t_notice_type.notice_type_name, t_notice_type.notice_type_name,
(select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and (select count(*) from t_notice_view_record where t_notice_view_record.employee_id = #{requestEmployeeId} and
t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag t_notice_view_record.notice_id = t_notice.notice_id) as viewFlag
@ -198,8 +216,7 @@
) t where viewFlag = 0 ) t where viewFlag = 0
order by t.publish_time desc order by t.publish_time desc
</select> </select>
<select id="queryNoticeViewRecordList" <select id="queryNoticeViewRecordList" resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
resultType="net.lab1024.sa.admin.module.business.oa.notice.domain.vo.NoticeViewRecordVO">
select t_notice_view_record.*, select t_notice_view_record.*,
t_employee.actual_name as employeeName, t_employee.actual_name as employeeName,
t_department.name as departmentName t_department.name as departmentName

6
smart-admin-web-javascript/src/views/business/oa/notice/notice-detail.vue
View File

@ -11,17 +11,17 @@
<a-card style="margin-bottom: 15px" size="small"> <a-card style="margin-bottom: 15px" size="small">
<a-descriptions :title="noticeDetail.title" :column="4" size="small"> <a-descriptions :title="noticeDetail.title" :column="4" size="small">
<template #extra> <template #extra>
<a-button v-if="!noticeDetail.publishFlag" type="primary" size="small" @click="onEdit">编辑</a-button> <a-button type="primary" size="small" @click="onEdit">编辑</a-button>
</template> </template>
<a-descriptions-item label="分类">{{ noticeDetail.noticeTypeName }}</a-descriptions-item> <a-descriptions-item label="分类">{{ noticeDetail.noticeTypeName }}</a-descriptions-item>
<a-descriptions-item label="文号">{{ noticeDetail.documentNumber }}</a-descriptions-item> <a-descriptions-item label="文号">{{ noticeDetail.documentNumber ? noticeDetail.documentNumber : '无' }}</a-descriptions-item>
<a-descriptions-item label="来源">{{ noticeDetail.source }}</a-descriptions-item> <a-descriptions-item label="来源">{{ noticeDetail.source }}</a-descriptions-item>
<a-descriptions-item label="作者">{{ noticeDetail.author }}</a-descriptions-item> <a-descriptions-item label="作者">{{ noticeDetail.author }}</a-descriptions-item>
<a-descriptions-item label="页面浏览量">{{ noticeDetail.pageViewCount }}</a-descriptions-item> <a-descriptions-item label="页面浏览量">{{ noticeDetail.pageViewCount }}</a-descriptions-item>
<a-descriptions-item label="用户浏览量">{{ noticeDetail.userViewCount }}</a-descriptions-item> <a-descriptions-item label="用户浏览量">{{ noticeDetail.userViewCount }}</a-descriptions-item>
<a-descriptions-item label="创建时间">{{ noticeDetail.createTime }}</a-descriptions-item> <a-descriptions-item label="创建时间">{{ noticeDetail.createTime }}</a-descriptions-item>
<a-descriptions-item label="发布时间">{{ noticeDetail.publishTime }}</a-descriptions-item> <a-descriptions-item label="发布时间">{{ noticeDetail.publishTime }}</a-descriptions-item>
<a-descriptions-item label="定时发布">{{ noticeDetail.publishFlag ? '已发布' : '待发布' }}</a-descriptions-item> <a-descriptions-item label="发布状态">{{ noticeDetail.publishFlag ? '已发布' : '待发布' }}</a-descriptions-item>
<a-descriptions-item label="删除状态">{{ noticeDetail.deletedFlag ? '已删除' : '未删除' }}</a-descriptions-item> <a-descriptions-item label="删除状态">{{ noticeDetail.deletedFlag ? '已删除' : '未删除' }}</a-descriptions-item>
<a-descriptions-item v-if="!$lodash.isEmpty(noticeDetail.attachment)" label="附件"> <a-descriptions-item v-if="!$lodash.isEmpty(noticeDetail.attachment)" label="附件">
<div class="file-list"> <div class="file-list">

2
smart-admin-web-javascript/src/views/business/oa/notice/notice-employee-list.vue
View File

@ -35,7 +35,7 @@
</a-button-group> </a-button-group>
</a-form-item> </a-form-item>
</a-row> </a-row>
<a-row class="smart-query-form-row"> </a-row> <a-row class="smart-query-form-row" />
</a-form> </a-form>
<a-card size="small" :bordered="false"> <a-card size="small" :bordered="false">

9
smart-admin-web-javascript/src/views/business/oa/notice/notice-list.vue
View File

@ -28,7 +28,7 @@
</a-form-item> </a-form-item>
<a-form-item label="创建人" class="smart-query-form-item"> <a-form-item label="创建人" class="smart-query-form-item">
<a-input style="width: 100px" v-model:value="queryForm.createUserId" placeholder="创建人" /> <a-input style="width: 100px" v-model:value="queryForm.createUserName" placeholder="创建人" />
</a-form-item> </a-form-item>
<a-form-item label="是否删除" class="smart-query-form-item"> <a-form-item label="是否删除" class="smart-query-form-item">
@ -91,6 +91,9 @@
<template v-if="column.dataIndex === 'title'"> <template v-if="column.dataIndex === 'title'">
<a @click="toDetail(record.noticeId)">{{ text }}</a> <a @click="toDetail(record.noticeId)">{{ text }}</a>
</template> </template>
<template v-if="column.dataIndex === 'documentNumber'">
{{ text ? text : '无' }}
</template>
<template v-else-if="column.dataIndex === 'allVisibleFlag'"> {{ text ? '全部可见' : '部分可见' }} </template> <template v-else-if="column.dataIndex === 'allVisibleFlag'"> {{ text ? '全部可见' : '部分可见' }} </template>
<template v-else-if="column.dataIndex === 'publishFlag'"> <template v-else-if="column.dataIndex === 'publishFlag'">
{{ text ? '已发布' : '待发布' }} {{ text ? '已发布' : '待发布' }}
@ -145,7 +148,7 @@
noticeTypeId: undefined, //分类 noticeTypeId: undefined, //分类
keywords: '', //标题、作者、来源 keywords: '', //标题、作者、来源
documentNumber: '', //文号 documentNumber: '', //文号
createUserId: undefined, //创建人 createUserName: undefined, //创建人
deletedFlag: undefined, //删除标识 deletedFlag: undefined, //删除标识
createTimeBegin: null, //创建-开始时间 createTimeBegin: null, //创建-开始时间
createTimeEnd: null, //创建-截止时间 createTimeEnd: null, //创建-截止时间
@ -195,7 +198,7 @@
ellipsis: true, ellipsis: true,
}, },
{ {
title: '发布', title: '发布状态',
dataIndex: 'publishFlag', dataIndex: 'publishFlag',
width: 80, width: 80,
}, },

6
smart-admin-web-typescript/src/views/business/oa/notice/notice-detail.vue
View File

@ -11,17 +11,17 @@
<a-card style="margin-bottom: 15px" size="small"> <a-card style="margin-bottom: 15px" size="small">
<a-descriptions :title="noticeDetail.title" :column="4" size="small"> <a-descriptions :title="noticeDetail.title" :column="4" size="small">
<template #extra> <template #extra>
<a-button v-if="!noticeDetail.publishFlag" type="primary" size="small" @click="onEdit">编辑</a-button> <a-button type="primary" size="small" @click="onEdit">编辑</a-button>
</template> </template>
<a-descriptions-item label="分类">{{ noticeDetail.noticeTypeName }}</a-descriptions-item> <a-descriptions-item label="分类">{{ noticeDetail.noticeTypeName }}</a-descriptions-item>
<a-descriptions-item label="文号">{{ noticeDetail.documentNumber }}</a-descriptions-item> <a-descriptions-item label="文号">{{ noticeDetail.documentNumber ? noticeDetail.documentNumber : '无' }}</a-descriptions-item>
<a-descriptions-item label="来源">{{ noticeDetail.source }}</a-descriptions-item> <a-descriptions-item label="来源">{{ noticeDetail.source }}</a-descriptions-item>
<a-descriptions-item label="作者">{{ noticeDetail.author }}</a-descriptions-item> <a-descriptions-item label="作者">{{ noticeDetail.author }}</a-descriptions-item>
<a-descriptions-item label="页面浏览量">{{ noticeDetail.pageViewCount }}</a-descriptions-item> <a-descriptions-item label="页面浏览量">{{ noticeDetail.pageViewCount }}</a-descriptions-item>
<a-descriptions-item label="用户浏览量">{{ noticeDetail.userViewCount }}</a-descriptions-item> <a-descriptions-item label="用户浏览量">{{ noticeDetail.userViewCount }}</a-descriptions-item>
<a-descriptions-item label="创建时间">{{ noticeDetail.createTime }}</a-descriptions-item> <a-descriptions-item label="创建时间">{{ noticeDetail.createTime }}</a-descriptions-item>
<a-descriptions-item label="发布时间">{{ noticeDetail.publishTime }}</a-descriptions-item> <a-descriptions-item label="发布时间">{{ noticeDetail.publishTime }}</a-descriptions-item>
<a-descriptions-item label="定时发布">{{ noticeDetail.publishFlag ? '已发布' : '待发布' }}</a-descriptions-item> <a-descriptions-item label="发布状态">{{ noticeDetail.publishFlag ? '已发布' : '待发布' }}</a-descriptions-item>
<a-descriptions-item label="删除状态">{{ noticeDetail.deletedFlag ? '已删除' : '未删除' }}</a-descriptions-item> <a-descriptions-item label="删除状态">{{ noticeDetail.deletedFlag ? '已删除' : '未删除' }}</a-descriptions-item>
<a-descriptions-item v-if="!$lodash.isEmpty(noticeDetail.attachment)" label="附件"> <a-descriptions-item v-if="!$lodash.isEmpty(noticeDetail.attachment)" label="附件">
<div class="file-list"> <div class="file-list">

2
smart-admin-web-typescript/src/views/business/oa/notice/notice-employee-list.vue
View File

@ -35,7 +35,7 @@
</a-button-group> </a-button-group>
</a-form-item> </a-form-item>
</a-row> </a-row>
<a-row class="smart-query-form-row"> </a-row> <a-row class="smart-query-form-row" />
</a-form> </a-form>
<a-card size="small" :bordered="false"> <a-card size="small" :bordered="false">

9
smart-admin-web-typescript/src/views/business/oa/notice/notice-list.vue
View File

@ -28,7 +28,7 @@
</a-form-item> </a-form-item>
<a-form-item label="创建人" class="smart-query-form-item"> <a-form-item label="创建人" class="smart-query-form-item">
<a-input style="width: 100px" v-model:value="queryForm.createUserId" placeholder="创建人" /> <a-input style="width: 100px" v-model:value="queryForm.createUserName" placeholder="创建人" />
</a-form-item> </a-form-item>
<a-form-item label="是否删除" class="smart-query-form-item"> <a-form-item label="是否删除" class="smart-query-form-item">
@ -91,6 +91,9 @@
<template v-if="column.dataIndex === 'title'"> <template v-if="column.dataIndex === 'title'">
<a @click="toDetail(record.noticeId)">{{ text }}</a> <a @click="toDetail(record.noticeId)">{{ text }}</a>
</template> </template>
<template v-if="column.dataIndex === 'documentNumber'">
{{ text ? text : '无' }}
</template>
<template v-else-if="column.dataIndex === 'allVisibleFlag'"> {{ text ? '全部可见' : '部分可见' }} </template> <template v-else-if="column.dataIndex === 'allVisibleFlag'"> {{ text ? '全部可见' : '部分可见' }} </template>
<template v-else-if="column.dataIndex === 'publishFlag'"> <template v-else-if="column.dataIndex === 'publishFlag'">
{{ text ? '已发布' : '待发布' }} {{ text ? '已发布' : '待发布' }}
@ -145,7 +148,7 @@
noticeTypeId: undefined, //分类 noticeTypeId: undefined, //分类
keywords: '', //标题、作者、来源 keywords: '', //标题、作者、来源
documentNumber: '', //文号 documentNumber: '', //文号
createUserId: undefined, //创建人 createUserName: undefined, //创建人
deletedFlag: undefined, //删除标识 deletedFlag: undefined, //删除标识
createTimeBegin: null, //创建-开始时间 createTimeBegin: null, //创建-开始时间
createTimeEnd: null, //创建-截止时间 createTimeEnd: null, //创建-截止时间
@ -195,7 +198,7 @@
ellipsis: true, ellipsis: true,
}, },
{ {
title: '发布', title: '发布状态',
dataIndex: 'publishFlag', dataIndex: 'publishFlag',
width: 80, width: 80,
}, },