|
|
@@ -204,13 +204,28 @@ const loadData = async () => {
|
|
|
await Promise.all([queryBatch, queryClass, querySubject]);
|
|
|
const queryCondition = getTeacherTestRecordCondition({}).then(res => {
|
|
|
const { buildType, buildStatus, batchId, classId, subjectId } = res.data;
|
|
|
- queryForm.value = {
|
|
|
- buildType: buildType || buildTypeList.value[0]?.value,
|
|
|
- buildStatus: buildStatus || buildStatusList.value[0]?.value,
|
|
|
- batchId: batchId || batchList.value[0]?.batchId,
|
|
|
- classId: classId || classList.value[0]?.classId,
|
|
|
- subjectId: subjectId || subjectList.value[0]?.subjectId,
|
|
|
- };
|
|
|
+ const params = {} as Study.PaperWorkRecordQuery;
|
|
|
+ const params_buildType = buildType || buildTypeList.value[0]?.value;
|
|
|
+ const params_buildStatus = buildStatus || buildStatusList.value[0]?.value
|
|
|
+ const params_batchId = batchId || batchList.value[0]?.batchId
|
|
|
+ const params_classId = classId || classList.value[0]?.classId
|
|
|
+ const params_subjectId = subjectId || subjectList.value[0]?.subjectId
|
|
|
+ if (params_buildType !== undefined && params_buildType !== null) {
|
|
|
+ params.buildType = params_buildType;
|
|
|
+ }
|
|
|
+ if (params_buildStatus !== undefined && params_buildStatus !== null) {
|
|
|
+ params.buildStatus = params_buildStatus;
|
|
|
+ }
|
|
|
+ if (params_batchId !== undefined && params_batchId !== null) {
|
|
|
+ params.batchId = params_batchId;
|
|
|
+ }
|
|
|
+ if (params_classId !== undefined && params_classId !== null) {
|
|
|
+ params.classId = params_classId;
|
|
|
+ }
|
|
|
+ if (params_subjectId !== undefined && params_subjectId !== null) {
|
|
|
+ params.subjectId = params_subjectId;
|
|
|
+ }
|
|
|
+ queryForm.value = params;
|
|
|
});
|
|
|
await Promise.all([queryCondition]);
|
|
|
}
|