xgxt_sd/zhxg_pc
12
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

Browse Source
This commit is contained in:
曹贼
2025-08-13 11:30:49 +08:00
parent 163190abe8 1c34579ebf
commit 3c451db37c
10 changed files with 1161 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/api/routine/NotificationManagement.js Normal file
View File

@@ -0,0 +1,83 @@
import request from '@/utils/request'
// 查询通知管理列表
export function listNotificationManagement(query) {
return request({
url: '/routine/NotificationManagement/list',
method: 'get',
params: query
})
}
// 查询通知管理详细
export function getNotificationManagement(id) {
return request({
url: '/routine/NotificationManagement/' + id,
method: 'get'
})
}
// 新增通知管理
export function addNotificationManagement(data) {
return request({
url: '/routine/NotificationManagement/add',
method: 'post',
data: data
})
}
// 修改通知管理
export function updateNotificationManagement(data) {
return request({
url: '/routine/NotificationManagement/update',
method: 'post',
data: data
})
}
// 删除通知管理
export function delNotificationManagement(id) {
return request({
url: '/routine/NotificationManagement/' + id,
method: 'post'
})
}
// 批量修改通知管理
export function batchUpdateNotificationManagement(data) {
return request({
url: '/routine/NotificationManagement/batchUpdate',
method: 'post',
data: data
})
}
// 获取年级列表
export function getGradeList() {
return request({
url: '/routine/NotificationManagement/gradeList',
method: 'get'
})
}
// 按年级发送通知
export function sendNotificationByGrades(data) {
return request({
url: '/routine/NotificationManagement/sendByGrades',
method: 'post',
data: data
})
}
// 查询当前用户发送的通知列表
export function listMySentNotifications(query) {
return request({
url: '/routine/NotificationManagement/my-sent',
method: 'get',
params: query
})
}

18
src/api/routine/stuIdReissue.js
View File

@@ -90,7 +90,23 @@ export function updateStuIdReissue(data) {
// 删除学生证补办
export function delStuIdReissue(id) {
return request({
url: '/routine/stuIdReissue/' + id,
url: '/routine/stuIdReissue/cancel/' + id,
method: 'post'
})
}
// 获取学生证补办审核状态
export function getStuIdReissueStatus(stuNo) {
return request({
url: '/routine/stuIdReissue/getStatus/' + stuNo,
method: 'get'
})
}
// 完成制作
export function completedStuIdReissue(id) {
return request({
url: '/routine/stuIdReissue/completed/' + id,
method: 'post'
})
}

10
src/api/routine/stuMultiLevelReview.js
View File

@@ -54,3 +54,13 @@ export function delStuMultiLevelReview(id) {
method: 'post'
})
}
// 更新审核信息并同时更新学生证补办状态
export function updateStuMultiLevelReviewWithStuIdReissue(data) {
return request({
url: '/routine/stuMultiLevelReview/updateWithStuIdReissue',
method: 'post',
data: data
})
}

8
src/api/stuCQS/process-center/msg.js
View File

@@ -45,3 +45,11 @@ export function delMsg(id) {
method: 'post'
})
}
// 根据学号查询用户ID
export function getUserIdByStuNo(stuNo) {
return request({
url: '/system/msg/getUserIdByStuNo/' + stuNo,
method: 'get'
})
}

23
src/utils/request.js
View File

@@ -112,8 +112,31 @@ service.interceptors.response.use(res => {
},
error => {
console.log('err' + error)
// 判断是否是请求取消错误
const isCanceled = error && (
error.code === 'ERR_CANCELED' ||
error.code === 'ECONNABORTED' ||
error.message === 'canceled' ||
error.message === 'Cancel' ||
error.__CANCEL__ === true ||
(typeof error.message === 'string' && /cancel/i.test(error.message))
);
// 如果是请求取消，直接返回，不显示错误消息
if (isCanceled) {
console.log('请求被取消，忽略该错误');
return Promise.reject(error);
}
let { message } = error;
if (message == "Network Error") {
// 进一步判断是否真的是网络错误，还是页面卸载导致的
if (window.performance && window.performance.navigation.type === 1) {
// 页面刷新导致的，忽略
console.log('页面刷新导致的网络错误，已忽略');
return Promise.reject(error);
}
message = "后端接口连接异常";
Message({ message: message, type: 'error', duration: 5 * 1000 })
} else if (message.includes("timeout")) {

385
src/views/Home/index-new-blue.vue
View File

@@ -8,57 +8,57 @@
<div class="text-list">
<div>
<div>姓名:</div>
<div>姓名：</div>
<div id="nickname">{{ user.nickName }}</div>
</div>
<div>
<div>用户名称:</div>
<div>用户名称：</div>
<div>{{ user.userName }}</div>
</div>
<div>
<div>手机号码:</div>
<div>手机号码：</div>
<div>{{ user.phonenumber }}</div>
</div>
<div>
<div>用户邮箱:</div>
<div>用户邮箱：</div>
<div>{{ user.email }}</div>
</div>
<!-- <div>
<div>所属部门:</div>
<div>所属部门：</div>
<div>{{ user.dept.deptName }} / {{ postGroup }}</div>
</div> -->
<div>
<div>所属角色:</div>
<div>所属角色：</div>
<div>{{ displayRole(roleGroup) }}</div>
</div>
</div>
</div>
<div>
<div style="overflow: hidden;text-overflow: ellipsis">
<div class="home-page-title">
<div>我的消息</div>
<div>更多 <span>></span></div>
<div @click="showMessageDialog" style="cursor: pointer;">更多 <span>></span></div>
</div>
<div>
<div class="home-page-content">
<div v-if="!isEmpty(msg_list)" v-for="(v, i) in msg_list" :key="i">
<div v-if="!isEmpty(msg_list)" v-for="(v, i) in msg_list" :key="i" class="message-item" @click="showMessageDetail(v, i)">
<div>{{ v.content }}</div>
<!-- <div>2024-09-24</div>-->
</div>
<!-- <div v-else>
</div>
<div v-else>
暂无消息
</div> -->
</div>
</div>
</div>
</div>
<div>
<div style="overflow: hidden;text-overflow: ellipsis">
<div class="home-page-title">
<div>公示栏</div>
<div>更多 <span>></span></div>
<div @click="showAnnouncementDialog" style="cursor: pointer;">更多 <span>></span></div>
</div>
<div>
<div class="home-page-content">
<div v-for="(v, i) in comp_list.slice(0, 9)" :key="i">
<div v-for="(v, i) in comp_list.slice(0, 9)" :key="i" class="announcement-item" @click="showAnnouncementDetail(v, i)">
<div>{{ v.submitterName }}--{{ v.projectName }} -- 审核通过</div>
<div>{{ formatTime(v.createTime) }}</div>
</div>
@@ -236,8 +236,107 @@
<jwc-bottom v-if="checkPermi(['home:xg:undo1'])" v-hasPermi="['home:xg:undo1']" ref="child10" />
<sjUndo v-if="checkPermi(['home:sj:undo1'])" v-hasPermi="['home:sj:undo1']" ref="child11" />
</div>
<!-- 我的消息详情对话框 -->
<el-dialog
title="我的消息详情"
:visible.sync="messageDialogVisible"
width="80%"
:show-close="true"
:close-on-click-modal="false"
:close-on-press-escape="false">
<div class="message-dialog-content">
<el-table :data="msg_list" style="width: 100%" max-height="400">
<el-table-column prop="content" label="消息内容" min-width="200">
<template slot-scope="scope">
<div class="message-content clickable-row" @click="viewMessageDetail(scope.row)">{{ scope.row.content }}</div>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="180" align="center">
<template slot-scope="scope">
{{ formatTime(scope.row.createTime) }}
</template>
</el-table-column>
</el-table>
<div v-if="isEmpty(msg_list)" class="empty-data">
<i class="el-icon-info"></i>
<p>暂无消息数据</p>
</div>
</div>
</el-dialog>
<!-- 公示栏详情对话框 -->
<el-dialog
title="公示栏详情"
:visible.sync="announcementDialogVisible"
width="80%"
:show-close="true"
:close-on-click-modal="false"
:close-on-press-escape="false">
<div class="announcement-dialog-content">
<el-table :data="comp_list" style="width: 100%" max-height="400">
<el-table-column prop="submitterName" label="提交人" width="120" align="center" />
<el-table-column prop="projectName" label="项目名称" min-width="200">
<template slot-scope="scope">
<div class="project-name clickable-row" @click="viewAnnouncementDetail(scope.row)">{{ scope.row.projectName }}</div>
</template>
</el-table-column>
<el-table-column label="状态" width="100" align="center">
<template slot-scope="scope">
<el-tag type="success" size="small">审核通过</el-tag>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" width="180" align="center">
<template slot-scope="scope">
{{ formatTime(scope.row.createTime) }}
</template>
</el-table-column>
</el-table>
<div v-if="isEmpty(comp_list)" class="empty-data">
<i class="el-icon-info"></i>
<p>暂无公示数据</p>
</div>
</div>
</el-dialog>
<!-- 消息详情模态框 -->
<div v-if="messageDetailVisible" class="detail-modal-overlay" @click.self="hideMessageDetail">
<div class="detail-modal-content">
<div class="detail-modal-header">
<h4>消息详情</h4>
<div class="detail-time" v-if="currentMessageDetail.createTime">
{{ formatTime(currentMessageDetail.createTime) }}
</div>
<button class="detail-close-btn" @click="hideMessageDetail">&times;</button>
</div>
<div class="detail-modal-body">
<div class="detail-content-section">
<div class="detail-content-text">{{ currentMessageDetail.content || '暂无内容' }}</div>
</div>
</div>
</div>
</div>
<!-- 公示详情模态框 -->
<div v-if="announcementDetailVisible" class="detail-modal-overlay" @click.self="hideAnnouncementDetail">
<div class="detail-modal-content">
<div class="detail-modal-header">
<h4>公示详情</h4>
<div class="detail-time" v-if="currentAnnouncementDetail.createTime">
{{ formatTime(currentAnnouncementDetail.createTime) }}
</div>
<button class="detail-close-btn" @click="hideAnnouncementDetail">&times;</button>
</div>
<div class="detail-modal-body">
<div class="detail-content-section">
<div class="detail-content-text">{{ currentAnnouncementDetail.projectName || '暂无项目名称' }} - {{ currentAnnouncementDetail.submitterName || '暂无提交人' }} - 审核通过</div>
</div>
</div>
</div>
</div>
</div>
</template>
<style scoped lang="scss">
.home-main-box {
padding: 20px;
@@ -480,6 +579,191 @@
.going:hover {
opacity: 0.8;
}
/* 对话框样式 */
.message-dialog-content,
.announcement-dialog-content {
.message-content,
.project-name {
max-width: 300px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.clickable-row {
cursor: pointer;
transition: all 0.3s ease;
padding: 4px 8px;
border-radius: 4px;
&:hover {
background-color: rgba(0, 0, 0, 0.05);
}
}
.empty-data {
text-align: center;
padding: 40px 0;
color: #999;
i {
font-size: 48px;
margin-bottom: 16px;
display: block;
}
p {
margin: 0;
font-size: 14px;
}
}
}
/* 对话框表格样式优化 */
.el-dialog__body {
padding: 20px;
}
.el-table {
.el-table__header-wrapper {
th {
background-color: #f5f7fa;
color: #606266;
font-weight: 600;
}
}
.el-table__row {
&:hover {
background-color: #f5f7fa;
}
}
}
/* 消息和公示项目的悬停样式 */
.message-item,
.announcement-item {
cursor: pointer;
transition: all 0.3s ease;
padding: 4px 8px;
border-radius: 4px;
margin-bottom: 2px;
&:hover {
background-color: rgba(0, 0, 0, 0.05);
transform: translateX(2px);
}
}
/* 详情模态框样式 */
.detail-modal-overlay {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
display: flex;
justify-content: center;
align-items: center;
z-index: 9999;
animation: fadeIn 0.3s ease-out;
}
.detail-modal-content {
background: white;
border-radius: 8px;
box-shadow: 0 4px 20px rgba(0, 0, 0, 0.15);
width: 90%;
max-width: 800px;
max-height: 70vh;
overflow-y: auto;
animation: slideInScale 0.3s ease-out;
.detail-modal-header {
background: white;
color: #333;
padding: 10px 24px;
border-bottom: 1px solid #eee;
border-radius: 8px 8px 0 0;
display: flex;
justify-content: space-between;
align-items: center;
position: relative;
h4 {
margin: 0;
font-size: 18px;
font-weight: 600;
color: #333;
}
.detail-time {
position: absolute;
top: 50px;
left: 24px;
font-size: 14px;
color: #666;
margin-top: 8px;
}
.detail-close-btn {
background: none;
border: none;
color: #666;
font-size: 24px;
cursor: pointer;
padding: 0;
width: 30px;
height: 30px;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
transition: all 0.3s;
&:hover {
background-color: #f5f5f5;
color: #333;
}
}
}
.detail-modal-body {
padding: 24px;
padding-top: 40px; // 为标题下方的时间留出空间
.detail-content-section {
.detail-content-text {
font-size: 16px;
line-height: 1.6;
color: #333;
word-break: break-word;
}
}
}
}
/* 模态框动画效果 */
@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes slideInScale {
from {
opacity: 0;
transform: scale(0.9) translateY(-20px);
}
to {
opacity: 1;
transform: scale(1) translateY(0);
}
}
</style>
<script>
@@ -504,7 +788,6 @@ import sjUndo from "./comps/sj-undo.vue";
import { isEmpty } from "@/api/helpFunc";
import { checkPermi } from "@/utils/permission";
export default {
components: {
JwcUndo, XwUndo, FdyUndo, StuUndo,
@@ -597,17 +880,68 @@ export default {
}
},
async listMyMsg() {
let res = await listMsg();
// 获取当前登录用户的ID
const userId = this.user.userId;
console.log("userId", userId);
let res = await listMsg({receiver: userId});
if (res.rows.length > 0) {
this.have_msg = true;
this.msg_list = [...res.rows];
}
},
// 显示我的消息详情对话框
showMessageDialog() {
this.messageDialogVisible = true;
},
// 查看消息详情 - 统一处理函数
viewMessageDetail(row) {
this.currentMessageDetail = row;
this.messageDetailVisible = true;
},
// 显示消息详情 - 从首页点击进入
showMessageDetail(messageData, index) {
this.currentMessageDetail = messageData;
this.currentMessageIndex = index;
this.messageDetailVisible = true;
},
// 隐藏消息详情
hideMessageDetail() {
this.messageDetailVisible = false;
this.currentMessageDetail = {};
this.currentMessageIndex = -1;
},
// 显示公示详情 - 从首页点击进入
showAnnouncementDetail(announcementData, index) {
this.currentAnnouncementDetail = announcementData;
this.currentAnnouncementIndex = index;
this.announcementDetailVisible = true;
},
// 隐藏公示详情
hideAnnouncementDetail() {
this.announcementDetailVisible = false;
this.currentAnnouncementDetail = {};
this.currentAnnouncementIndex = -1;
},
// 显示公示栏详情对话框
showAnnouncementDialog() {
this.announcementDialogVisible = true;
},
// 查看公示详情 - 统一处理函数
viewAnnouncementDetail(row) {
this.currentAnnouncementDetail = row;
this.announcementDetailVisible = true;
},
},
data() {
return {
isEmpty,
@@ -623,6 +957,18 @@ export default {
avatar: null,
// 对话框可见性控制
messageDialogVisible: false,
announcementDialogVisible: false,
// 详情模态框控制
messageDetailVisible: false,
announcementDetailVisible: false,
currentMessageDetail: {},
currentAnnouncementDetail: {},
currentMessageIndex: -1,
currentAnnouncementIndex: -1,
tableData: [{
date: '2016-05-03',
name: '王小虎',
@@ -655,5 +1001,4 @@ export default {
}
}
}
</script>
</script>

306
src/views/routine/NotificationManagement/index.vue Normal file
View File

@@ -0,0 +1,306 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="内容" prop="content">
<el-input v-model="queryParams.content" placeholder="请输入通知内容" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['routine:NotificationManagement:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
v-hasPermi="['routine:NotificationManagement:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['routine:NotificationManagement:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['routine:NotificationManagement:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="NotificationManagementList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" type="index" align="center" prop="id" />
<el-table-column label="年级" align="center" prop="gradeName" />
<el-table-column label="标题" align="center" prop="title" />
<el-table-column label="消息内容" align="center" prop="content" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['routine:NotificationManagement:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['routine:NotificationManagement:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<!-- 添加或修改通知管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<!-- 发送方式选择 -->
<el-form-item label="发送方式" prop="sendType">
<el-radio-group v-model="form.sendType" @change="handleSendTypeChange">
<el-radio label="grade">按年级发送</el-radio>
</el-radio-group>
</el-form-item>
<!-- 年级多选 -->
<el-form-item v-if="form.sendType === 'grade'" label="选择年级" prop="selectedGrades">
<el-select v-model="form.selectedGrades" multiple placeholder="请选择年级" style="width: 100%">
<el-option v-for="grade in gradeList" :key="grade.value" :label="grade.label" :value="grade.value" />
</el-select>
</el-form-item>
<el-form-item label="标题" prop="title">
<el-input v-model="form.title" placeholder="请输入标题" />
</el-form-item>
<el-form-item label="消息内容" prop="content">
<el-input v-model="form.content" type="textarea" :rows="4" placeholder="请输入消息内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">发送</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listMySentNotifications, getNotificationManagement, delNotificationManagement, addNotificationManagement, updateNotificationManagement, getGradeList, sendNotificationByGrades } from "@/api/routine/NotificationManagement";
export default {
name: "NotificationManagement",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 通知管理表格数据
NotificationManagementList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 年级列表
gradeList: [],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
sender: null,
},
// 表单参数
form: {},
// 表单校验
rules: {
sendType: [
{ required: true, message: "请选择发送方式", trigger: "change" }
],
title: [
{ required: true, message: "请输入标题", trigger: "blur" }
],
content: [
{ required: true, message: "请输入消息内容", trigger: "blur" }
]
}
};
},
created() {
this.getList();
this.getGradeList();
},
methods: {
/** 查询当前用户通知管理列表 */
getList() {
this.loading = true;
listMySentNotifications(this.queryParams).then(response => {
this.NotificationManagementList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
sender: null,
receiver: null,
title: null,
content: null,
sendType: 'user',
selectedGrades: [],
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加通知管理";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getNotificationManagement(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改通知管理";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
// 验证发送方式对应的必填字段
if (this.form.sendType === 'user' && !this.form.receiver) {
this.$modal.msgError("请输入收信人用户学号");
return;
}
if (this.form.sendType === 'grade' && (!this.form.selectedGrades || this.form.selectedGrades.length === 0)) {
this.$modal.msgError("请选择年级");
return;
}
if (this.form.id != null) {
// 修改操作
updateNotificationManagement(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
// 新增操作
// 新增操作
if (this.form.sendType === 'grade') {
// 按年级发送
// 创建一个临时div来提取纯文本
const tempDiv = document.createElement('div');
tempDiv.innerHTML = this.form.content;
const plainText = tempDiv.textContent || tempDiv.innerText || '';
// 提取标题的纯文本
const titleDiv = document.createElement('div');
titleDiv.innerHTML = this.form.title || '';
const plainTitle = titleDiv.textContent || titleDiv.innerText || '';
const data = {
title: plainTitle, // 添加标题字段
content: plainText, // 使用纯文本
selectedGrades: this.form.selectedGrades
};
sendNotificationByGrades(data).then(response => {
this.$modal.msgSuccess("通知发送成功");
this.open = false;
this.getList();
});
}
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除通知管理编号为"' + ids + '"的数据项？').then(function () {
return delNotificationManagement(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
},
/** 导出按钮操作 */
handleExport() {
this.download('NotificationManagement/NotificationManagement/export', {
...this.queryParams
}, `NotificationManagement_${new Date().getTime()}.xlsx`)
},
/** 获取年级列表 */
getGradeList() {
getGradeList().then(response => {
// 假设后端返回的数据格式为 [{ gradeId: 1, gradeName: "2021级" }, ...]
// 转换为下拉框需要的格式
this.gradeList = response.data.map(item => ({
value: item.gradeId || item.id,
label: item.gradeName || item.name
}));
}).catch(() => {
// 如果接口不存在，使用默认数据
this.gradeList = [
{ value: '2022', label: '2022级' },
{ value: '2023', label: '2023级' },
{ value: '2024', label: '2024级' }
];
});
},
/** 发送方式改变时的处理 */
handleSendTypeChange(value) {
// 清空相关字段
if (value === 'user') {
this.form.selectedGrades = [];
} else if (value === 'grade') {
this.form.receiver = null;
}
// 重新设置表单验证规则
this.$nextTick(() => {
this.$refs.form && this.$refs.form.clearValidate();
});
}
}
};
</script>

262
src/views/routine/stuIdReissue/index.vue
View File

@@ -6,6 +6,7 @@
<el-step title="辅导员审核" :description="changeActive(form.inspectionProgress)"></el-step>
<el-step title="学工处理"
:description="`${form.isPay === 0 ? '未缴费:' : '已缴费,备注:'}` + `${$route.query.jwcCmt ? $route.query.jwcCmt : '等待缴费,记录缴费金额'}`"></el-step>
<el-step title="完成制作" :description="getCompletionDescription()"></el-step>
</el-steps>
</el-card>
<el-card class="box-card" style="margin-top: 20px;">
@@ -65,6 +66,14 @@
</el-card>
<el-card class="box-card" style="margin-top: 20px;">
<div class="titleNav">办理状态</div>
<div style="margin-bottom: 20px;">
<el-tag v-if="form.inspectionProgress >= 3" type="success">已完成制作</el-tag>
<el-tag v-else-if="form.inspectionProgress >= 2" type="warning">学工处理中</el-tag>
<el-tag v-else-if="form.inspectionProgress >= 1" type="primary">辅导员审核中</el-tag>
<el-tag v-else-if="form.inspectionProgress === 0" type="info">待审核</el-tag>
<el-tag v-else type="danger">申请被驳回</el-tag>
</div>
<div class="titleNav">办理信息</div>
<el-form ref="form" :model="form" :rules="rules" label-width="90px">
<div class="formItem">
@@ -109,20 +118,33 @@
</el-form>
</el-card>
<div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
<el-button v-if="active === 0" type="primary" @click="submitForm(1)">提交申请</el-button>
<el-button v-if="finishStatus !== 'success' || form.inspectionProgress === 0" type="primary"
<!-- 新申请时显示提交申请按钮 -->
<el-button v-if="!form.id" type="primary" @click="submitForm(1)">提交申请</el-button>
<!-- 已有申请但未完成制作时显示修改提交申请按钮 -->
<el-button v-if="form.id && form.inspectionProgress < 3" type="primary"
@click="submitForm(1)">修改提交申请</el-button>
<!-- 已完成制作时显示继续提交申请按钮 -->
<el-button v-if="form.id && form.inspectionProgress >= 3" type="primary"
@click="submitNewApplication">继续提交申请</el-button>
<!-- 未完成制作时显示取消申请按钮 -->
<el-button v-if="form.id && form.inspectionProgress < 3"
type="danger" @click="cancelApplication">取消申请</el-button>
<!-- 已完成制作时显示取消申请按钮（不可点击） -->
<el-button v-if="form.id && form.inspectionProgress >= 3"
type="info" disabled @click="showCompletedMessage">当前审核已完成，不可取消</el-button>
<el-button type="primary" @click="printing">打印学生证申请表</el-button>
<!-- <el-button v-if="active === 1 && showRole <= 3" type="primary"
@click="auditInformation(2, '辅导员')">审核信息</el-button>
<el-button v-if="active === 2 && showRole <= 2" type="primary" @click="payment(3, '学工')">登记缴费金额</el-button> -->
<el-button @click="$router.push('/routine/sicr/stuIdReissueLIst')">返 回</el-button>
</div>
</div>
</template>
<script>
import { getStuIdReissue, addStuIdReissue, updateStuIdReissue, getStudentInfoByStuId } from "@/api/routine/stuIdReissue";
import { getStuIdReissue, addStuIdReissue, updateStuIdReissue, getStudentInfoByStuId, getStuIdReissueStatus, delStuIdReissue } from "@/api/routine/stuIdReissue";
import { listClass } from "@/api/stuCQS/basedata/class";
import {
pcaTextArr, // 省市区联动数据,纯汉字
@@ -176,7 +198,7 @@ export default {
]
},
// 申请进展
active: 0,
active: 1,
showRole: 0,
// 查询到的审核信息
stuMultiLevelReview: {},
@@ -196,7 +218,7 @@ export default {
immediate: true,
handler() {
this.form = {}
this.active = 0
this.active = 1
this.finishStatus = 'success'
if (this.$route.query.id !== undefined) {
this.handleUpdate()
@@ -214,6 +236,7 @@ export default {
this.isDisabled = false
this.isDisabledStuNo = false
this.finishStatus = 'success'
this.active = 1
}
}
}
@@ -258,19 +281,61 @@ export default {
className: this.form.className
}).then(response => {
// this.classList = response.rows;
this.form.counsellorName = response.rows[0].teacher.name
this.form.counsellorId = response.rows[0].teacher.teacherId
if (response.rows && response.rows.length > 0 && response.rows[0].teacher) {
this.form.counsellorName = response.rows[0].teacher.name
this.form.counsellorId = response.rows[0].teacher.teacherId
} else {
console.warn('未找到班级信息或辅导员信息');
}
}).catch(error => {
console.error('查询班级信息失败:', error);
});
});
},
// 进度变化时改变文字提示
changeActive(active) {
if (active === -1) {
return '申请被驳回,备注:申请不通过,' + this.$route.query.fdyCmt
} else if (active >= 1) {
return '申请通过,备注:' + this.$route.query.fdyCmt
const progress = Number(this.form.inspectionProgress);
if (progress === -1) {
return '申请被驳回,备注:申请不通过,' + this.$route.query.fdyCmt;
} else if (progress === 0) {
return '辅导员审核学生补办请求通不通过';
} else if (progress === 1) {
return '申请通过,备注:' + this.$route.query.fdyCmt;
} else if (progress === 2) {
return '学工处理中,备注:' + (this.$route.query.jwcCmt || '等待缴费,记录缴费金额');
} else if (progress >= 3) {
return '已完成制作,备注:学生证制作完成';
} else {
return '辅导员审核学生补办请求通不通过'
return '辅导员审核学生补办请求通不通过';
}
},
// 根据inspectionProgress确定当前步骤
calculateActive() {
const progress = Number(this.form.inspectionProgress);
console.log('调试信息 - calculateActive中的progress:', progress, '类型:', typeof progress);
if (progress >= 3) {
console.log('调试信息 - 返回步骤4 (完成制作)');
return 4; // 完成制作时返回4，对应步骤条的最后一个步骤
} else if (progress >= 2) {
console.log('调试信息 - 返回步骤3 (学工处理)');
return 3; // 学工处理
} else if (progress >= 1) {
console.log('调试信息 - 返回步骤2 (辅导员审核)');
return 2; // 辅导员审核
} else {
console.log('调试信息 - 返回步骤1 (学生申请)');
return 1; // 学生申请
}
},
// 获取完成制作步骤的动态描述
getCompletionDescription() {
const progress = Number(this.form.inspectionProgress);
if (progress >= 3) {
return '学生证制作已完成，请及时领取';
} else if (progress >= 2) {
return '等待学工完成学生证制作';
} else {
return '学工完成学生证制作';
}
},
// 取消按钮
@@ -291,7 +356,7 @@ export default {
jg: null,
hksz2: null
};
this.active = 0
this.active = 1
this.resetForm("form");
},
/** 重置按钮操作 */
@@ -307,12 +372,27 @@ export default {
this.form = response.data;
this.form.studentName = this.form.stuName
// this.form.stuName = this.form.studentName
console.log('调试信息 - inspectionProgress:', response.data.inspectionProgress, '类型:', typeof response.data.inspectionProgress);
console.log('调试信息 - calculateActive():', this.calculateActive());
if (response.data.inspectionProgress === -1) {
this.active = 2
this.active = 1; // 驳回时显示学生申请步骤
this.finishStatus = 'error'
} else {
this.active = +response.data.inspectionProgress + 1
// console.log(this.active);
this.active = this.calculateActive();
// 根据审核进度设置完成状态
if (Number(response.data.inspectionProgress) >= 3) {
this.finishStatus = 'success'
} else if (Number(response.data.inspectionProgress) >= 0) {
this.finishStatus = 'success'
} else {
this.finishStatus = 'error'
}
}
console.log('调试信息 - active:', this.active, '类型:', typeof this.active);
console.log('调试信息 - finishStatus:', this.finishStatus);
console.log('调试信息 - 步骤条配置检查 - active值应为3时:', this.active === 3, 'finishStatus:', this.finishStatus);
// 地区转换
this.form.nativePlace = this.form.jg !== null ? this.parseSelectedPath(this.form.jg) : '暂无填写'
// 地区转换
@@ -328,29 +408,100 @@ export default {
if (valid) {
if (this.form.id != null) {
updateStuIdReissue(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.active = active
this.finishStatus = 'success'
this.isDisabled = true
// this.$router.replace({ inspectionProgress: this.form.inspectionProgress });
// 修改成功后修改路上参数
this.$router.push({ path: this.$route.path, query: { id: this.form.id, stuNo: this.form.stuNo, inspectionProgress: this.form.inspectionProgress } });
this.$modal.closeLoading()
console.log('修改响应:', response);
if (response.code === 200) {
this.$modal.msgSuccess("修改成功");
this.active = active
this.finishStatus = 'success'
this.isDisabled = true
// 修改成功后修改路由参数
this.$router.push({ path: this.$route.path, query: { id: this.form.id, stuNo: this.form.stuNo, inspectionProgress: this.form.inspectionProgress } });
}
// 移除else分支，让全局拦截器处理所有非200的情况
}).catch(error => {
this.$modal.closeLoading()
console.log('修改捕获到错误 - error:', error);
// 如果error是字符串'error'，说明是全局拦截器返回的Promise.reject('error')
// 这种情况下，全局拦截器已经显示了错误信息，这里不再重复显示
if (error === 'error') {
console.log('修改业务错误已由全局拦截器处理');
return;
}
// 忽略由于路由跳转/刷新导致的请求取消错误，避免误报网络错误
const isCanceled = error && (
error.code === 'ERR_CANCELED' ||
error.message === 'canceled' ||
error.message === 'Cancel' ||
error.__CANCEL__ === true ||
(typeof error.message === 'string' && /cancel/i.test(error.message))
);
if (isCanceled) {
console.log('请求被取消，已忽略该错误提示');
return;
}
// 只处理真正的网络错误
if (!error.response) {
this.$modal.msgError("网络连接失败，请检查网络");
}
});
} else {
addStuIdReissue(this.form).then(response => {
if (response.code === 500) {
this.$modal.closeLoading()
return
}
else {
this.$modal.closeLoading()
console.log('提交响应:', response);
if (response.code === 200) {
this.$modal.msgSuccess("提交申请成功");
this.active = active
// this.reset()
this.$modal.closeLoading()
this.finishStatus = 'success'
this.isDisabled = true
// 新增成功后跳转到详情页面
console.log('提交成功，更新表单状态');
this.form.inspectionProgress = 0;
// 设置表单ID（如果后端返回了ID）
if (response.data && response.data.id) {
this.form.id = response.data.id;
}
// 更新路由参数，不刷新页面
setTimeout(() => {
this.$message.info('申请提交成功');
// 使用replace更新路由，避免强制刷新
if (this.form.id) {
this.$router.replace({
path: this.$route.path,
query: {
id: this.form.id,
stuNo: this.form.stuNo,
inspectionProgress: this.form.inspectionProgress
}
});
}
}, 1000);
}
}).catch(error => {
this.$modal.closeLoading()
console.log('提交捕获到错误 - error:', error);
// 如果error是字符串'error'，说明是全局拦截器返回的Promise.reject('error')
// 这种情况下，全局拦截器已经显示了错误信息，这里不再重复显示
if (error === 'error') {
console.log('提交业务错误已由全局拦截器处理');
return;
}
// 忽略由于路由跳转/刷新导致的请求取消错误
const isCanceled = error && (
error.code === 'ERR_CANCELED' ||
error.message === 'canceled' ||
error.message === 'Cancel' ||
error.__CANCEL__ === true ||
(typeof error.message === 'string' && /cancel/i.test(error.message))
);
if (!error.response) {
this.$modal.msgError("网络连接失败，请检查网络");
}
});
}
} else {
this.$modal.closeLoading()
this.$modal.msgError("请完善必填信息");
}
});
},
@@ -388,6 +539,51 @@ export default {
listId: this.form.id || null,
},
})
},
// 继续提交申请（已完成制作后可重新申请）
submitNewApplication() {
this.$confirm('您已完成制作，是否要重新提交新的申请？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// 重置表单为新申请状态
this.reset();
this.isDisabled = false;
this.isDisabledStuNo = false;
this.finishStatus = 'success';
this.active = 1;
// 清除路由参数，进入新申请模式
this.$router.push({ path: this.$route.path });
this.$message.success('已重置为新申请状态，请填写申请信息');
}).catch(() => {
this.$message.info('已取消操作');
});
},
// 取消申请
cancelApplication() {
this.$confirm('确认要取消此申请吗？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
// 调用删除接口
this.$modal.loading('正在取消申请...');
delStuIdReissue(this.form.id).then(response => {
this.$modal.closeLoading();
this.$modal.msgSuccess('申请已取消');
// 返回列表页面
this.$router.push('/routine/sicr/stuIdReissueLIst');
}).catch(() => {
this.$modal.closeLoading();
});
}).catch(() => {
this.$message.info('已取消操作');
});
},
// 显示已完成消息
showCompletedMessage() {
this.$message.info('当前审核已完成，不可取消');
}
}
};

15
src/views/routine/stuIdReissue/reissuerLIst.vue
View File

@@ -15,6 +15,7 @@
<el-option label="学生提交申请" value="0"></el-option>
<el-option label="辅导员通过" value="1"></el-option>
<el-option label="学工通过" value="2"></el-option>
<el-option label="完成制作" value="3"></el-option>
</el-select>
<!-- <el-input v-model="queryParams.inspectionProgress" placeholder="请输入审核状态" clearable
@keyup.enter.native="handleQuery" /> -->
@@ -72,11 +73,13 @@
<el-tag type="danger" v-if="scope.row.inspectionProgress === 0">未审核</el-tag>
<el-tag type="success" v-else-if="scope.row.inspectionProgress === 1">辅导员通过</el-tag>
<el-tag type="success" v-else-if="scope.row.inspectionProgress === 2">学工通过</el-tag>
<el-tag type="success" v-else-if="scope.row.inspectionProgress === 3">完成制作</el-tag>
<el-tag type="danger" v-else>辅导员驳回</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['routine:stuIdReissue:edit']" v-if="showRole !== 4">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -122,6 +125,8 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -177,7 +182,7 @@ export default {
{ val: 1, name: '辅导员通过' },
{ val: 2, name: '学工通过' }
],
showRole: '',
showRole: ''
};
},
created() {
@@ -310,8 +315,8 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
if (row.inspectionProgress > 0) {
this.$message.error('正在审核中，无法取消')
if (row.inspectionProgress >= 3) {
this.$message.error('当前审核已完成，不可取消')
return
}
this.$modal.confirm('是否确认取消学生证补办申请编号为"' + ids + '"的数据项？').then(function () {
@@ -347,7 +352,9 @@ export default {
} else {
this.getList();
}
}
},
}
};
</script>

111
src/views/routine/stuMultiLevelReview/index.vue
View File

@@ -69,11 +69,14 @@
<el-tag type="danger" v-if="scope.row.reviewerStatus === 0">未审核</el-tag>
<el-tag type="success" v-else-if="scope.row.reviewerStatus === 1">辅导员通过</el-tag>
<el-tag type="success" v-else-if="scope.row.reviewerStatus === 2">学工处通过</el-tag>
<el-tag type="success" v-else-if="scope.row.reviewerStatus === 3">完成制作</el-tag>
<el-tag type="danger" v-else>辅导员驳回</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="handleCompleted(scope.row)"
v-hasPermi="['routine:stuMultiLevelReview:completed']" v-if="scope.row.reviewerStatus === 2">完成制作</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['routine:stuMultiLevelReview:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
@@ -118,11 +121,32 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<!-- 完成制作对话框 -->
<el-dialog title="完成制作" :visible.sync="completedOpen" width="500px" append-to-body>
<el-form ref="completedForm" :model="completedForm" :rules="completedRules" label-width="80px">
<el-form-item label="学生姓名" prop="stuName">
<el-input v-model="completedForm.stuName" :disabled="true" />
</el-form-item>
<el-form-item label="学生学号" prop="stuNo">
<el-input v-model="completedForm.stuNo" :disabled="true" />
</el-form-item>
<el-form-item label="通知消息" prop="messageContent">
<el-input v-model="completedForm.messageContent" type="textarea" placeholder="请输入发送给学生的通知消息" :rows="4" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitCompleted">确 定</el-button>
<el-button @click="cancelCompleted">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listStuMultiLevelReview, getStuMultiLevelReview, delStuMultiLevelReview, addStuMultiLevelReview, updateStuMultiLevelReview } from "@/api/routine/stuMultiLevelReview";
import { listStuMultiLevelReview, getStuMultiLevelReview, delStuMultiLevelReview, addStuMultiLevelReview, updateStuMultiLevelReviewWithStuIdReissue} from "@/api/routine/stuMultiLevelReview";
import { getUserIdByStuNo, addMsg } from "@/api/stuCQS/process-center/msg";
import { getUserProfile } from "@/api/system/user"; // 获取当前用户接口
export default {
name: "StuMultiLevelReview",
@@ -146,6 +170,8 @@ export default {
title: "",
// 是否显示弹出层
open: false,
// 是否显示完成制作弹出层
completedOpen: false,
// 查询参数
queryParams: {
pageNum: 1,
@@ -163,6 +189,13 @@ export default {
},
// 表单参数
form: {},
// 完成制作表单参数
completedForm: {
stuName: null,
stuNo: null,
reason: null,
messageContent: "你申请办理的学生证制作完成，长堽校区前往xxx领取，里建校区前往xxx领取"
},
// 表单校验
rules: {
stuName: [
@@ -175,6 +208,12 @@ export default {
{ required: true, message: "申请原因不能为空", trigger: "blur" }
],
},
// 完成制作表单校验
completedRules: {
messageContent: [
{ required: true, message: "通知消息不能为空", trigger: "blur" }
]
},
roleGroup: null
};
},
@@ -296,6 +335,74 @@ export default {
this.download('routine/stuMultiLevelReview/export', {
...this.queryParams
}, `stuMultiLevelReview_${new Date().getTime()}.xlsx`)
},
/** 完成制作按钮操作 */
handleCompleted(row) {
this.resetCompleted();
this.completedForm.stuName = row.stuName;
this.completedForm.stuNo = row.stuNo;
this.completedForm.reason = row.reason;
this.completedForm.id = row.id;
this.completedOpen = true;
},
// 完成制作表单重置
resetCompleted() {
this.completedForm = {
stuName: null,
stuNo: null,
reason: null,
messageContent: "你申请办理的学生证制作完成，长堽校区前往xxx领取，里建校区前往xxx领取",
id: null
};
this.resetForm("completedForm");
},
// 完成制作取消按钮
cancelCompleted() {
this.completedOpen = false;
this.resetCompleted();
},
// 完成制作提交按钮
submitCompleted() {
this.$refs["completedForm"].validate(valid => {
if (valid) {
// 第一步：根据学号查询用户ID
getUserIdByStuNo(this.completedForm.stuNo).then(response => {
const receiverId = response.data;
if (!receiverId) {
throw new Error('未找到学生用户ID');
}
// 第二步：获取当前用户信息作为发送者
return getUserProfile().then(userResponse => {
const senderId = userResponse.data.userId;
// 第三步：发送消息通知学生
return addMsg({
sender: senderId,
receiver: receiverId,
content: this.completedForm.messageContent
});
});
}).then(() => {
// 第四步：消息发送成功后，更新多级审核状态为3（完成制作）
return getStuMultiLevelReview(this.completedForm.id);
}).then(response => {
const reviewData = response.data;
reviewData.reviewerStatus = 3;
// 将自定义消息内容存储到notes字段中，用于企业微信消息发送
reviewData.notes = this.completedForm.messageContent;
return updateStuMultiLevelReviewWithStuIdReissue(reviewData);
}).then(() => {
this.completedOpen = false;
this.getUser();
this.$modal.msgSuccess("完成制作成功并已发送通知消息");
}).catch(error => {
this.$modal.msgError(error.message || "操作失败");
});
}
});
}
}
};