Skip to content

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

修改

parent 7c33f78b
Hide whitespace changes
Inline Side-by-side
Showing with 128 additions and 86 deletions
src/components/sale/changebill-form.vue
View file @ cb507b8e
......@@ -40,21 +40,25 @@
margin-top: 20px;
width: 300px;
}
.backinfoContent .replayReason {
width: 100%;
min-height: 100px;
background-color: #F7F7F7;
border-radius: 3px;
padding: 20px;
margin: 20px 0;
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;
margin-bottom: 20px;
}
.backinfoContent .EmpList {
background-color: #F7F7F7;
min-height: 70px;
......@@ -62,30 +66,36 @@
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{
.changeBTable th {
font-size: 12px;
font-weight: 400;
background-color: rgba(0, 0, 0, 0.12);
height:40px;
height: 40px;
line-height: 40px;
}
.changeBTable td{
.changeBTable td {
text-align: center;
height:30px;
height: 30px;
}
.BillredClass{
color:red;
.BillredClass {
color: red;
}
</style>
<template>
<q-dialog v-model="persistent" maximized full-height seamless position="right" @hide="closeShenheForm">
......@@ -155,69 +165,95 @@
</span>
</div>
</div>
<div class="row backInfo_One">
<div class="col-6">
<span class="backInfo_Title">变更类型：</span>
<span class="backOtherInfo">
{{setingObj.DataObj.ChangeTypeStr}}
</span>
</div>
<div class="col-6">
<span class="backInfo_Title">变更范围：</span>
<span class="backOtherInfo">
{{setingObj.DataObj.MoveTypeStr}}
</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-ClassDate2="props">
<q-td :prop="props">
<span style="color:red">{{props.row.ClassDate2}}</span>
</q-td>
</template>
<template v-slot:body-cell-PlanTimeList2="props">
<q-td :props="props">
<div :class="{'BillredClass':setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==1}" v-for="(item,index) in props.row.PlanTimeList2">
{{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
</div>
</q-td>
</template>
</q-table>
</div>
<q-table no-data-label="暂无相关数据" flat style="width:100%;" v-if="dataList&&dataList.length>0"
:pagination="pages" class="sticky-column-table no-bottom-table" separator="none"
:data="dataList"
: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-ClassDate2="props">
<q-td :prop="props">
<span style="color:red">{{props.row.ClassDate2}}</span>
</q-td>
</template>
<template v-slot:body-cell-ClassRoomName="props">
<q-td :prop="props">
<span :class="{'BillredClass':setingObj.DataObj.ChangeType==3&&setingObj.DataObj.MoveType==1}">{{props.row.ClassRoomName}}</span>
</q-td>
</template>
<template v-slot:body-cell-TeacherName="props">
<q-td :prop="props">
<span :class="{'BillredClass':setingObj.DataObj.ChangeType==2&&setingObj.DataObj.MoveType==1}">{{props.row.TeacherName}}</span>
</q-td>
</template>
<template v-slot:body-cell-PlanTimeList2="props">
<q-td :props="props">
<div :class="{'BillredClass':setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==1}"
v-for="(item,index) in props.row.PlanTimeList2">
{{index+1}}节课 {{item.StartTime}}-{{item.EndTime}}
</div>
</q-td>
</template>
</q-table>
<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 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 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 class="col EmpList">
<div class="normalName">学习课时</div>
<div class="normalInner">
{{setingObj.DataObj.AllChangePlanModel.ClassHours}}
</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 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>
......@@ -233,7 +269,8 @@
</th>
</tr>
</thead>
<tbody v-for="(nItem,nIndex) in setingObj.DataObj.AllChangePlanModel.DefaultTimeList" :key="nIndex+10000">
<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>
......@@ -256,7 +293,7 @@
<div style="color: rgb(102, 102, 102); margin-top: 5px;">
{{setingObj.DataObj.Remarks}}
</div>
</div>
</div>
<div v-if="showType==2">
<div style="display:flex;justify-content:space-between;align-items:center;margin-top:20px;">
<div>审批意见</div>
......@@ -417,15 +454,16 @@
align: 'left'
},
{
name: 'PlanTimeList2',
name: 'PlanTimeList',
label: '上课时间',
field: 'PlanTimeList2',
field: 'PlanTimeList',
align: 'left'
}
],
pages: {
rowsPerPage: 100000
},
dataList:[]
}
},
created() {
......@@ -437,31 +475,35 @@
this.changeBillMsg.SpecialNode = this.setingObj.SpecialNode;
if (this.setingObj.DataObj.ChangeType == 1) {
this.changeTitle = '课程时间变更'
if (this.setingObj.DataObj.MoveType == 1) {
this.dataList=[];
if (this.setingObj.DataObj.OldChangePlanItemList && this.setingObj.DataObj.NewChangePlanItemList) {
this.setingObj.DataObj.OldChangePlanItemList.forEach((x,index) => {
var obj = {
ClassRoomName:x.ClassRoomName,
ClassDateStr:x.ClassDateStr,
TeacherName:x.TeacherName,
PlanTimeList:x.PlanTimeList,
ClassDate2:this.setingObj.DataObj.NewChangePlanItemList[index].ClassDateStr,
PlanTimeList2:this.setingObj.DataObj.NewChangePlanItemList[index].PlanTimeList
}
this.dataList.push(obj);
})
console.log(this.dataList,'datraList');
}
}
}
if (this.setingObj.DataObj.ChangeType == 2) {
this.changeTitle = '老师变更'
this.dataList = this.setingObj.DataObj.NewChangePlanItemList
}
if (this.setingObj.DataObj.ChangeType == 3) {
this.changeTitle = '教室变更'
this.dataList = this.setingObj.DataObj.NewChangePlanItemList
}
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.ClassDateStr;
x.PlanTimeList2 = y.PlanTimeList;
})
})
}
if(this.setingObj.DataObj.ChangeType==4&&this.setingObj.DataObj.MoveType==1){
this.setingObj.DataObj.OldChangePlanItemList.forEach(x => {
x.PlanTimeList2 = x.PlanTimeList
})
this.dataList = this.setingObj.DataObj.NewChangePlanItemList
}
console.log(this.setingObj.DataObj.OldChangePlanItemList);
},
......
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