Skip to content

C
confucius
Commit ad3f3fe3 authored by 罗超's avatar 罗超
Browse files
Options

2

parent 8dbc0314
Show whitespace changes
Inline Side-by-side
Showing with 181 additions and 255 deletions
src/components/stuMan/subscribe/detail.vue
View file @ ad3f3fe3
...@@ -16,15 +16,15 @@ ...@@ -16,15 +16,15 @@
<div>{{ saveObj.CourseName }}</div> <div>{{ saveObj.CourseName }}</div>
</template> </template>
</q-field> </q-field>
<q-field <q-field filled label="班级" stack-label class="col-6" v-if="saveObj.ClassType !== 3">
filled
label="班级"
stack-label
class="col-6"
v-if="saveObj.ClassType !== 3"
>
<template v-slot:control> <template v-slot:control>
<div>{{ saveObj.ClassName }}</div> <div>
{{ saveObj.ClassName }}
<span v-if="saveObj.ClassType === 2">
<span v-if="saveObj.ReserveType === 0">(正常试听)</span>
<span v-if="saveObj.ReserveType === 1">(跟班试听)</span>
</span>
</div>
</template> </template>
</q-field> </q-field>
<!-- <q-field <!-- <q-field
...@@ -41,9 +41,8 @@ ...@@ -41,9 +41,8 @@
<q-field filled label="类型" stack-label class="col-6"> <q-field filled label="类型" stack-label class="col-6">
<template v-slot:control> <template v-slot:control>
<div> <div>
<span v-if="saveObj.ClassType == 1">跟班</span <span v-if="saveObj.ClassType == 1">跟班</span><span v-if="saveObj.ClassType == 2">试听课</span><span
><span v-if="saveObj.ClassType == 2">试听课</span v-if="saveObj.ClassType == 3">约课</span>
><span v-if="saveObj.ClassType == 3">约课</span>
</div> </div>
</template> </template>
</q-field> </q-field>
...@@ -56,59 +55,28 @@ ...@@ -56,59 +55,28 @@
<template v-slot:control> <template v-slot:control>
<div> <div>
{{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }} {{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }}
<span class="q-ml-sm" v-if="saveObj.ClassType == 3" <span class="q-ml-sm" v-if="saveObj.ClassType == 3">({{ saveObj.CourseGradeName }})</span>
>({{ saveObj.CourseGradeName }})</span
>
</div> </div>
</template> </template>
</q-field> </q-field>
<q-field <q-field filled label="预约状态：" stack-label class="col-6" v-if="saveObj.ClassType == 3">
filled
label="预约状态："
stack-label
class="col-6"
v-if="saveObj.ClassType == 3"
>
<template v-slot:control> <template v-slot:control>
<div> <div>
<span v-if="saveObj.AppointState == 1" style="color:#ef5350" <span v-if="saveObj.AppointState == 1" style="color:#ef5350">待确认</span><span
>待确认</span v-if="saveObj.AppointState == 2" style="color:#21ba45">已确认</span>
><span v-if="saveObj.AppointState == 2" style="color:#21ba45"
>已确认</span
>
</div> </div>
<q-btn <q-btn color="accent" size="xs" label="确认" v-if="
color="accent"
size="xs"
label="确认"
v-if="
saveObj.AppointState == 1 && saveObj.AppointState == 1 &&
saveObj.GuestList.length >= saveObj.ScrollMinNum && saveObj.GuestList.length >= saveObj.ScrollMinNum &&
auth.IsEdit auth.IsEdit
" " @click="confirmSub" class="q-ml-md" />
@click="confirmSub" <q-badge rounded color="red" label="未成班" style="position:absolute;top:0;right:0" class="q-ml-sm" v-if="
class="q-ml-md"
/>
<q-badge
rounded
color="red"
label="未成班"
style="position:absolute;top:0;right:0"
class="q-ml-sm"
v-if="
saveObj.AppointState == 1 && saveObj.AppointState == 1 &&
isShowTag(saveObj.GuestList, saveObj.ScrollMinNum) isShowTag(saveObj.GuestList, saveObj.ScrollMinNum)
" " />
/>
</template> </template>
</q-field> </q-field>
<q-field <q-field filled label="最小成班人数：" stack-label class="col-6" v-if="saveObj.ClassType == 3">
filled
label="最小成班人数："
stack-label
class="col-6"
v-if="saveObj.ClassType == 3"
>
<template v-slot:control> <template v-slot:control>
<div>{{ saveObj.ScrollMinNum }}</div> <div>{{ saveObj.ScrollMinNum }}</div>
</template> </template>
...@@ -124,55 +92,20 @@ ...@@ -124,55 +92,20 @@
<div>{{ saveObj.ScrollMaxNum }}</div> <div>{{ saveObj.ScrollMaxNum }}</div>
</template> </template>
</q-field> --> </q-field> -->
<q-field <q-field filled label="已约学员：" stack-label class="col-12" v-if="saveObj.ClassType == 3">
filled
label="已约学员："
stack-label
class="col-12"
v-if="saveObj.ClassType == 3"
>
<template v-slot:control> <template v-slot:control>
<div v-if="saveObj.AppointState == 1 && auth.IsEdit"> <div v-if="saveObj.AppointState == 1 && auth.IsEdit">
<div class="q-mt-sm flex justify-start"> <div class="q-mt-sm flex justify-start">
<q-btn <q-btn color="accent" size="xs" label="调课" @click="showChangeCourse" :disable="checkStuType2.length == 0"
color="accent" class="q-mr-sm" />
size="xs" <q-btn color="accent" size="xs" label="取消预约" @click="cancelSub()" :disable="checkStuType2.length == 0"
label="调课" class="q-mr-sm" />
@click="showChangeCourse" <q-btn color="accent" size="xs" label="补课" @click="showRelenishDig = true" style="margin-left:440px" />
:disable="checkStuType2.length == 0" <q-btn color="accent" size="xs" label="重学" @click="showReStudyDig = true" class="q-ml-sm" />
class="q-mr-sm"
/>
<q-btn
color="accent"
size="xs"
label="取消预约"
@click="cancelSub()"
:disable="checkStuType2.length == 0"
class="q-mr-sm"
/>
<q-btn
color="accent"
size="xs"
label="补课"
@click="showRelenishDig = true"
style="margin-left:440px"
/>
<q-btn
color="accent"
size="xs"
label="重学"
@click="showReStudyDig = true"
class="q-ml-sm"
/>
</div> </div>
<div class="row"> <div class="row">
<q-checkbox <q-checkbox v-model="checkStuType2" v-for="(x, y) in saveObj.GuestList" :key="y" :val="x.AppointmentId">
v-model="checkStuType2"
v-for="(x, y) in saveObj.GuestList"
:key="y"
:val="x.AppointmentId"
>
{{ x.GuestName }} {{ x.GuestName }}
<span v-if="x.AppointType == 2">(补)</span> <span v-if="x.AppointType == 2">(补)</span>
<span v-if="x.AppointType == 3">(重)</span> <span v-if="x.AppointType == 3">(重)</span>
...@@ -188,13 +121,7 @@ ...@@ -188,13 +121,7 @@
</div> </div>
</template> </template>
</q-field> </q-field>
<q-field <q-field filled label="学员名单：" stack-label class="col-12" v-if="saveObj.ClassType !== 3">
filled
label="学员名单："
stack-label
class="col-12"
v-if="saveObj.ClassType !== 3"
>
<template v-slot:control> <template v-slot:control>
<div> <div>
<span v-for="(x, y) in saveObj.GuestList" :key="y"> <span v-for="(x, y) in saveObj.GuestList" :key="y">
...@@ -206,34 +133,20 @@ ...@@ -206,34 +133,20 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<ChangeCourse <ChangeCourse v-model="showChangeDig" :saveObj="CourseObj" @success="ChangeCourseSuccessHandle" />
v-model="showChangeDig" <ReStudy v-model="showReStudyDig" :saveObj="saveObj" :date="dateObj.date" @success="ReStudyHandle"></ReStudy>
:saveObj="CourseObj" <Relenish v-model="showRelenishDig" :saveObj="saveObj" :date="dateObj.date" @success="RelenishHandle"></Relenish>
@success="ChangeCourseSuccessHandle"
/>
<ReStudy
v-model="showReStudyDig"
:saveObj="saveObj"
:date="dateObj.date"
@success="ReStudyHandle"
></ReStudy>
<Relenish
v-model="showRelenishDig"
:saveObj="saveObj"
:date="dateObj.date"
@success="RelenishHandle"
></Relenish>
</div> </div>
</template> </template>
<script> <script>
import { import {
CancelAppointment, CancelAppointment,
SetSureAppointment SetSureAppointment
} from "../../../api/studyabroad/subscribe.js"; } from "../../../api/studyabroad/subscribe.js";
import ChangeCourse from "./changeCourse"; import ChangeCourse from "./changeCourse";
import ReStudy from "./reStudy"; import ReStudy from "./reStudy";
import Relenish from "./replenish.vue"; import Relenish from "./replenish.vue";
export default { export default {
components: { components: {
ChangeCourse, ChangeCourse,
ReStudy, ReStudy,
...@@ -369,5 +282,6 @@ export default { ...@@ -369,5 +282,6 @@ export default {
} }
} }
} }
}; };
</script> </script>
src/pages/studyAbroad/subscribe.vue
View file @ ad3f3fe3
...@@ -101,7 +101,13 @@ ...@@ -101,7 +101,13 @@
<div class="detailValue">{{ __item.CourseName }}</div> <div class="detailValue">{{ __item.CourseName }}</div>
</div> </div>
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">班级：</span><span>{{ __item.ClassName }}</span> <span class="detailLabel">班级：</span>
<span>{{ __item.ClassName }}
<span v-if="__item.ClassType===2">
<span v-if="__item.ReserveType===0">(正常试听)</span>
<span v-if="__item.ReserveType===1">(跟班试听)</span>
</span>
</span>
</div> </div>
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span> <span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
...@@ -170,7 +176,13 @@ ...@@ -170,7 +176,13 @@
<span class="detailLabel">课程：</span><span>{{ __item.CourseName }}</span> <span class="detailLabel">课程：</span><span>{{ __item.CourseName }}</span>
</div> </div>
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">班级：</span><span>{{ __item.ClassName }}</span> <span class="detailLabel">班级：</span>
<span>{{ __item.ClassName }}
<span v-if="__item.ClassType===2">
<span v-if="__item.ReserveType===0">(正常试听)</span>
<span v-if="__item.ReserveType===1">(跟班试听)</span>
</span>
</span>
</div> </div>
<div class="flex no-wrap"> <div class="flex no-wrap">
<span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span> <span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
...@@ -296,7 +308,7 @@ ...@@ -296,7 +308,7 @@
Id: 0 Id: 0
}, },
{ {
label: "跟班", label: "跟班课",
Id: 1 Id: 1
}, },
{ {
...@@ -304,7 +316,7 @@ ...@@ -304,7 +316,7 @@
Id: 2 Id: 2
}, },
{ {
label: "约课", label: "预约课",
Id: 3 Id: 3
} }
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment