Parcourir la source

提交以下 试试返回

1
mo il y a 2 ans
Parent
commit
21dd2434fe

+ 11 - 0
src/helpers/request.ts

@@ -57,6 +57,17 @@ request.interceptors.request.use(
     ) {
       authHeaders.Authorization = Authorization
     }
+    const schoolId = (state.user.data.schoolInfos || [])
+      .map((item) => {
+        return item.id
+      })
+      .join(',')
+    console.log(schoolId)
+    if (schoolId) {
+      options.data ? (options.data.schoolId = schoolId) : null
+      options.params ? (options.params.schoolId = schoolId) : null
+    }
+
     return {
       url,
       options: {

+ 1 - 1
src/school/approval-manage/components/student-leave.tsx

@@ -67,7 +67,7 @@ export default defineComponent({
       <>
         <div class={styles.leaveWrap}>
           <OSticky>
-            <OHeader isBack={true}></OHeader>
+            <OHeader></OHeader>
           </OSticky>
           <ApprovalItem item={item.value} type={route.query.type}></ApprovalItem>
           {item.value.leaveCategoryId == 1 ? (

+ 1 - 1
src/school/approval-manage/course-adjust.tsx

@@ -153,7 +153,7 @@ export default defineComponent({
     return () => (
       <>
         <div class={styles.courseWrap}>
-          <OHeader isBack={true} border={false}></OHeader>
+          <OHeader border={false}></OHeader>
           <div class={styles.courseInfo}>
             <CellGroup inset border={false}>
               <Cell title="乐团名称" value={courseDetail.value.orchestraName} />

+ 1 - 1
src/school/approval-manage/index.tsx

@@ -16,7 +16,7 @@ export default defineComponent({
     return () => (
       <>
         <OSticky position="top" background="#F8F8F8">
-          <OHeader isBack={true}></OHeader>
+          <OHeader></OHeader>
           <Tabs v-model:active={activeName.value} class={styles.approvalTab}>
             <Tab name="wait" title="待审批">
               <WaitApproval></WaitApproval>

+ 1 - 1
src/school/attendance/index.tsx

@@ -15,7 +15,7 @@ export default defineComponent({
     return () => (
       <>
         <OSticky position="top" background="#F8F8F8">
-          <OHeader isBack={true}></OHeader>
+          <OHeader></OHeader>
           <Tabs v-model:active={activeName.value}>
             <Tab name="student" title="学生考勤"></Tab>
             <Tab name="teacher" title="伴学指导考勤"></Tab>

+ 1 - 1
src/school/attendance/student-att-day.tsx

@@ -102,7 +102,7 @@ export default defineComponent({
     return () => (
       <>
         {/* </OSticky> */}
-        <OHeader isBack={true}>
+        <OHeader>
           {{
             title: () => (
               <div class={styles.NavTitle} onClick={() => (state.showPopoverTime = true)}>

+ 0 - 1
src/school/exercise-record/exercis-detail.tsx

@@ -133,7 +133,6 @@ export default defineComponent({
         <OSticky position="top" background="#F8F8F8">
           <div class={styles.topWrap}>
             <OHeader
-              isBack={true}
               // onHeaderBack={onBack}
               border={false}
               background={'transparent'}

+ 3 - 4
src/school/exercise-record/index.tsx

@@ -55,13 +55,12 @@ export default defineComponent({
       orchestraName: '全部乐团',
       subjectId: '',
       subjectName: '全部声部',
-      sortType: '',
-      sortTypeName: '',
+      sortType: 'PRACTICE_DAY',
+      sortTypeName: '按天数',
       keyword: '',
       page: 1,
       rows: 20
     })
-
     const minDate = ref(new Date(dayjs().subtract(10, 'year').format('YYYY-MM-DD')))
     const maxDate = ref(new Date(dayjs().add(10, 'year').format('YYYY-MM-DD')))
     const columnsType = ref<DatePickerColumnType[]>(['year', 'month'])
@@ -197,7 +196,7 @@ export default defineComponent({
     return () => (
       <>
         <OSticky position="top" background="#F8F8F8">
-          <OHeader isBack={true} onHeaderBack={onBack}></OHeader>
+          <OHeader onHeaderBack={onBack}></OHeader>
           <OSearch
             placeholder="请输入学生姓名"
             onSearch={(val: any) => {

+ 1 - 1
src/school/school-detail/eidt-school.tsx

@@ -108,7 +108,7 @@ export default defineComponent({
     return () => (
       <>
         <div class={styles.schoolEidtWrap}>
-          <OHeader isBack={true}></OHeader>
+          <OHeader></OHeader>
           <div class={styles.eidtWrap}>
             <CellGroup inset>
               <Field

+ 1 - 1
src/school/school-detail/index.tsx

@@ -63,7 +63,7 @@ export default defineComponent({
       <>
         <div class={styles.schoolWrap}>
           <img src={schoolBg} class={styles.schoolBg} alt="" />
-          <OHeader isBack={true} border={false} background={'transparent'}></OHeader>
+          <OHeader border={false} background={'transparent'}></OHeader>
           <div class={styles.absWrap}>
             <div class={styles.schoolMainTitle}>
               <div class={styles.schoolMainLeft}>