更新

public/version.json

@@ -1 +1 @@
-{"version":1705888846360}
+{"version":1705891971086}

src/views/classList/components/afterWork.tsx

@@ -38,7 +38,7 @@ export default defineComponent({
     const state = reactive({
       upgradeFlag: props.upgradeFlag == 0 ? true : false, // 是否为历史班
       searchForm: {
-        status: null as any,
+        status: '' as any,
         timer: [
           getNowDateAndMonday(new Date().getTime()),
           getNowDateAndSunday(new Date().getTime())
@@ -71,7 +71,7 @@ export default defineComponent({
 
     const onReset = () => {
       state.searchForm = {
-        status: null as any,
+        status: '' as any,
         timer: [
           getNowDateAndMonday(new Date().getTime()),
           getNowDateAndSunday(new Date().getTime())
@@ -239,8 +239,8 @@ export default defineComponent({
                 {...({
                   options: [
                     {
-                      label: '作业状态',
-                      value: null
+                      label: '全部状态',
+                      value: ''
                     },
                     {
                       label: '已结束',

src/views/classList/components/classRecord.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
 
     const state = reactive({
       searchForm: {
-        teacherId: null,
+        teacherId: '',
         createTimer: formatDefaultTime() as any
       },
       teacherList: [],
@@ -59,7 +59,7 @@ export default defineComponent({
 
     const onReset = () => {
       state.searchForm = {
-        teacherId: null,
+        teacherId: '',
         createTimer: formatDefaultTime() as any
       };
       search();
@@ -137,7 +137,7 @@ export default defineComponent({
                   options: [
                     {
                       label: '全部老师',
-                      value: null
+                      value: ''
                     },
                     ...state.teacherList
                   ],

src/views/classList/components/classStudent.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
 
     const state = reactive({
       upgradeFlag: props.upgradeFlag == 0 ? true : false, // 是否为历史班
-      searchForm: { keyword: '', gender: null as any, membership: null as any },
+      searchForm: { keyword: '', gender: '' as any, membership: '' as any },
       loading: false,
       pagination: {
         page: 1,
@@ -59,8 +59,8 @@ export default defineComponent({
     const onReset = () => {
       state.searchForm = {
         keyword: '',
-        gender: null as any,
-        membership: null as any
+        gender: '' as any,
+        membership: '' as any
       };
       search();
       setCache({ current: state.searchForm, saveKey: 'classDetailStudent' });
@@ -222,8 +222,8 @@ export default defineComponent({
                 {...({
                   options: [
                     {
-                      label: '选择性别',
-                      value: null
+                      label: '全部性别',
+                      value: ''
                     },
                     {
                       label: '男',
@@ -245,8 +245,8 @@ export default defineComponent({
                 {...({
                   options: [
                     {
-                      label: '学生类型',
-                      value: null
+                      label: '全部类型',
+                      value: ''
                     },
                     {
                       label: '会员',

src/views/classList/components/testRecode.tsx

@@ -34,7 +34,11 @@ export default defineComponent({
   name: 'student-studentList',
   setup(props, { emit }) {
     const state = reactive({
-      searchForm: { keyword: '', trainingStatus: null as any, vipFlag: null },
+      searchForm: {
+        keyword: '',
+        trainingStatus: null as any,
+        vipFlag: '' as any
+      },
       searchWord: '',
       orchestraType: null,
       courseTypeCode: null,
@@ -79,7 +83,7 @@ export default defineComponent({
       state.searchForm = {
         keyword: '',
         trainingStatus: null as any,
-        vipFlag: null
+        vipFlag: ''
       };
       search();
       setCache({
@@ -237,8 +241,8 @@ export default defineComponent({
                 {...({
                   options: [
                     {
-                      label: '学生类型',
-                      value: null
+                      label: '全部类型',
+                      value: ''
                     },
                     {
                       label: '会员',

src/views/classList/contants.ts

@@ -1,19 +1,19 @@
 import { useUserStore } from '/src/store/modules/users';
 export const threeYearSystem = [
-  { label: '全部年级', value: null },
+  { label: '全部年级', value: '' },
   { label: '七年级', value: 7 },
   { label: '八年级', value: 8 },
   { label: '九年级', value: 9 }
 ];
 export const foreYearSystem = [
-  { label: '选择年级', value: null },
+  { label: '全部年级', value: '' },
   { label: '六年级', value: 6 },
   { label: '七年级', value: 7 },
   { label: '八年级', value: 8 },
   { label: '九年级', value: 9 }
 ];
 export const fiveYearSystem = [
-  { label: '选择年级', value: null },
+  { label: '全部年级', value: '' },
   { label: '一年级', value: 1 },
   { label: '二年级', value: 2 },
   { label: '三年级', value: 3 },
@@ -21,7 +21,7 @@ export const fiveYearSystem = [
   { label: '五年级', value: 5 }
 ];
 export const sixYearSystem = [
-  { label: '全部年级', value: null },
+  { label: '全部年级', value: '' },
   { label: '一年级', value: 1 },
   { label: '二年级', value: 2 },
   { label: '三年级', value: 3 },
@@ -30,7 +30,7 @@ export const sixYearSystem = [
   { label: '六年级', value: 6 }
 ];
 export const nineYearSystem = [
-  { label: '选择年级', value: null },
+  { label: '全部年级', value: '' },
   { label: '一年级', value: 1 },
   { label: '二年级', value: 2 },
   { label: '三年级', value: 3 },
@@ -42,7 +42,7 @@ export const nineYearSystem = [
   { label: '九年级', value: 9 }
 ];
 export const classArray = [
-  { value: null, label: '选择班级' },
+  { label: '全部班级', value: '' },
   { value: 1, label: '1班' },
   { value: 2, label: '2班' },
   { value: 3, label: '3班' },

src/views/classList/index.tsx

@@ -33,10 +33,10 @@ export default defineComponent({
     const state = reactive({
       searchForm: {
         keyword: null as any,
-        currentClass: null,
-        currentGradeNum: null,
-        subjectId: null,
-        gradeYear: null,
+        currentClass: '',
+        currentGradeNum: '',
+        subjectId: '',
+        gradeYear: '',
         gradeLevel: ''
       },
       orchestraType: null,
@@ -80,10 +80,10 @@ export default defineComponent({
     const onReset = () => {
       state.searchForm = {
         keyword: null as any,
-        currentClass: null,
-        currentGradeNum: null,
-        subjectId: null,
-        gradeYear: null,
+        currentClass: '' as any,
+        currentGradeNum: '' as any,
+        subjectId: '' as any,
+        gradeYear: '' as any,
         gradeLevel: ''
       };
       if (state.popSelectYearList.length > 0) {
@@ -134,7 +134,7 @@ export default defineComponent({
           label: item.name
         };
       });
-      state.subjectList.unshift({ value: null, label: '选择声部' });
+      state.subjectList.unshift({ value: '', label: '全部声部' });
     };
     const columns = () => {
       return [

src/views/studentList/components/studentAfterWork.tsx

@@ -27,7 +27,7 @@ export default defineComponent({
   name: 'student-studentList',
   setup() {
     const state = reactive({
-      searchForm: { keyword: '', trainingStatus: null as any },
+      searchForm: { keyword: '', trainingStatus: '' as any },
       loading: false,
       pagination: {
         page: 1,
@@ -68,7 +68,7 @@ export default defineComponent({
     };
 
     const onReset = () => {
-      state.searchForm = { keyword: '', trainingStatus: null as any };
+      state.searchForm = { keyword: '', trainingStatus: '' as any };
       timer.value = [
         getNowDateAndMonday(new Date().getTime()),
         getNowDateAndSunday(new Date().getTime())
@@ -235,8 +235,8 @@ export default defineComponent({
                   {...({
                     options: [
                       {
-                        label: '提交状态',
-                        value: null
+                        label: '全部状态',
+                        value: ''
                       },
                       ...trainingStatusArray
                     ],

src/views/studentList/index.tsx

@@ -33,9 +33,9 @@ export default defineComponent({
     const state = reactive({
       searchForm: {
         keyword: '',
-        gender: null as any,
-        classGroupId: null as any,
-        membership: null as any
+        gender: '' as any,
+        classGroupId: '' as any,
+        membership: '' as any
       },
       searchWord: '',
       orchestraType: null,
@@ -91,9 +91,9 @@ export default defineComponent({
     const onReset = () => {
       state.searchForm = {
         keyword: '',
-        gender: null as any,
-        classGroupId: null as any,
-        membership: null as any
+        gender: '' as any,
+        classGroupId: '' as any,
+        membership: '' as any
       };
       search();
       setCache({ current: state.searchForm, saveKey: route.path });
@@ -258,8 +258,8 @@ export default defineComponent({
                 {...({
                   options: [
                     {
-                      label: '学生性别',
-                      value: null
+                      label: '全部性别',
+                      value: ''
                     },
                     {
                       label: '男',
@@ -280,7 +280,7 @@ export default defineComponent({
               <CSelect
                 {...({
                   options: [
-                    { label: '年级班级', value: null },
+                    { label: '全部年级班级', value: '' },
                     ...state.classList
                   ],
                   placeholder: '年级班级',
@@ -294,8 +294,8 @@ export default defineComponent({
                 {...({
                   options: [
                     {
-                      label: '学生类型',
-                      value: null
+                      label: '全部类型',
+                      value: ''
                     },
                     {
                       label: '会员',