diff --git a/src/api/basic/basicstudentinfo.ts b/src/api/basic/basicstudentinfo.ts
index 687e552..d0d4577 100644
--- a/src/api/basic/basicstudentinfo.ts
+++ b/src/api/basic/basicstudentinfo.ts
@@ -109,6 +109,17 @@ export const putObj = (obj: any) => {
data: obj,
});
};
+/**
+ * 更新
+ * @param obj
+ */
+export const editObj = (obj: any) => {
+ return request({
+ url: '/basic/basicstudentinfo/edit',
+ method: 'post',
+ data: obj,
+ });
+};
/**
* 编辑学生毕业登记
diff --git a/src/api/purchase/purchasingrequisition.ts b/src/api/purchase/purchasingrequisition.ts
index d2ebaf1..d35e74c 100644
--- a/src/api/purchase/purchasingrequisition.ts
+++ b/src/api/purchase/purchasingrequisition.ts
@@ -274,7 +274,7 @@ export function getArchiveDownloadUrl(purchaseId: string | number) {
}
/**
- * 下载审批表:导出采购审批表 Word 文档(apply.docx 模板,仅占位符替换)
+ * 下载审批表:导出采购审批表 PDF 文档(apply.docx 模板)
* @param id 采购申请ID
*/
export function getApplyTemplateDownloadUrl(id: string | number) {
@@ -282,7 +282,7 @@ export function getApplyTemplateDownloadUrl(id: string | number) {
}
/**
- * 下载文件审批表:导出招标文件审批表 Word 文档(fileapply.docx 模板)
+ * 下载文件审批表:导出招标文件审批表 PDF 文档(fileapply.docx 模板)
* @param id 采购申请ID
*/
export function getFileApplyTemplateDownloadUrl(id: string | number) {
diff --git a/src/api/stuwork/activityinfo.ts b/src/api/stuwork/activityinfo.ts
index d45ff47..6955d3d 100644
--- a/src/api/stuwork/activityinfo.ts
+++ b/src/api/stuwork/activityinfo.ts
@@ -69,11 +69,23 @@ export const importSub = (id: string, file: File) => {
const formData = new FormData();
formData.append('file', file);
return request({
- url: `/stuwork/activityinfo/importSub/${id}`,
+ url: '/stuwork/file/importActivityInfoSub',
method: 'post',
data: formData,
+ params: { activityInfoId: id },
headers: {
'Content-Type': 'multipart/form-data',
},
});
};
+
+/**
+ * 下载活动子项导入模板
+ */
+export const downloadImportTemplate = () => {
+ return request({
+ url: '/stuwork/file/getActivityInfoSubImportTemplate',
+ method: 'get',
+ responseType: 'blob',
+ });
+};
diff --git a/src/api/stuwork/classroomhygienedaily.ts b/src/api/stuwork/classroomhygienedaily.ts
index 78e06c8..883e7b8 100644
--- a/src/api/stuwork/classroomhygienedaily.ts
+++ b/src/api/stuwork/classroomhygienedaily.ts
@@ -96,3 +96,16 @@ export function validateExist(rule: any, value: any, callback: any, isEdit: bool
}
});
}
+
+/**
+ * 获取日卫生学年学期统计
+ * @param {Object} [query] - 查询参数(schoolYear, schoolTerm)
+ * @returns {Promise} 请求的 Promise 对象。
+ */
+export function summary(query?: Object) {
+ return request({
+ url: '/stuwork/classRoomHygieneDaily/summary',
+ method: 'get',
+ params: query,
+ });
+}
diff --git a/src/api/stuwork/classroomhygienemonthly.ts b/src/api/stuwork/classroomhygienemonthly.ts
index bc555a3..a936a45 100644
--- a/src/api/stuwork/classroomhygienemonthly.ts
+++ b/src/api/stuwork/classroomhygienemonthly.ts
@@ -57,3 +57,16 @@ export const importData = (data: FormData) => {
},
});
};
+
+/**
+ * 获取月卫生学年学期统计
+ * @param {Object} [query] - 查询参数(schoolYear, schoolTerm)
+ * @returns {Promise} 请求的 Promise 对象。
+ */
+export const monthlySummaryByYearTerm = (query?: Object) => {
+ return request({
+ url: '/stuwork/classroomhygienemonthly/monthlySummaryByYearTerm',
+ method: 'get',
+ params: query,
+ });
+};
diff --git a/src/api/stuwork/weekplan.ts b/src/api/stuwork/weekplan.ts
index 3ca70b2..bda79f9 100644
--- a/src/api/stuwork/weekplan.ts
+++ b/src/api/stuwork/weekplan.ts
@@ -96,3 +96,16 @@ export function validateExist(rule: any, value: any, callback: any, isEdit: bool
}
});
}
+
+/**
+ * 获取班级班主任查看状况统计
+ * @param {Object} [query] - 查询参数(schoolYear, schoolTerm)
+ * @returns {Promise} 请求的 Promise 对象。
+ */
+export function readStatistics(query?: Object) {
+ return request({
+ url: '/stuwork/weekPlan/readStatistics',
+ method: 'get',
+ params: query,
+ });
+}
diff --git a/src/views/basic/basicstudent/components/StudentDetail.vue b/src/views/basic/basicstudent/components/StudentDetail.vue
index 491582e..a337339 100644
--- a/src/views/basic/basicstudent/components/StudentDetail.vue
+++ b/src/views/basic/basicstudent/components/StudentDetail.vue
@@ -33,207 +33,757 @@
-
-
-
- {{ detailData.realName || '-' }}
- {{ detailData.oldName || '-' }}
-
- 男
- 女
- -
-
- {{ detailData.idCard || '-' }}
- {{ basicInfo?.birthday || '-' }}
- {{ basicInfo?.national || '-' }}
- {{ basicInfo?.politicsStatus || '-' }}
- {{ detailData.householdAddress || '-' }}
- {{ detailData.phone || '-' }}
- {{ basicInfo?.email || '-' }}
- {{ basicInfo?.qq || '-' }}
-
- 是
- 否
- -
-
- {{ basicInfo?.colourSense || '-' }}
- {{ basicInfo?.eyeLeft || '-' }}
- {{ basicInfo?.eyeRight || '-' }}
- {{ basicInfo?.height || '-' }}
- {{ basicInfo?.weight || '-' }}
- {{ basicInfo?.seekText || '-' }}
- {{ basicInfo?.advantage || '-' }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ educationInfo?.education || '-' }}
- {{ educationInfo?.examScore || '-' }}
- {{ educationInfo?.examNo || '-' }}
- {{ educationInfo?.temporaryyeYear || '-' }}
- {{ educationInfo?.schoolName || '-' }}
- {{ educationInfo?.schoolProvince || '-' }}
- {{ educationInfo?.position || '-' }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ homeInfo?.detailedHouseholdAddress || '-' }}
- {{ homeInfo?.householdProperties || '-' }}
-
- 是
- 否
- -
-
- {{ homeInfo?.liveAddress || '-' }}
- {{ homeInfo?.incomeSource || '-' }}
- {{ homeInfo?.incomeMoney || '-' }}
- {{ homeInfo?.incomePerMoney || '-' }}
-
- 是
- 否
- -
-
- {{ homeInfo?.livewith || '-' }}
-
+
+
+
家庭基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
父母信息
-
- {{ homeInfo?.fatherName || '-' }}
- {{ homeInfo?.fatherPhone || '-' }}
- {{ homeInfo?.fatcherIdCard || '-' }}
- {{ homeInfo?.fatherWorkAddress || '-' }}
- {{ homeInfo?.matherName || '-' }}
- {{ homeInfo?.matherPhone || '-' }}
- {{ homeInfo?.matherIdCard || '-' }}
- {{ homeInfo?.matherWorkAddress || '-' }}
-
+
+ 家庭成员列表
+ 新增成员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
暂无家庭成员信息,点击上方按钮新增
+
-
家庭成员列表
-
-
-
-
-
-
-
-
-
-
-
暂无家庭成员信息
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ majorInfo?.enterDate || '-' }}
- {{ detailData.deptName || '-' }}
- {{ detailData.majorName || '-' }}
- {{ detailData.stuNo || '-' }}
- {{ majorInfo?.schoolRollNumber || '-' }}
- {{ majorInfo?.schoolRoll || '-' }}
- {{ majorInfo?.studentStatus || '-' }}
- {{ majorInfo?.majorLevel || '-' }}
- {{ majorInfo?.majorYears || '-' }}
- {{ majorInfo?.studyType || '-' }}
- {{ majorInfo?.unionStuNo || '-' }}
- {{ majorInfo?.middleNumber || '-' }}
- {{ majorInfo?.middleTime || '-' }}
- {{ majorInfo?.highNumber || '-' }}
- {{ majorInfo?.highTime || '-' }}
- {{ majorInfo?.technicianNumber || '-' }}
- {{ detailData.graduateNumber || '-' }}
- {{ majorInfo?.graduateDate || '-' }}
- {{ majorInfo?.pauseDate || '-' }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- {{ detailData.className || '-' }}
- {{ majorInfo?.classNo || '-' }}
- {{ majorInfo?.classRoomPosition || '-' }}
- {{ majorInfo?.isRoomNo || '-' }}
- {{ detailData.teacherRealName || majorInfo?.teacherRealName || '-' }}
- {{ majorInfo?.teacherTel || '-' }}
- {{ detailData.roomNo || '-' }}
- {{ majorInfo?.dormBuildingPhone || '-' }}
- {{ majorInfo?.bankName || '-' }}
- {{ majorInfo?.bankCard || '-' }}
- {{ majorInfo?.socialBank || '-' }}
- {{ majorInfo?.socialBankNo || '-' }}
- {{ detailData.parkingNo || '-' }}
- {{ detailData.classQQ || majorInfo?.classQq || '-' }}
- {{ majorInfo?.currentGrade || '-' }}
-
-
-
-
-
-
- {{ adultInfo?.schoolName || '-' }}
- {{ adultInfo?.adultEducation || '-' }}
- {{ adultInfo?.adultExamNo || '-' }}
- {{ adultInfo?.adultEnterDate || '-' }}
- {{ adultInfo?.adultNo || '-' }}
- {{ adultInfo?.adultMajorName || '-' }}
- {{ adultInfo?.computerScore || '-' }}
- {{ adultInfo?.englishScore || '-' }}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+