修改问题

public/version.json

@@ -1 +1 @@
-{"version":1712838598183}
+{"version":1713506545802}

src/views/classList/modals/createClass.tsx

@@ -10,6 +10,7 @@ import { defineComponent, onMounted, reactive, ref, watch } from 'vue';
 import styles from '../index.module.less';
 import CSelect from '/src/components/CSelect';
 import { addClass, getConfiguredSubjects } from '../api';
+import { api_getCurrentGradeYear } from '../../studentList/api';
 export default defineComponent({
   props: {
     activeRow: {
@@ -43,6 +44,7 @@ export default defineComponent({
       currentClass: null,
       subjectId: null
     });
+    const gradeYearList = ref([] as any);
     const subjectList = ref([] as any);
     const submitForms = () => {
       foemsRef.value.validate(async (error: any) => {
@@ -63,6 +65,25 @@ export default defineComponent({
       });
     };
 
+    const getYearList = async () => {
+      try {
+        const { data } = await api_getCurrentGradeYear({});
+        const temp = [
+          {
+            label: data + 1,
+            value: data + 1
+          },
+          {
+            label: data,
+            value: data
+          }
+        ];
+        gradeYearList.value = temp;
+      } catch {
+        //
+      }
+    };
+
     const getConfigSubject = async () => {
       try {
         const { data } = await getConfiguredSubjects({
@@ -94,6 +115,10 @@ export default defineComponent({
       }
     );
 
+    onMounted(() => {
+      getYearList();
+    });
+
     return () => (
       <div class={[styles.addClass]}>
         <NForm label-placement="left" model={createClassForm} ref={foemsRef}>
@@ -108,11 +133,9 @@ export default defineComponent({
             <CSelect
               {...({
                 style: { width: '400px' },
-                options: props.gradeYearList,
+                options: gradeYearList.value,
                 placeholder: '选择学年',
-                clearable: true,
-                labelField: 'name',
-                valueField: 'id'
+                clearable: true
               } as any)}
               v-model:value={createClassForm.gradeYear}></CSelect>
           </NFormItem>

src/views/classList/modals/resetSubject.tsx

@@ -36,12 +36,14 @@ export default defineComponent({
     const subjectList = ref([] as any);
     const createClassForm = reactive({
       currentGradeNum: null,
+      gradeYear: null,
       currentClass: null,
       subjectId: null,
       id: null
     });
     onMounted(() => {
       createClassForm.currentGradeNum = props.activeRow.currentGradeNum;
+      createClassForm.gradeYear = props.activeRow.gradeYear;
       createClassForm.currentClass = props.activeRow.currentClass;
       createClassForm.subjectId = props.activeRow.subjectId;
       createClassForm.id = props.activeRow.id;
@@ -70,6 +72,7 @@ export default defineComponent({
     const getConfigSubject = async () => {
       try {
         const { data } = await getConfiguredSubjects({
+          gradeYear: createClassForm.gradeYear,
           currentGradeNum: createClassForm.currentGradeNum,
           currentClass: createClassForm.currentClass
         });

src/views/classList/modals/updateSubject.tsx

@@ -28,6 +28,7 @@ export default defineComponent({
     const createClassForm = reactive({
       currentGradeNum: null,
       currentClass: null,
+      gradeYear: null,
       subjectId: null,
       id: null
     });
@@ -35,6 +36,7 @@ export default defineComponent({
     const getConfigSubject = async () => {
       try {
         const { data } = await getConfiguredSubjects({
+          gradeYear: createClassForm.gradeYear,
           currentGradeNum: createClassForm.currentGradeNum,
           currentClass: createClassForm.currentClass
         });
@@ -55,8 +57,10 @@ export default defineComponent({
       // subjectList.value = [
       //   { id: null, name: '选择声部' },
       //   ...catchStore.getSubjectList
+      console.log(props.activeRow, ' props.activeRow');
       // ];
 
+      createClassForm.gradeYear = props.activeRow.gradeYear;
       createClassForm.currentGradeNum = props.activeRow.currentGradeNum;
       createClassForm.currentClass = props.activeRow.currentClass;
       createClassForm.subjectId = props.activeRow.subjectId;

src/views/studentList/components/baseInfo.tsx

@@ -156,11 +156,11 @@ export default defineComponent({
         const { data } = await api_getCurrentGradeYear({});
         const temp = [
           {
-            label: data + 1 + '学级',
+            label: data + 1,
             value: data + 1
           },
           {
-            label: data + '学级',
+            label: data,
             value: data
           }
         ];

src/views/studentList/modals/update-student/index.tsx

@@ -73,11 +73,11 @@ export default defineComponent({
         const { data } = await api_getCurrentGradeYear({});
         const temp = [
           {
-            label: data + 1 + '学级',
+            label: data + 1,
             value: data + 1
           },
           {
-            label: data + '学级',
+            label: data,
             value: data
           }
         ];