dev #41

Merged
hy merged 2 commits from dev into master 2026-04-21 16:51:00 +08:00
6 changed files with 11 additions and 18 deletions

View File

@ -16,3 +16,9 @@ VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"
# VITE_API_BASEURL = "https://learn-archives-admin-dev.23544.com/api"
# #数据中心后台地址
# VITE_API_USERCENTER_URL = "https://dca.w.23544.com:8843/api"
# 接口地址
# VITE_API_BASEURL = "https://learn-archives-admin.23544.com/api"
# #数据中心后台地址
# VITE_API_USERCENTER_URL = "https://dcb.23544.com/api"

View File

@ -204,7 +204,7 @@ export interface Position {
subjectName: string;
positionType: number;
positionLevel: number;
status: boolean;
status: number;
classList?: ComboModel[];
}

View File

@ -649,7 +649,7 @@ const fetchFormData = async () => {
}
let sInfo = await StudentInfo(props.id);
positionList.value = res.data.positions
.filter((s: Position) => s.enable)
.filter((s: Position) => s.enable && s.status == 1)
.map((s: Position) => {
if (s.positionLevel > 2)
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
@ -680,12 +680,6 @@ const fetchFormData = async () => {
positionList: positionList.value,
...sInfo.data,
});
positionList.value = res.data.positions
.filter((s: Position) => s.enable)
.map((s: Position) => {
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
return s;
});
PositionFormIds.value = res.data.positions
.filter((s: Position) => s.enable)
.map((s: any) => s.id);

View File

@ -638,7 +638,7 @@ const PositionsSort = (arr: Position[]) => {
return 1;
}
});
return arr.filter((s) => s.enable);
return arr.filter((s) => s.enable && s.status == 1);
};
const handleReloadPaged = (event?: any, searchUnUse?: boolean) => {

View File

@ -493,7 +493,7 @@ const fetchFormData = () => {
}
positionList.value = res.data.positions
.filter((s: Position) => s.enable)
.filter((s: Position) => s.enable && s.status == 1)
.map((s: Position) => {
if (s.positionLevel > 2)
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
@ -522,13 +522,6 @@ const fetchFormData = () => {
pointPenSN: res.data.pointPenSN,
positionList: positionList.value ?? [],
});
positionList.value = res.data.positions
.filter((s: Position) => s.enable)
.map((s: Position) => {
if (s.positionLevel > 2)
s.grade = (s.gradeLevel ?? s.grade[0]) + s.graduationYear + "届";
return s;
});
PositionFormIds.value = res.data.positions
.filter((s: Position) => s.enable)
.map((s: any) => s.id);

View File

@ -618,7 +618,7 @@ const PositionsSort = (arr: Position[]) => {
return 1;
}
});
return arr.filter((s) => s.enable);
return arr.filter((s) => s.enable && s.status == 1);
};
function searchReload() {