Skip to content

C
confucius
Commit 0ceef7e1 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent e2e57b9e
Hide whitespace changes
Inline Side-by-side
Showing with 283 additions and 284 deletions
src/components/course/classinfo-form.vue
View file @ 0ceef7e1
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<div v-if="tabCheck=='first'" style="margin:0 15px;"> <div v-if="tabCheck=='first'" style="margin:0 15px;">
 <classstuForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></classstuForm>  <classstuForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></classstuForm>
</div> </div>
<div v-if="tabCheck=='second'"> <div v-if="tabCheck=='second'">
 <lessForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></lessForm>  <lessForm :seting-obj="setingObj" :isShowMyBtn="isShowMyBtn"></lessForm>
</div> </div>
<div v-if="tabCheck=='third'"> <div v-if="tabCheck=='third'">
......
src/components/course/classlist.vue
View file @ 0ceef7e1
...@@ -127,7 +127,6 @@ ...@@ -127,7 +127,6 @@
</q-td> </q-td>
</template> </template>
<template v-slot:bottom> <template v-slot:bottom>
</template> </template>
<template v-slot:body-cell-optioned="props"> <template v-slot:body-cell-optioned="props">
<q-td :props="props"> <q-td :props="props">
......
src/components/course/classmate-form.vue
View file @ 0ceef7e1
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
max-height: calc(100vh - 235px); max-height: calc(100vh - 235px);
height: calc(100vh - 235px); height: calc(100vh - 235px);
overflow-y: overlay; overflow-y: overlay;
/* margin-right: -3px; */
} }
.planTabDiv::-webkit-scrollbar { .planTabDiv::-webkit-scrollbar {
......
src/components/course/classstu-form.vue
View file @ 0ceef7e1
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==3"> <span style="color:red;cursor:pointer" v-if="props.row.JoinType==3">
续费报入 续费报入
<q-tooltip :offset="[10, 10]"> <q-tooltip :offset="[10, 10]">
原订单{{props.row.SourceClassName}}班级续费。关联单号{{props.row.SourceOrderId}} 原订单{{props.row.SourceClassName}}班级续费。关联单号{{props.row.SourceOrderId}}
</q-tooltip> </q-tooltip>
</span> </span>
<span style="color:red;cursor:pointer" v-if="props.row.JoinType==4"> <span style="color:red;cursor:pointer" v-if="props.row.JoinType==4">
转班报入 转班报入
<q-tooltip :offset="[10, 10]"> <q-tooltip :offset="[10, 10]">
从{{props.row.SourceClassName}}班级转入。关联单号{{props.row.SourceOrderId}} 从{{props.row.SourceClassName}}班级转入。关联单号{{props.row.SourceOrderId}}
</q-tooltip> </q-tooltip>
</span> </span>
</q-td> </q-td>
...@@ -348,5 +348,4 @@ ...@@ -348,5 +348,4 @@
} }
} }
} }
</script>
</script> \ No newline at end of file
src/components/course/courseprice-form.vue
View file @ 0ceef7e1
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
background-color: #3FC4FF; background-color: #3FC4FF;
margin-right: 5px; margin-right: 5px;
} }
.courseMainTbale td{
padding:0 3px; .courseMainTbale td {
padding: 0 3px;
} }
</style> </style>
<template> <template>
...@@ -119,7 +120,8 @@ ...@@ -119,7 +120,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2BRebateRatio" ref="B2BRebateRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2BRebateRatio" ref="B2BRebateRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BRebateRatio'),getShouBAO(3)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2BRebateRatio'),getShouBAO(3)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(3)}} {{getShouBAO(3)}}
...@@ -137,7 +139,8 @@ ...@@ -137,7 +139,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2BReNewRatio" ref="B2BReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2BReNewRatio" ref="B2BReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2BReNewRatio'),getShouBAO(4)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2BReNewRatio'),getShouBAO(4)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;width:100px;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(4)}} {{getShouBAO(4)}}
...@@ -160,7 +163,8 @@ ...@@ -160,7 +163,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.SchoolRebateRatio" ref="SchoolRebateRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.SchoolRebateRatio" ref="SchoolRebateRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'SchoolRebateRatio'),getShouBAO(5)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'SchoolRebateRatio'),getShouBAO(5)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(5)}} {{getShouBAO(5)}}
...@@ -178,7 +182,8 @@ ...@@ -178,7 +182,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.SchoolReNewRatio" ref="SchoolReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.SchoolReNewRatio" ref="SchoolReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'SchoolReNewRatio'),getShouBAO(6)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'SchoolReNewRatio'),getShouBAO(6)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center;" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(6)}} {{getShouBAO(6)}}
...@@ -202,7 +207,8 @@ ...@@ -202,7 +207,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceRatio"
ref="TransIntroductceRatio" ref="TransIntroductceRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceRatio'),getShouBAO(7)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceRatio'),getShouBAO(7)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(7)}} {{getShouBAO(7)}}
...@@ -221,7 +227,8 @@ ...@@ -221,7 +227,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.TransIntroductceReNewRatio"
ref="TransIntroductceReNewRatio" ref="TransIntroductceReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceReNewRatio'),getShouBAO(8)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'TransIntroductceReNewRatio'),getShouBAO(8)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(8)}} {{getShouBAO(8)}}
...@@ -245,7 +252,8 @@ ...@@ -245,7 +252,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendRatio"
ref="InnerRecommendRatio" ref="InnerRecommendRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendRatio'),getShouBAO(9)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendRatio'),getShouBAO(9)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(9)}} {{getShouBAO(9)}}
...@@ -264,7 +272,8 @@ ...@@ -264,7 +272,8 @@
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendReNewRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.InnerRecommendReNewRatio"
ref="InnerRecommendReNewRatio" ref="InnerRecommendReNewRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendReNewRatio'),getShouBAO(10)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'InnerRecommendReNewRatio'),getShouBAO(10)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(10)}} {{getShouBAO(10)}}
...@@ -287,7 +296,8 @@ ...@@ -287,7 +296,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2CRbRatio" ref="B2CRbRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2CRbRatio" ref="B2CRbRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2CRbRatio'),getShouBAO(11)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2CRbRatio'),getShouBAO(11)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(11)}} {{getShouBAO(11)}}
...@@ -305,7 +315,8 @@ ...@@ -305,7 +315,8 @@
</td> </td>
<td> <td>
<q-input filled stack-label dense v-model="priceObj.courseObj.B2CRNRatio" ref="B2CRNRatio" <q-input filled stack-label dense v-model="priceObj.courseObj.B2CRNRatio" ref="B2CRNRatio"
@keyup.native="checkPrice(priceObj.courseObj, 'B2CRNRatio'),getShouBAO(12)" :suffix="priceObj.courseObj.CommissionReType==1?'%':''" /> @keyup.native="checkPrice(priceObj.courseObj, 'B2CRNRatio'),getShouBAO(12)"
:suffix="priceObj.courseObj.CommissionReType==1?'%':''" />
</td> </td>
<td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1"> <td style="text-align:center" v-if="priceObj.courseObj.CommissionReType==1">
{{getShouBAO(12)}} {{getShouBAO(12)}}
...@@ -323,7 +334,6 @@ ...@@ -323,7 +334,6 @@
</td> </td>
</tr> </tr>
</table> </table>
</q-card-section> </q-card-section>
<q-separator /> <q-separator />
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
...@@ -592,7 +602,8 @@ ...@@ -592,7 +602,8 @@
//首次优惠 //首次优惠
var Count = '' var Count = ''
var currentPrice = Number(100 - this.priceObj.courseObj.B2CRatio) * this.priceObj.courseObj.SellPrice / 100; var currentPrice = Number(100 - this.priceObj.courseObj.B2CRatio) * this.priceObj.courseObj.SellPrice / 100;
var currrntXufei = Number(100 - this.priceObj.courseObj.B2CReNewRatio) * this.priceObj.courseObj.SellPrice / 100; var currrntXufei = Number(100 - this.priceObj.courseObj.B2CReNewRatio) * this.priceObj.courseObj.SellPrice /
100;
if (type == 3) { if (type == 3) {
if (this.priceObj.courseObj.B2BRebateRatio) { if (this.priceObj.courseObj.B2BRebateRatio) {
let num = currentPrice * Number(this.priceObj.courseObj.B2BRebateRatio) / 100; let num = currentPrice * Number(this.priceObj.courseObj.B2BRebateRatio) / 100;
...@@ -666,5 +677,4 @@ ...@@ -666,5 +677,4 @@
} }
} }
}; };
</script>
</script> \ No newline at end of file
src/components/course/lessoncheck-form.vue
View file @ 0ceef7e1
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
//选择保存 //选择保存
saveCourse() { saveCourse() {
if (JSON.stringify(this.checkedRow) != "{}") { if (JSON.stringify(this.checkedRow) != "{}") {
this.$emit('success',this.checkedRow); this.$emit('success', this.checkedRow);
this.closeCourseForm(); this.closeCourseForm();
} else { } else {
this.$q.notify({ this.$q.notify({
type: 'negative', type: 'negative',
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
}) })
} }
}, },
getCreatTime(time){ getCreatTime(time) {
return time.replace("T", " "); return time.replace("T", " ");
}, },
//关闭弹窗 //关闭弹窗
...@@ -85,5 +85,4 @@ ...@@ -85,5 +85,4 @@
}, },
} }
} }
</script>
</script> \ No newline at end of file
src/components/course/listen-form.vue
View file @ 0ceef7e1
...@@ -10,9 +10,8 @@ ...@@ -10,9 +10,8 @@
class="col-12 q-pb-lg" label="试听课程名称" :rules="[val => !!val || '请填写试听课程名称']" /> class="col-12 q-pb-lg" label="试听课程名称" :rules="[val => !!val || '请填写试听课程名称']" />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<q-select stack-label class="col-12 q-pb-lg" color="primary" filled label="试听课主讲老师" <q-select stack-label class="col-12 q-pb-lg" color="primary" filled label="试听课主讲老师" option-value="TId"
option-value="TId" option-label="TeacherName" :options="TeacherList" v-model="objOption.TeacherId" option-label="TeacherName" :options="TeacherList" v-model="objOption.TeacherId" emit-value map-options />
emit-value map-options />
</div> </div>
<div class="row wrap"> <div class="row wrap">
<q-input filled stack-label :dense="false" v-model="objOption.ClassHourFee" ref="ClassHourFee" <q-input filled stack-label :dense="false" v-model="objOption.ClassHourFee" ref="ClassHourFee"
...@@ -98,7 +97,7 @@ ...@@ -98,7 +97,7 @@
Id: this.saveObj.Id Id: this.saveObj.Id
}).then(res => { }).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
let temData = res.Data; let temData = res.Data;
this.objOption.Id = temData.Id; this.objOption.Id = temData.Id;
this.objOption.LessonName = temData.LessonName; this.objOption.LessonName = temData.LessonName;
this.objOption.TeacherId = temData.TeacherId; this.objOption.TeacherId = temData.TeacherId;
...@@ -143,5 +142,4 @@ ...@@ -143,5 +142,4 @@
} }
} }
} }
</script>
</script> \ No newline at end of file
src/components/course/mateitem.vue
View file @ 0ceef7e1
...@@ -30,7 +30,8 @@ ...@@ -30,7 +30,8 @@
<div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0"> <div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0">
<div class="plan_LeftTitle">学生名称：</div> <div class="plan_LeftTitle">学生名称：</div>
<div class="plan_RightInner"> <div class="plan_RightInner">
<span style="margin-right:10px;" v-for="(tItem,tIndex) in subItem.GuestList" :key="tIndex">{{tItem.GuestName}}</span> <span style="margin-right:10px;" v-for="(tItem,tIndex) in subItem.GuestList"
:key="tIndex">{{tItem.GuestName}}</span>
</div> </div>
</div> </div>
<div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0"> <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
......
src/components/course/shift-form.vue
View file @ 0ceef7e1
...@@ -239,7 +239,8 @@ ...@@ -239,7 +239,8 @@
}) })
} }
}, },
removeshift(obj) { //删除 //删除
removeshift(obj) {
let that = this; let that = this;
this.$q.dialog({ this.$q.dialog({
title: "提示", title: "提示",
......
src/components/course/studentFee.vue
View file @ 0ceef7e1
...@@ -435,7 +435,6 @@ ...@@ -435,7 +435,6 @@
this.dataList.List.forEach(x => { this.dataList.List.forEach(x => {
x.FullClassList.sort(this.compare('StartValue', true)) x.FullClassList.sort(this.compare('StartValue', true))
}) })
this.isShowBanMenu = false; this.isShowBanMenu = false;
}, },
//删除列 //删除列
...@@ -627,7 +626,6 @@ ...@@ -627,7 +626,6 @@
} }
}) })
}, },
//修改表格横向内容 //修改表格横向内容
getInnerEdit(item) { getInnerEdit(item) {
this.isShowInnerEdit = true; this.isShowInnerEdit = true;
......
src/components/exam/examtemplate-form.vue
View file @ 0ceef7e1
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none" class="sticky-column-table sticky-header-column-table" style="max-height: 550px" separator="none"
:data="dataList" :columns="columns" row-key="TemplateId" selection="single" :data="dataList" :columns="columns" row-key="TemplateId" selection="single"
:selected.sync="selectedTemplate"> :selected.sync="selectedTemplate">
<template v-slot:top="props"> <template v-slot:top>
<div class="col-2 q-table__title">模板列表</div> <div class="col-2 q-table__title">模板列表</div>
<q-space /> <q-space />
</template> </template>
......
src/components/exam/paperfolder-form.vue
View file @ 0ceef7e1
...@@ -52,7 +52,6 @@ ...@@ -52,7 +52,6 @@
}, },
mounted() { mounted() {
this.initObj() this.initObj()
}, },
methods: { methods: {
......
src/components/exam/question-form.vue
View file @ 0ceef7e1
...@@ -191,9 +191,7 @@ ...@@ -191,9 +191,7 @@
}, },
}, },
} }
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style>
</style> \ No newline at end of file
src/components/sale/orderlist.vue
View file @ 0ceef7e1
...@@ -447,9 +447,9 @@ ...@@ -447,9 +447,9 @@
<div class="row" v-if="item.GuestList && item.GuestList.length > 0"> <div class="row" v-if="item.GuestList && item.GuestList.length > 0">
学生名单： 学生名单：
<template v-for="(x, j) in item.GuestList" :index="j"> <template v-for="(x, j) in item.GuestList" :index="j">
<span v-if="x.GuestState == 1" style="color:#2961FE;margin-right: 5px">{{ x.GuestName }} <span v-if="x.GuestState == 1" style="color:#2961FE;margin-right: 5px" :key="j">{{ x.GuestName }}
</span> </span>
<span v-else style="color:red;margin-right: 5px"> <span v-else style="color:red;margin-right: 5px" :key="j">
{{ x.GuestName }} {{ x.GuestName }}
<q-tooltip :offset="[10, 10]"> <q-tooltip :offset="[10, 10]">
{{ x.GuestStateStr }} {{ x.GuestStateStr }}
...@@ -474,7 +474,7 @@ ...@@ -474,7 +474,7 @@
<th style="width:150px;">上传合同信息</th> <th style="width:150px;">上传合同信息</th>
<th style="width:200px;">操作</th> <th style="width:200px;">操作</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex+10000">
<td>{{ subItem.GuestName }}</td> <td>{{ subItem.GuestName }}</td>
<td> <td>
{{ subItem.ContractNo }} {{ subItem.ContractNo }}
...@@ -508,7 +508,7 @@ ...@@ -508,7 +508,7 @@
"> ">
退课名单： 退课名单：
<span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 2" <span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 2"
style="color:var(--q-color-negative);margin-right: 5px">{{ x.GuestName }} style="color:var(--q-color-negative);margin-right: 5px" :key="j+20000">{{ x.GuestName }}
</span> </span>
</div> </div>
<span v-if="item.GuestList && item.GuestList.length == 0">暂无</span> <span v-if="item.GuestList && item.GuestList.length == 0">暂无</span>
...@@ -531,7 +531,7 @@ ...@@ -531,7 +531,7 @@
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>销售备注</div> <div>销售备注</div>
<div v-for="(xq, jq) in item.SaleRemarkList" :index="jq" <div v-for="(xq, jq) in item.SaleRemarkList" :key="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>教务备注</div> <div>教务备注</div>
<div v-for="(xq, jq) in item.TeacherRemarkList" :index="jq" <div v-for="(xq, jq) in item.TeacherRemarkList" :key="jq+200000"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
...@@ -595,7 +595,7 @@ ...@@ -595,7 +595,7 @@
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>校长备注</div> <div>校长备注</div>
<div v-for="(xq, jq) in item.RectorRemarkList" :index="jq" <div v-for="(xq, jq) in item.RectorRemarkList" :key="jq+300000"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
...@@ -628,7 +628,7 @@ ...@@ -628,7 +628,7 @@
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>总经理备注</div> <div>总经理备注</div>
<div v-for="(xq, jq) in item.DirectorRemarkList" :index="jq" <div v-for="(xq, jq) in item.DirectorRemarkList" :key="jq+400000"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
...@@ -670,11 +670,10 @@ ...@@ -670,11 +670,10 @@
<th style="width:180px;">合同编号</th> <th style="width:180px;">合同编号</th>
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex">
<td> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" /> <q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td> </td>
<td>{{ subItem.GuestName }}</td> <td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td> <td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td> <td>{{ subItem.ContractStatusStr }}</td>
...@@ -688,7 +687,7 @@ ...@@ -688,7 +687,7 @@
</template> </template>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x, j) in item.FinanceList" :index="j" :style="{ <div class="finance row" v-for="(x, j) in item.FinanceList" :key="j" :style="{
background: background:
x.ColorState == 1 x.ColorState == 1
? 'rgba(41, 97, 254, 0.2)' ? 'rgba(41, 97, 254, 0.2)'
...@@ -734,11 +733,10 @@ ...@@ -734,11 +733,10 @@
<th style="width:180px;">合同编号</th> <th style="width:180px;">合同编号</th>
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex+500000">
<td> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" /> <q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td> </td>
<td>{{ subItem.GuestName }}</td> <td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td> <td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td> <td>{{ subItem.ContractStatusStr }}</td>
...@@ -752,8 +750,8 @@ ...@@ -752,8 +750,8 @@
</template> </template>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType != 45" <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType != 45" :key="j"
:index="j" :style="{ :style="{
background: background:
x.ColorState == 1 x.ColorState == 1
? 'rgba(41, 97, 254, 0.2)' ? 'rgba(41, 97, 254, 0.2)'
...@@ -798,11 +796,10 @@ ...@@ -798,11 +796,10 @@
<th style="width:180px;">合同编号</th> <th style="width:180px;">合同编号</th>
<th>状态</th> <th>状态</th>
</tr> </tr>
<tr v-for="subItem in item.GuestList"> <tr v-for="(subItem,subIndex) in item.GuestList" :key="subIndex+600000">
<td> <td>
<q-radio dense v-model="chooseStudent" :val="subItem.Id" /> <q-radio dense v-model="chooseStudent" :val="subItem.Id" />
</td> </td>
<td>{{ subItem.GuestName }}</td> <td>{{ subItem.GuestName }}</td>
<td>{{ subItem.ContractNo }}</td> <td>{{ subItem.ContractNo }}</td>
<td>{{ subItem.ContractStatusStr }}</td> <td>{{ subItem.ContractStatusStr }}</td>
...@@ -816,8 +813,8 @@ ...@@ -816,8 +813,8 @@
</template> </template>
</div> </div>
<div class="row wrap" v-if="item.OrderType == 2"> <div class="row wrap" v-if="item.OrderType == 2">
<div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType == 45" <div class="finance row" v-for="(x, j) in item.RefundFinanceList" v-if="x.OtherType == 45" :key="j"
:index="j" :style="{ :style="{
background: background:
x.ColorState == 1 x.ColorState == 1
? 'rgba(41, 97, 254, 0.2)' ? 'rgba(41, 97, 254, 0.2)'
...@@ -850,258 +847,262 @@ ...@@ -850,258 +847,262 @@
</td> </td>
</tr> </tr>
</tbody> </tbody>
<tbody v-if="cancelList && cancelList.length > 0 && isShowCancel" v-for="(item, index) in cancelList" <template v-if="cancelList && cancelList.length > 0 && isShowCancel">
:key="index + 10000"> <tbody v-for="(item, index) in cancelList" :key="index + 10000">
<tr> <tr>
<td :rowspan="3" style="text-align: left"> <td :rowspan="3" style="text-align: left">
<div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold" <div style="font-size: 18px;color: #2961FE;margin-bottom: 20px;font-weight: bold"
@click="goOrderdetails(item)"> @click="goOrderdetails(item)">
{{ item.OrderId }} {{ item.OrderId }}
</div> </div>
<div>{{ item.EnterName }}</div> <div>{{ item.EnterName }}</div>
<div style="margin-top: 10px">{{ item.CreateTime }}</div> <div style="margin-top: 10px">{{ item.CreateTime }}</div>
<div style="margin-top: 30px;margin-bottom: 10px">班级</div> <div style="margin-top: 30px;margin-bottom: 10px">班级</div>
<div style="font-weight: bold;color:#2961FE;" @click="getClassInfo(item)"> <div style="font-weight: bold;color:#2961FE;" @click="getClassInfo(item)">
{{ item.ClassName }} {{ item.ClassName }}
</div> </div>
</td> </td>
<td style="border:none">{{ item.GuestNum }}人</td> <td style="border:none">{{ item.GuestNum }}人</td>
<td style="border:none"> <td style="border:none">
<template v-if="item.Class_Price >= 0"> <template v-if="item.Class_Price >= 0">
{{ item.Class_Price.toFixed(2) }} {{ item.Class_Price.toFixed(2) }}
</template> </template>
</td> </td>
<td :style="{ <td :style="{
color: color:
item.Class_Price != item.Unit_Price item.Class_Price != item.Unit_Price
? 'var(--q-color-negative)' ? 'var(--q-color-negative)'
: '', : '',
border: 'none' border: 'none'
}"> }">
<template v-if="item.Unit_Price >= 0"> <template v-if="item.Unit_Price >= 0">
{{ item.Unit_Price.toFixed(2) }} {{ item.Unit_Price.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none"> <td style="border:none">
<template v-if="item.PreferPrice >= 0"> <template v-if="item.PreferPrice >= 0">
{{ item.PreferPrice.toFixed(2) }} {{ item.PreferPrice.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none"> <td style="border:none">
<template v-if="item.Income >= 0"> <template v-if="item.Income >= 0">
{{ item.Income.toFixed(2) }} {{ item.Income.toFixed(2) }}
</template> </template>
</td> </td>
<td style="color:var(--q-color-negative);border:none"> <td style="color:var(--q-color-negative);border:none">
<template v-if="item.DiscountMoney >= 0"> <template v-if="item.DiscountMoney >= 0">
{{ item.DiscountMoney.toFixed(2) }} {{ item.DiscountMoney.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none"> <td style="border:none">
<template v-if="item.LessPrice >= 0"> <template v-if="item.LessPrice >= 0">
{{ item.LessPrice.toFixed(2) }} {{ item.LessPrice.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none"> <td style="border:none">
<template v-if="item.Refund >= 0"> <template v-if="item.Refund >= 0">
{{ item.Refund.toFixed(2) }} {{ item.Refund.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none"> <td style="border:none">
<template v-if="item.PlatformTax >= 0"> <template v-if="item.PlatformTax >= 0">
{{ item.PlatformTax.toFixed(2) }} {{ item.PlatformTax.toFixed(2) }}
</template> </template>
</td> </td>
<td style="color:#2961FE;border:none"> <td style="color:#2961FE;border:none">
<template v-if="item.DueInMoney && item.DueInMoney >= 0"> <template v-if="item.DueInMoney && item.DueInMoney >= 0">
{{ item.DueInMoney.toFixed(2) }} {{ item.DueInMoney.toFixed(2) }}
</template> </template>
</td> </td>
<td style="border:none"> <td style="border:none">
<div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center"> <div style="background: rgba(2, 196, 153, 0.2);width: 80px;border-radius: 2px;text-align: center">
<span style="color: #02C499">{{ item.OrderStateName }}</span> <span style="color: #02C499">{{ item.OrderStateName }}</span>
</div> </div>
</td> </td>
<td style="border:none;" v-if="AuthorityObj.isShowEdit && viewType == 0"> <td style="border:none;" v-if="AuthorityObj.isShowEdit && viewType == 0">
<q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑" <q-btn flat size="xs" icon="edit" color="accent" style="font-weight:400;display:none;" label="编辑"
@click="editOrder(item)" /> @click="editOrder(item)" />
<q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;"> <q-btn-dropdown flat size="xs" color="dark" label="更多" style="margin-left:10px;display:none;">
<q-list> <q-list>
<q-item clickable v-close-popup> <q-item clickable v-close-popup>
<q-item-section @click="gostudent(item)"> <q-item-section @click="gostudent(item)">
<q-item-label>学生名单</q-item-label> <q-item-label>学生名单</q-item-label>
</q-item-section> </q-item-section>
</q-item> </q-item>
</q-list> </q-list>
</q-btn-dropdown> </q-btn-dropdown>
</td> </td>
</tr> </tr>
<tr> <tr>
<td :colspan="12" style="text-align: left"> <td :colspan="12" style="text-align: left">
<div class="row" v-if="item.GuestList && item.GuestList.length > 0"> <div class="row" v-if="item.GuestList && item.GuestList.length > 0">
学生名单： 学生名单：
<span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 1" <template v-for="(x, j) in item.GuestList">
style="color:#2961FE;margin-right: 5px">{{ x.GuestName }} <span :key="j" v-if="x.GuestState == 1" style="color:#2961FE;margin-right: 5px">{{ x.GuestName }}
</span> </span>
</div> </template>
<div class="row" v-if=" </div>
<div class="row" v-if="
item.GuestList && item.GuestList &&
item.GuestList.length > 0 && item.GuestList.length > 0 &&
getTkshow(item.GuestList) getTkshow(item.GuestList)
"> ">
退课名单： 退课名单：
<span v-for="(x, j) in item.GuestList" :index="j" v-if="x.GuestState == 2" <template v-for="(x, j) in item.GuestList">
style="color:var(--q-color-negative);margin-right: 5px">{{ x.GuestName }} <span :key="j" v-if="x.GuestState == 2"
</span> style="color:var(--q-color-negative);margin-right: 5px">{{ x.GuestName }}
</div> </span>
<span v-if="item.GuestList && item.GuestList.length == 0">暂无</span> </template>
</td> </div>
</tr> <span v-if="item.GuestList && item.GuestList.length == 0">暂无</span>
<tr> </td>
<td :colspan="12" style="height: 168px;text-align: left"> </tr>
<div class="col row remarks q-gutter-x-md"> <tr>
<div class="col"> <td :colspan="12" style="height: 168px;text-align: left">
<div>销售备注：</div> <div class="col row remarks q-gutter-x-md">
<div class="remarks-b"> <div class="col">
<div v-if="item.SaleRemark != null || item.SaleRemark != ''"> <div>销售备注：</div>
<div>{{ item.SaleRemark }}</div> <div class="remarks-b">
<div class="remarks-b-b"> <div v-if="item.SaleRemark != null || item.SaleRemark != ''">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if=" <div>{{ item.SaleRemark }}</div>
<div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="
item.SaleRemarkList && item.SaleRemarkList &&
item.SaleRemarkList.length > 0 item.SaleRemarkList.length > 0
"></span> "></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>销售备注</div> <div>销售备注</div>
<div v-for="(xq, jq) in item.SaleRemarkList" :index="jq" <div v-for="(xq, jq) in item.SaleRemarkList" :key="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
</div>
</div> </div>
</div> </div>
</div> </q-banner>
</q-banner> </q-popup-proxy>
</q-popup-proxy> </div>
</div> </div>
<span v-if="item.SaleRemark == null || item.SaleRemark == ''">暂无</span>
</div> </div>
<span v-if="item.SaleRemark == null || item.SaleRemark == ''">暂无</span>
</div> </div>
</div> <div class="col">
<div class="col"> <div>教务备注：</div>
<div>教务备注：</div> <div class="remarks-b ">
<div class="remarks-b "> <div v-if="
<div v-if="
item.TeacherRemark != null || item.TeacherRemark != '' item.TeacherRemark != null || item.TeacherRemark != ''
"> ">
<div>{{ item.TeacherRemark }}</div> <div>{{ item.TeacherRemark }}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if=" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="
item.TeacherRemarkList && item.TeacherRemarkList &&
item.TeacherRemarkList.length > 0 item.TeacherRemarkList.length > 0
"></span> "></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>教务备注</div> <div>教务备注</div>
<div v-for="(xq, jq) in item.TeacherRemarkList" :index="jq" <div v-for="(xq, jq) in item.TeacherRemarkList" :key="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
</div>
</div> </div>
</div> </div>
</div> </q-banner>
</q-banner> </q-popup-proxy>
</q-popup-proxy> </div>
</div> </div>
</div> <span v-if="
<span v-if="
item.TeacherRemark == null || item.TeacherRemark == '' item.TeacherRemark == null || item.TeacherRemark == ''
">暂无</span> ">暂无</span>
</div>
</div> </div>
</div> <div class="col">
<div class="col"> <div>校长备注：</div>
<div>校长备注：</div> <div class="remarks-b ">
<div class="remarks-b "> <div v-if="
<div v-if="
item.RectorRemark != null || item.RectorRemark != '' item.RectorRemark != null || item.RectorRemark != ''
"> ">
<div>{{ item.RectorRemark }}</div> <div>{{ item.RectorRemark }}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if=" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="
item.RectorRemarkList && item.RectorRemarkList &&
item.RectorRemarkList.length > 0 item.RectorRemarkList.length > 0
"></span> "></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>校长备注</div> <div>校长备注</div>
<div v-for="(xq, jq) in item.RectorRemarkList" :index="jq" <div v-for="(xq, jq) in item.RectorRemarkList" :key="jq"
style="margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style="margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
</div>
</div> </div>
</div> </div>
</div> </q-banner>
</q-banner> </q-popup-proxy>
</q-popup-proxy> </div>
</div> </div>
</div> <span v-if="
<span v-if="
item.RectorRemark == null || item.RectorRemark == '' item.RectorRemark == null || item.RectorRemark == ''
">暂无</span> ">暂无</span>
</div>
</div> </div>
</div> <div class="col">
<div class="col"> <div>总经理备注：</div>
<div>总经理备注：</div> <div class="remarks-b ">
<div class="remarks-b "> <div v-if="
<div v-if="
item.DirectorRemark != null || item.DirectorRemark != '' item.DirectorRemark != null || item.DirectorRemark != ''
"> ">
<div>{{ item.DirectorRemark }}</div> <div>{{ item.DirectorRemark }}</div>
<div class="remarks-b-b"> <div class="remarks-b-b">
<span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if=" <span class="iconfont icon-xiangxia" style="color: #2961FE;font-size: 10px" v-if="
item.DirectorRemarkList && item.DirectorRemarkList &&
item.DirectorRemarkList.length > 0 item.DirectorRemarkList.length > 0
"></span> "></span>
<q-popup-proxy> <q-popup-proxy>
<q-banner> <q-banner>
<div style="width: 500px;"> <div style="width: 500px;">
<div>总经理备注</div> <div>总经理备注</div>
<div v-for="(xq, jq) in item.DirectorRemarkList" :index="jq" <div v-for="(xq, jq) in item.DirectorRemarkList" :key="jq"
style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px"> style=" margin-top: 10px;background: #e6e6e6;padding: 5px;font-size: 12px">
<div>{{ xq.Content }}</div> <div>{{ xq.Content }}</div>
<div style="text-align: right"> <div style="text-align: right">
{{ xq.CreateBy }} {{ xq.CreateTime }} {{ xq.CreateBy }} {{ xq.CreateTime }}
</div>
</div> </div>
</div> </div>
</div> </q-banner>
</q-banner> </q-popup-proxy>
</q-popup-proxy> </div>
</div> </div>
</div> <span v-if="
<span v-if="
item.DirectorRemark == null || item.DirectorRemark == '' item.DirectorRemark == null || item.DirectorRemark == ''
">暂无</span> ">暂无</span>
</div>
</div> </div>
</div> <div class="col">
<div class="col"> <div class="row" style="justify-content: space-between">
<div class="row" style="justify-content: space-between"> <span>收款单据：</span>
<span>收款单据：</span> </div>
</div> <div class="row wrap"></div>
<div class="row wrap"></div> <div class="row" style="justify-content: space-between">
<div class="row" style="justify-content: space-between"> <span>付款单据：</span>
<span>付款单据：</span> </div>
<div class="row wrap"></div>
</div> </div>
<div class="row wrap"></div>
</div> </div>
</div> </td>
</td> </tr>
</tr> </tbody>
</tbody> </template>
<!--取消订单--> <!--取消订单-->
</table> </table>
</div> </div>
......
src/components/schedul/appoint-form.vue
View file @ 0ceef7e1
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
.time-select { .time-select {
z-index: 9999 !important; z-index: 9999 !important;
} }
</style> </style>
<template> <template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeAppointForm"> <q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeAppointForm">
...@@ -36,8 +35,8 @@ ...@@ -36,8 +35,8 @@
</template> </template>
</q-input> </q-input>
<div class="Sysuser_Date"> <div class="Sysuser_Date">
<q-field filled class="q-pb-lg"> <q-field filled class="q-pb-lg">
  <template v-slot:control> <template v-slot:control>
<el-time-select v-model="addMsg.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{ <el-time-select v-model="addMsg.ClassTime" ref="ClassTime" style="width:50%" :picker-options="{
start: '09:00', start: '09:00',
step: '00:15', step: '00:15',
...@@ -55,9 +54,10 @@ ...@@ -55,9 +54,10 @@
</template> </template>
</q-field> </q-field>
</div> </div>
<q-select filled stack-label option-value="Name" option-label="Name" @input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent" <q-select filled stack-label option-value="Name" option-label="Name"
ref="ClassContent" :options="ContentList" :rules="[val => !!val || '请选择主讲内容']" label="主讲内容" :dense="false" @input="getTeacherChoose(addMsg.ClassContent)" v-model="addMsg.ClassContent" ref="ClassContent"
class="col-6 q-pb-lg" emit-value map-options /> :options="ContentList" :rules="[val => !!val || '请选择主讲内容']" label="主讲内容" :dense="false" class="col-6 q-pb-lg"
emit-value map-options />
<q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="addMsg.TeacherId" <q-select filled stack-label option-value="TId" option-label="TeacherName" v-model="addMsg.TeacherId"
ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pb-lg" emit-value ref="TeacherId" :options="TeacherList" label="选择教师" :dense="false" class="col-6 q-pb-lg" emit-value
map-options /> map-options />
...@@ -237,15 +237,15 @@ ...@@ -237,15 +237,15 @@
} }
}, },
//选择主讲内容赋值选择教师 //选择主讲内容赋值选择教师
getTeacherChoose(content){ getTeacherChoose(content) {
var TList = []; var TList = [];
this.addMsg.TeacherId=''; this.addMsg.TeacherId = '';
this.TeacherList = this.AllTeacherList; this.TeacherList = this.AllTeacherList;
this.TeacherList.forEach(x=>{ this.TeacherList.forEach(x => {
this.ContentList.forEach(y=>{ this.ContentList.forEach(y => {
if(y.Name==content){ if (y.Name == content) {
if(x.TId>0){ if (x.TId > 0) {
if(x.ChooseSpecialty.indexOf(y.Id)>-1){ if (x.ChooseSpecialty.indexOf(y.Id) > -1) {
TList.push(x); TList.push(x);
} }
} }
...@@ -256,5 +256,4 @@ ...@@ -256,5 +256,4 @@
} }
} }
} }
</script>
</script> \ No newline at end of file
src/components/schedul/audition-form.vue
View file @ 0ceef7e1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<q-card-section> <q-card-section>
<div class="row wrap"> <div class="row wrap">
<div class="col-6 q-pb-lg q-pr-lg"> <div class="col-6 q-pb-lg q-pr-lg">
<q-field borderless> <q-field borderless>
 <template v-slot:prepend>  <template v-slot:prepend>
<q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期"> <q-input filled v-model="msg.StartClassDate" mask="date" label="开始日期">
<template v-slot:append> <template v-slot:append>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
var year = nowDay.getFullYear(); //年 var year = nowDay.getFullYear(); //年
var month = nowDay.getMonth() + 1; //月 var month = nowDay.getMonth() + 1; //月
var day = nowDay.getDate(); //日 var day = nowDay.getDate(); //日
var currentDay= year + '-' + (month<10?('0'+month):month) + '-' + day; var currentDay = year + '-' + (month < 10 ? ('0' + month) : month) + '-' + day;
this.msg.StartClassDate = currentDay; this.msg.StartClassDate = currentDay;
this.getList(); this.getList();
}, },
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
this.StuObj.ClassTime = item.ClassTime; this.StuObj.ClassTime = item.ClassTime;
this.StuObj.EndTime = item.EndTime; this.StuObj.EndTime = item.EndTime;
this.StuObj.ClassContent = item.ClassContent; this.StuObj.ClassContent = item.ClassContent;
this.StuObj.TrialLessonId=item.TrialLessonId; this.StuObj.TrialLessonId = item.TrialLessonId;
} }
this.$emit('getchildInfo', this.StuObj); this.$emit('getchildInfo', this.StuObj);
this.closeSaveForm(); this.closeSaveForm();
...@@ -208,15 +208,13 @@ ...@@ -208,15 +208,13 @@
this.$refs.StartClassDate.hide(); this.$refs.StartClassDate.hide();
this.resetSearch(); this.resetSearch();
}, },
getEndTime() getEndTime() {
{
this.$refs.EndClassDate.hide(); this.$refs.EndClassDate.hide();
this.resetSearch(); this.resetSearch();
} }
}, },
} }
</script> </script>
<style> <style>
</style> </style>
\ No newline at end of file
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