Browse Source

feat:修改BUG

DESKTOP-USV654P\pc 6 months ago
parent
commit
bfd838a514
1 changed files with 29 additions and 23 deletions
  1. 29 23
      src/views/educational/timetable/index.vue

+ 29 - 23
src/views/educational/timetable/index.vue

@@ -2,14 +2,14 @@
   <PageWrapper dense contentFullHeight fixedHeight>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <div style="display: flex; align-items: center; flex: 1;">
-          <div style="flex: 1; text-align: center; font-size: 14px; font-weight: bold;">
-            <span style="margin-right: 16px;">{{ tableText.semesterName }}</span>
-            <span style="margin-right: 16px;">{{ tableText.name }}</span>
-            <span style="margin-right: 16px;">{{ tableText.week }}</span>
+        <div style="display: flex; align-items: center; flex: 1">
+          <div style="flex: 1; text-align: center; font-size: 14px; font-weight: bold">
+            <span style="margin-right: 16px">{{ tableText.semesterName }}</span>
+            <span style="margin-right: 16px">{{ tableText.name }}</span>
+            <span style="margin-right: 16px">{{ tableText.week }}</span>
             <span>课程表</span>
           </div>
-          <div style="margin-right: 16px;"> 总课时:{{ tableText.classHour }}</div>
+          <div style="margin-right: 16px"> 总课时:{{ tableText.classHour }}</div>
           <a-button type="primary" @click="handleExport()">导出</a-button>
         </div>
       </template>
@@ -53,7 +53,7 @@
     const timePeriods = ['', '上午', '下午', '晚上', ''];
 
     const displayData: Recordable[] = [];
-    let timePeriod = 0;
+    let timePeriod = -1;
 
     orderBy(classTimeList, ['timePeriod', 'number'], ['asc', 'asc']).forEach((item) => {
       let rowSpan = 0;
@@ -87,7 +87,7 @@
         rowSpan: rowSpan,
         timePeriod: timePeriods[item.timePeriod],
         timeNumber: {
-          title: `第${item.number}节`,
+          title: `${item.shortName}`,
           time: `${item.summerStartTime}-${item.summerEndTime}`,
         },
         week1: getWeekObj(1),
@@ -116,7 +116,7 @@
     return weeks;
   };
 
-  const [registerTable, { reload, getForm }] = useTable({
+  const [registerTable, { getForm }] = useTable({
     api: reloadApi,
     title: tabTitle,
     rowKey: 'id',
@@ -142,20 +142,26 @@
           component: 'Select',
           required: true,
           colProps: { span: 8 },
-          componentProps: {
-            getPopupContainer: () => document.body,
-            options: [
-              { label: '教职工课表', value: 'teacher' },
-              { label: '班级课表', value: 'class' },
-            ],
-            onChange: (value) => {
-              if (value === 'teacher') {
-                tabTitle.value = '教职工课表';
-              }
-              if (value === 'class') {
-                tabTitle.value = '班级课表';
-              }
-            },
+          componentProps: ({ formModel }) => {
+            return {
+              getPopupContainer: () => document.body,
+              options: [
+                { label: '教职工课表', value: 'teacher' },
+                { label: '班级课表', value: 'class' },
+              ],
+              onChange: (value) => {
+                formModel.teacherName = '';
+                formModel.gradeId = '';
+                formModel.majorSetId = '';
+                formModel.classId = '';
+                if (value === 'teacher') {
+                  tabTitle.value = '教职工课表';
+                }
+                if (value === 'class') {
+                  tabTitle.value = '班级课表';
+                }
+              },
+            };
           },
         },
         {