Skip to content

Commit 48f8718

Browse files
committed
fix: typo
1 parent 0bb7347 commit 48f8718

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

components/custom/CAS/Record/NewActivityRecord.vue

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<script setup lang="ts">
2-
import { useForm } from 'vee-validate'
3-
import { toTypedSchema } from '@vee-validate/zod'
4-
import * as z from 'zod'
2+
import { Button } from '@/components/ui/button'
53
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
4+
import { Multiselect } from '@/components/ui/multiselect'
65
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
7-
import { Button } from '@/components/ui/button'
8-
import type { AllClubs } from '~/types/api/user/all_clubs'
9-
import Calendar from '~/components/ui/calendar/Calendar.vue'
10-
import { cn } from '~/lib/utils'
116
import { Textarea } from '@/components/ui/textarea'
127
import { useToast } from '@/components/ui/toast/use-toast'
8+
import { toTypedSchema } from '@vee-validate/zod'
9+
import { useForm } from 'vee-validate'
10+
import * as z from 'zod'
11+
import Calendar from '~/components/ui/calendar/Calendar.vue'
1312
import { Toaster } from '~/components/ui/toast'
14-
import { Multiselect } from '@/components/ui/multiselect'
13+
import { cn } from '~/lib/utils'
14+
import type { AllClubs } from '~/types/api/user/all_clubs'
1515
1616
const emit = defineEmits(['refresh'])
1717
@@ -33,7 +33,6 @@ const formSchema = toTypedSchema(z.object({
3333
}))
3434
3535
const { data } = await useAsyncData<AllClubs>('allClubs', () => {
36-
// @ts-expect-error TS2321
3736
return $fetch('/api/user/all_clubs?includeMemberships=true', {
3837
headers: useRequestHeaders(),
3938
method: 'GET',
@@ -145,7 +144,7 @@ const onSubmit = handleSubmit(async (values) => {
145144
<FormControl>
146145
<Textarea
147146
class="resize-none"
148-
placeholder="请假原因,最多一百字..."
147+
placeholder="详细记录,最多一百字..."
149148
v-bind="componentField"
150149
:disabled="isLoading"
151150
/>

components/custom/CAS/Record/ViewMyActivityRecords.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<script setup lang="ts">
22
import type { Ref } from 'vue'
3-
import { columns } from './view-activity-records/columns'
4-
import DataTable from './view-activity-records/DataTable.vue'
53
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
6-
import { Toaster } from '~/components/ui/toast'
7-
import type { MyRecords } from '~/types/api/cas/record/my'
8-
import type { AllClubs } from '~/types/api/user/all_clubs'
94
import {
105
Select,
116
SelectContent,
@@ -14,6 +9,11 @@ import {
149
SelectTrigger,
1510
SelectValue,
1611
} from '@/components/ui/select'
12+
import { Toaster } from '~/components/ui/toast'
13+
import type { MyRecords } from '~/types/api/cas/record/my'
14+
import type { AllClubs } from '~/types/api/user/all_clubs'
15+
import { columns } from './view-activity-records/columns'
16+
import DataTable from './view-activity-records/DataTable.vue'
1717
1818
const props = defineProps<{
1919
refreshWatcher: Ref<boolean>
@@ -62,9 +62,9 @@ watch(selectedClub, async () => {
6262
<CardHeader>
6363
<CardTitle class="flex items-center gap-x-1">
6464
<Icon name="ic:sharp-remove-red-eye" />
65-
我的申请
65+
我的记录
6666
</CardTitle>
67-
<CardDescription>在此处浏览您的请假申请</CardDescription>
67+
<CardDescription>在此处浏览您的活动记录</CardDescription>
6868
</CardHeader>
6969
<CardContent>
7070
<div class="flex space-x-2">

0 commit comments

Comments
 (0)