Skip to content

C
confucius
Commit 4e1bae44 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 069f2dbb
Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 77 deletions
src/components/sale/changebill-form.vue
View file @ 4e1bae44
...@@ -182,8 +182,7 @@ ...@@ -182,8 +182,7 @@
</div> </div>
<q-table no-data-label="暂无相关数据" flat style="width:100%;" v-if="dataList&&dataList.length>0" <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" :pagination="pages" class="sticky-column-table no-bottom-table" separator="none" :data="dataList"
:data="dataList"
:columns="setingObj.DataObj.ChangeType==1?columns:columns2"> :columns="setingObj.DataObj.ChangeType==1?columns:columns2">
<template v-slot:body-cell-PlanTimeList="props"> <template v-slot:body-cell-PlanTimeList="props">
<q-td :props="props"> <q-td :props="props">
...@@ -199,12 +198,14 @@ ...@@ -199,12 +198,14 @@
</template> </template>
<template v-slot:body-cell-ClassRoomName="props"> <template v-slot:body-cell-ClassRoomName="props">
<q-td :prop="props"> <q-td :prop="props">
<span :class="{'BillredClass':setingObj.DataObj.ChangeType==3&&setingObj.DataObj.MoveType==1}">{{props.row.ClassRoomName}}</span> <span
:class="{'BillredClass':setingObj.DataObj.ChangeType==3&&setingObj.DataObj.MoveType==1}">{{props.row.ClassRoomName}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-TeacherName="props"> <template v-slot:body-cell-TeacherName="props">
<q-td :prop="props"> <q-td :prop="props">
<span :class="{'BillredClass':setingObj.DataObj.ChangeType==2&&setingObj.DataObj.MoveType==1}">{{props.row.TeacherName}}</span> <span
:class="{'BillredClass':setingObj.DataObj.ChangeType==2&&setingObj.DataObj.MoveType==1}">{{props.row.TeacherName}}</span>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-PlanTimeList2="props"> <template v-slot:body-cell-PlanTimeList2="props">
...@@ -216,77 +217,103 @@ ...@@ -216,77 +217,103 @@
</q-td> </q-td>
</template> </template>
</q-table> </q-table>
<template v-if="setingObj.DataObj.ChangeType==1&&setingObj.DataObj.MoveType==2"> <!--全局调整-->
<div class="row backInfo_One"> <template v-if="setingObj.DataObj.MoveType==2">
<div class="col EmpList"> <!--全局调整课程-->
<div class="normalName">开班时间</div> <template v-if="setingObj.DataObj.ChangeType==1">
<div class="normalInner">{{setingObj.DataObj.AllChangePlanModel.OpenTimeStr}}</div> <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>
<div class="col EmpList"> <div class="row backInfo_One">
<div class="normalName">排课安排</div> <div class="col EmpList">
<div class="normalInner"> <div class="normalName">选择周几</div>
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==1">按周排课</span> <div class="normalInner">
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==2">按月排课</span> <span style="margin-right:5px;"
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==3">固定日期</span> v-for="(item,index) in setingObj.DataObj.AllChangePlanModel.WeekDayList">{{item}}</span>
<span v-if="setingObj.DataObj.AllChangePlanModel.ClassStyle==4">约课</span> </div>
</div>
<div class="col EmpList">
<div class="normalName">学习课时</div>
<div class="normalInner">
{{setingObj.DataObj.AllChangePlanModel.ClassHours}}
</div>
</div> </div>
</div> </div>
</div> <div class="row backInfo_One">
<div class="row backInfo_One"> <div class="col EmpList">
<div class="col EmpList"> <div class="normalName">课时分钟数</div>
<div class="normalName">选择周几</div> <div class="normalInner">
<div class="normalInner"> {{setingObj.DataObj.AllChangePlanModel.ClassHourMinute}}
<span style="margin-right:5px;" </div>
v-for="(item,index) in setingObj.DataObj.AllChangePlanModel.WeekDayList">{{item}}</span>
</div> </div>
</div> </div>
<div class="col EmpList"> <table style="width:100%;border-collapse: collapse;" class="changeBTable">
<div class="normalName">学习课时</div> <thead>
<div class="normalInner"> <tr>
{{setingObj.DataObj.AllChangePlanModel.ClassHours}} <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>
<!--全局调整老师-->
<template v-if="setingObj.DataObj.ChangeType==2">
<div class="row backInfo_One">
<div class="col EmpList">
<div class="normalName">变更后老师:</div>
<div class="normalInner">{{setingObj.DataObj.AllChangePlanModel.TeacherName}}</div>
</div> </div>
</div> </div>
</div> </template>
<div class="row backInfo_One"> <!--全局调整教室-->
<div class="col EmpList"> <template v-if="setingObj.DataObj.ChangeType==3">
<div class="normalName">课时分钟数</div> <div class="row backInfo_One">
<div class="normalInner"> <div class="col EmpList">
{{setingObj.DataObj.AllChangePlanModel.ClassHourMinute}} <div class="normalName">变更后教室:</div>
<div class="normalInner">{{setingObj.DataObj.AllChangePlanModel.ClassRoomName}}</div>
</div> </div>
</div> </div>
</div> </template>
<table style="width:100%;border-collapse: collapse;" class="changeBTable"> </template>
<thead> <!--固定日期调整-->
<tr> <template v-if="setingObj.DataObj.MoveType==1">
<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> </template>
<div class="replayReason"> <div class="replayReason">
<div class="replay_Title">变更原因</div> <div class="replay_Title">变更原因</div>
...@@ -463,7 +490,7 @@ ...@@ -463,7 +490,7 @@
pages: { pages: {
rowsPerPage: 100000 rowsPerPage: 100000
}, },
dataList:[] dataList: []
} }
}, },
created() { created() {
...@@ -476,20 +503,20 @@ ...@@ -476,20 +503,20 @@
if (this.setingObj.DataObj.ChangeType == 1) { if (this.setingObj.DataObj.ChangeType == 1) {
this.changeTitle = '课程时间变更' this.changeTitle = '课程时间变更'
if (this.setingObj.DataObj.MoveType == 1) { if (this.setingObj.DataObj.MoveType == 1) {
this.dataList=[]; this.dataList = [];
if (this.setingObj.DataObj.OldChangePlanItemList && this.setingObj.DataObj.NewChangePlanItemList) { if (this.setingObj.DataObj.OldChangePlanItemList && this.setingObj.DataObj.NewChangePlanItemList) {
this.setingObj.DataObj.OldChangePlanItemList.forEach((x,index) => { this.setingObj.DataObj.OldChangePlanItemList.forEach((x, index) => {
var obj = { var obj = {
ClassRoomName:x.ClassRoomName, ClassRoomName: x.ClassRoomName,
ClassDateStr:x.ClassDateStr, ClassDateStr: x.ClassDateStr,
TeacherName:x.TeacherName, TeacherName: x.TeacherName,
PlanTimeList:x.PlanTimeList, PlanTimeList: x.PlanTimeList,
ClassDate2:this.setingObj.DataObj.NewChangePlanItemList[index].ClassDateStr, ClassDate2: this.setingObj.DataObj.NewChangePlanItemList[index].ClassDateStr,
PlanTimeList2:this.setingObj.DataObj.NewChangePlanItemList[index].PlanTimeList PlanTimeList2: this.setingObj.DataObj.NewChangePlanItemList[index].PlanTimeList
} }
this.dataList.push(obj); this.dataList.push(obj);
}) })
console.log(this.dataList,'datraList'); console.log(this.dataList, 'datraList');
} }
} }
} }
......
src/pages/user/billquery.vue
View file @ 4e1bae44
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-col-gutter-md"> <div class="col row wrap q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @change="resetSearch" clearable filled v-model="msg.Id" label="单据编号" /> <q-input clearable filled v-model="msg.Id" label="单据编号" @input="resetSearch" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable filled v-model="msg.VerifyStatus" :options="ShowOpts" emit-value <q-select @input="resetSearch" clearable filled v-model="msg.VerifyStatus" :options="ShowOpts" emit-value
......
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