Browse Source

feat:修改分班

DESKTOP-USV654P\pc 8 months ago
parent
commit
fb792218ab

+ 1 - 1
src/views/educational/division/components/DsionStep5.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="dsion-step5">
-    <BasicTable @register="registerTable">
+    <BasicTable @register="registerTable" :searchInfo="searchInfo">
       <template #toolbar>
         <!-- <a-button type="primary" @click="handelConfirm">分班确认</a-button> -->
       </template>

+ 7 - 7
src/views/educational/division/data.config.ts

@@ -173,25 +173,25 @@ export const table4Columns: BasicColumn[] = [
     title: '毕业学校',
     dataIndex: 'graduateSchool',
     align: 'left',
-    width: 180,
+    width: 120,
   },
   {
     title: '毕业班级',
     dataIndex: 'graduateClass',
     align: 'left',
-    width: 120,
+    width: 80,
   },
   {
     title: '第一志愿',
     dataIndex: 'firstAmbition',
     align: 'left',
-    width: 150,
+    width: 120,
   },
   {
     title: '第二志愿',
     dataIndex: 'secondAmbition',
     align: 'left',
-    width: 150,
+    width: 120,
   },
   {
     title: '住宿类型',
@@ -215,19 +215,19 @@ export const table4Columns: BasicColumn[] = [
     title: '成绩',
     dataIndex: 'score',
     align: 'left',
-    width: 120,
+    width: 80,
   },
   {
     title: '班级名称',
     dataIndex: 'className',
     align: 'left',
-    width: 120,
+    width: 100,
   },
   {
     title: '班主任',
     dataIndex: 'teacherName',
     align: 'left',
-    width: 120,
+    width: 100,
   },
 ];
 

+ 4 - 1
src/views/educational/division/index.vue

@@ -14,7 +14,7 @@
         <DsionStep2 ref="dsionStep2Ref" :taskId="taskId" v-show="state.stepIndex === 2" />
         <DsionStep3 ref="dsionStep3Ref" :taskId="taskId" v-show="state.stepIndex === 3" />
         <DsionStep4 ref="dsionStep4Ref" :taskId="taskId" v-show="state.stepIndex === 4" />
-        <DsionStep5 v-show="state.stepIndex === 5" />
+        <DsionStep5 ref="dsionStep5Ref" :taskId="taskId" v-show="state.stepIndex === 5" />
       </div>
       <div class="page-dsion-floor">
         <a-button v-show="state.stepIndex !== 0" @click="handleStep(0)" class="ml-[24px]">
@@ -66,6 +66,7 @@
   const dsionStep3Ref = ref<ElRef>(null);
   const dsionStep4Ref = ref<ElRef>(null);
   const dsionStep6Ref = ref<ElRef>(null);
+  const dsionStep5Ref = ref<ElRef>(null);
 
   const state = reactive({
     stepIndex: 0,
@@ -104,6 +105,7 @@
     2: () => dsionStep2Ref.value.validateStep(),
     3: () => dsionStep3Ref.value.validateStep(),
     4: () => dsionStep4Ref.value.validateStep(),
+    5: () => dsionStep5Ref.value.validateStep(),
   };
 
   const stepReload = {
@@ -112,6 +114,7 @@
     2: () => dsionStep2Ref.value.reloadStep(),
     3: () => dsionStep3Ref.value.reloadStep(),
     4: () => dsionStep4Ref.value.reloadStep(),
+    5: () => dsionStep5Ref.value.reloadStep(),
   };
 
   onMounted(async () => {});