diff --git a/src/api/dormitory/new/record.js b/src/api/dormitory/new/record.js
index 71bceed..18b7e92 100644
--- a/src/api/dormitory/new/record.js
+++ b/src/api/dormitory/new/record.js
@@ -122,6 +122,14 @@ export function updateNewRecord(data) {
export function delNewRecord(id) {
return request({
url: '/dormitory/newRecord/' + id,
- method: 'post'
+ method: 'delete'
+ })
+}
+
+// 一键确认未进行住宿费用确认的学生
+export function confirmUnconfirmedStudents() {
+ return request({
+ url: '/dormitory/newRecord/confirmUnconfirmedStudents',
+ method: 'POST'
})
}
diff --git a/src/views/dormitory/basedata/range/index.vue b/src/views/dormitory/basedata/range/index.vue
index a3a9ac9..a03f27e 100644
--- a/src/views/dormitory/basedata/range/index.vue
+++ b/src/views/dormitory/basedata/range/index.vue
@@ -204,7 +204,10 @@ export default {
let res = await initRecord(sdata);
loading.close();
if (res.code == 200) {
- this.$message.success(res.msg);
+ this.$message.success(res.msg + ",住宿费用确认消息已发送给相关学生");
+ this.getList(); // 刷新列表
+ } else {
+ this.$message.error(res.msg || "初始化失败");
}
},
async listAllGrade() {
diff --git a/src/views/dormitory/daily/record.vue b/src/views/dormitory/daily/record.vue
index ec0b0c4..03ce22b 100644
--- a/src/views/dormitory/daily/record.vue
+++ b/src/views/dormitory/daily/record.vue
@@ -91,18 +91,37 @@
-
- 学院数据
-
-
- 个人班级
-
+
+
+
+ 学工数据(全部)
+
+
+ 个人班级
+
+
+
+
+
+
+ 学院数据
+
+
+ 个人班级
+
+
@@ -342,8 +361,9 @@ export default {
let res = await getDeptName();
let allDepts = [...res.data];
- // 如果是学务干事或辅导员,只显示其所属的学院
- if (this.userRoleInfo && (this.userRoleInfo.isXuewu || this.userRoleInfo.isFudaoyuan) && this.userRoleInfo.userDeptName) {
+ // 如果是学务干事或辅导员(但不是学工),只显示其所属的学院
+ // 学工角色可以查看所有学院
+ if (this.userRoleInfo && (this.userRoleInfo.isXuewu || this.userRoleInfo.isFudaoyuan) && !this.userRoleInfo.isXuegong && this.userRoleInfo.userDeptName) {
this.deptList = allDepts.filter(dept => dept.label === this.userRoleInfo.userDeptName);
} else {
this.deptList = allDepts;
@@ -471,10 +491,14 @@ export default {
let res = await checkRoles();
if (res.code === 200 && res.data) {
this.userRoleInfo = res.data;
+ // 只有在多角色情况下才显示角色切换按钮
if (res.data.hasMultipleRoles) {
this.showRoleSwitch = true;
- this.queryParams.roleType = res.data.defaultRole || 'dept';
+ } else {
+ this.showRoleSwitch = false;
}
+ // 设置默认角色类型
+ this.queryParams.roleType = res.data.defaultRole;
}
} catch (error) {
console.error('获取用户角色信息失败:', error);
@@ -484,6 +508,8 @@ export default {
/** 切换角色 */
switchRole(roleType) {
this.queryParams.roleType = roleType;
+ // 角色切换时重新加载学院列表,确保权限正确
+ this.listDept();
this.handleQuery();
},
}
diff --git a/src/views/dormitory/new/stuDom/JwcConfirm.vue b/src/views/dormitory/new/stuDom/JwcConfirm.vue
index 2707217..648d7f6 100644
--- a/src/views/dormitory/new/stuDom/JwcConfirm.vue
+++ b/src/views/dormitory/new/stuDom/JwcConfirm.vue
@@ -42,6 +42,7 @@
搜索
重置
一键确认所有辅导员已确认的记录
+ 一键确认未进行住宿费用确认的学生
@@ -152,7 +153,7 @@