Skip to content

C
confucius
Commit 604116a6 authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 69505e25
Hide whitespace changes
Inline Side-by-side
Showing with 241 additions and 11 deletions
src/components/sale/changebill-form.vue
View file @ 604116a6
......@@ -40,7 +40,49 @@
margin-top: 20px;
width: 300px;
}
.backinfoContent .replayReason {
width: 100%;
min-height: 100px;
background-color: #F7F7F7;
border-radius: 3px;
padding: 20px;
margin: 20px 0;
}
.backinfoContent .replay_Title {
font-weight: 700;
color: #111;
}
.backinfoContent .baseInfo_Item {
margin-bottom: 20px;
}
.backinfoContent .EmpList {
background-color: #F7F7F7;
min-height: 70px;
margin-right: 15px;
border-radius: 3px;
padding: 15px;
}
.backinfoContent .normalName {
color: #999999;
font-size: 12px;
}
.backinfoContent .normalInner {
color: #111111;
font-weight: bold;
font-size: 13px;
margin-top: 5px;
}
.changeBTable th{
font-size: 12px;
font-weight: 400;
background-color: rgba(0, 0, 0, 0.12);
height:40px;
line-height: 40px;
}
.changeBTable td{
text-align: center;
height:30px;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
......@@ -48,7 +90,7 @@
<div class="drawerTop">
<div style="display:flex;align-items:center;">
<div class="className">
<div class="classFirst">调课审批</div>
<div class="classFirst">{{changeTitle}}</div>
</div>
</div>
</div>
......@@ -80,27 +122,129 @@
</div>
</div>
<div class="backinfo_Item">
<span class="role_Line" style="background-color:#F28C1D"></span>申请信息
<span class="role_Line" style="background-color:#F28C1D"></span>教学信息
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">调动类型：</span>
<span class="backOtherInfo">{{setingObj.DataObj.ChangeTypeStr}}</span>
<span class="backInfo_Title">校区：</span>
<span class="backOtherInfo">{{setingObj.DataObj.School_Id}}</span>
</div>
<div class="col-6">
<span class="backInfo_Title">调动选项:</span>
<span class="backInfo_Title">班级信息:</span>
<span class="backOtherInfo">
{{setingObj.DataObj.MoveTypeStr}}
{{setingObj.ClassName}}
<span style="color:#2961FE;cursor:pointer;"
@click="goClassManage(setingObj.ClassName)">{{setingObj.ClassNo}}</span>
</span>
</div>
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">班级：</span>
<span class="backOtherInfo">{{setingObj.DataObj.ClassName}}</span>
<span class="backInfo_Title">带班老师：</span>
<span class="backOtherInfo"></span>
</div>
<div class="col-6">
<span class="backInfo_Title">学习课程：</span>
<span class="backOtherInfo"></span>
</div>
</div>
</div>
<div class="row backInfo_One">
<q-table no-data-label="暂无相关数据" flat style="width:100%;" v-if="setingObj.DataObj.OldChangePlanItemList" :pagination="pages"
class="sticky-column-table no-bottom-table" separator="none" :data="setingObj.DataObj.OldChangePlanItemList"
:columns="setingObj.DataObj.ChangeType==1?columns:columns2">
<template v-slot:body-cell-PlanTimeList="props">
<q-td :props="props">
<div v-for="(item,index) in props.row.PlanTimeList">
{{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
</div>
</q-td>
</template>
<template v-slot:body-cell-PlanTimeList2="props">
<q-td :props="props">
<div v-for="(item,index) in props.row.PlanTimeList">
{{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
</div>
</q-td>
</template>
</q-table>
</div>
<template v-if="setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==2">
<div class="row backInfo_One">
<div class="col EmpList">
<div class="normalName">开班时间</div>
<div class="normalInner">{{setingObj.DataObj.AllChangePlanModel.OpenTimeStr}}</div>
</div>
<div class="col EmpList">
<div class="normalName">排课安排</div>
<div class="normalInner">
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==1">按周排课</span>
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==2">按月排课</span>
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==3">固定日期</span>
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==4">约课</span>
</div>
</div>
</div>
<div class="row backInfo_One">
<div class="col EmpList">
<div class="normalName">选择周几</div>
<div class="normalInner">
<span style="margin-right:5px;" v-for="(item,index) in setingObj.DataObj.AllChangePlanModel.WeekDayList">{{item}}</span>
</div>
</div>
<div class="col EmpList">
<div class="normalName">学习课时</div>
<div class="normalInner">
{{setingObj.DataObj.AllChangePlanModel.ClassHours}}
</div>
</div>
</div>
<div class="row backInfo_One">
<div class="col EmpList">
<div class="normalName">课时分钟数</div>
<div class="normalInner">
{{setingObj.DataObj.AllChangePlanModel.ClassHourMinute}}
</div>
</div>
</div>
<table style="width:100%;border-collapse: collapse;" class="changeBTable">
<thead>
<tr>
<th>
日期/周
</th>
<th colspan="2">
时间
</th>
<th>
消耗课时
</th>
</tr>
</thead>
<tbody v-for="(nItem,nIndex) in setingObj.DataObj.AllChangePlanModel.DefaultTimeList" :key="nIndex+10000">
<tr v-for="(sItem,sIndex) in nItem.TimeList">
<td :rowspan="nItem.TimeList.length" v-if="sIndex==0">
<span style="margin-right:5px;" v-for="oItem in nItem.DateList">{{oItem}}</span>
</td>
<td>
{{sItem.StartTime}}
</td>
<td>
{{sItem.EndTime}}
</td>
<td>
{{sItem.TimeHour}}
</td>
</tr>
</tbody>
</table>
</template>
<div class="replayReason">
<div class="replay_Title">变更原因</div>
<div style="color: rgb(102, 102, 102); margin-top: 5px;">
</div>
</div>
<div v-if="showType==2">
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:20px;">
<div>审批意见</div>
......@@ -206,6 +350,70 @@
EmployeeList: [],
AllemployeeList: [],
tempPeople: [], //抄送人数组
changeTitle: '',
columns: [{
name: 'RoomName',
label: '教室名称',
field: 'RoomName',
align: 'left',
}, {
name: 'ClassDate',
label: '上课日期',
field: 'ClassDate',
align: 'left'
},
{
name: 'TeacherName',
label: '老师',
field: 'TeacherName',
align: 'left'
},
{
name: 'PlanTimeList',
label: '上课时间',
field: 'TimeList',
align: 'left'
},
{
name: 'ClassDate2',
label: '目标日期',
field: 'ClassDate2',
align: 'left'
},
{
name: 'PlanTimeList2',
label: '目标时间',
field: 'PlanTimeList2',
align: 'left'
}
],
columns2: [{
name: 'RoomName',
label: '教室名称',
field: 'RoomName',
align: 'left',
}, {
name: 'ClassDate',
label: '上课日期',
field: 'ClassDate',
align: 'left'
},
{
name: 'TeacherName',
label: '老师',
field: 'TeacherName',
align: 'left'
},
{
name: 'PlanTimeList2',
label: '上课时间',
field: 'PlanTimeList2',
align: 'left'
}
],
pages: {
rowsPerPage: 100000
},
}
},
created() {
......@@ -215,8 +423,30 @@
console.log("this.setingObj", this.setingObj)
this.changeBillMsg.Id = this.setingObj.Id;
this.changeBillMsg.SpecialNode = this.setingObj.SpecialNode;
if (this.setingObj.DataObj.ChangeType == 1) {
this.changeTitle = '课程时间变更'
}
if (this.setingObj.DataObj.ChangeType == 2) {
this.changeTitle = '老师变更'
}
if (this.setingObj.DataObj.ChangeType == 3) {
this.changeTitle = '教室变更'
}
if (this.setingObj.DataObj.ChangeType == 4) {
this.changeTitle = '取消上课变更'
}
if (this.setingObj.DataObj.OldChangePlanItemList && this.setingObj.DataObj.NewChangePlanItemList) {
this.setingObj.DataObj.OldChangePlanItemList.forEach(x => {
this.setingObj.DataObj.NewChangePlanItemList.forEach(y => {
x.ClassPlanId2 = y.ClassPlanId;
x.ClassRoomId2 = y.ClassRoomId;
x.TeacherId2 = y.TeacherId;
x.ClassDate2 = y.ClassDate;
x.PlanTimeList2 = y.PlanTimeList;
})
})
}
console.log(this.setingObj.DataObj.OldChangePlanItemList);
},
methods: {
......
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