Skip to content

C
confucius
Commit 59b1e2b4 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent ee3300ec
Expand all Show whitespace changes
Inline Side-by-side
Showing with 703 additions and 39 deletions
src/components/sale/vipcoursebill-form.vue 0 → 100644
View file @ 59b1e2b4
This diff is collapsed.
src/pages/teacher/changeClassManager.vue
View file @ 59b1e2b4
......@@ -22,7 +22,6 @@
white-space: nowrap;
text-overflow: ellipsis;
}
</style>
<template>
<div class="page-body">
......@@ -163,6 +162,10 @@
<!-- 投稿审批 -->
<tougaoForm v-if="isShowTougaoForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage"></tougaoForm>
<!-- 显示Vip课程申请 -->
<vipcoursebillForm v-if="isShowVipCourseForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage"></vipcoursebillForm>
</div>
</div>
</template>
......@@ -183,6 +186,7 @@
import zujuanBillForm from "../../components/sale/zujuanbill-form.vue";
import examBillForm from "../../components/sale/exambill-form.vue";
import tougaoForm from "../../components/sale/tougao-form.vue";
import vipcoursebillForm from "../../components/sale/vipcoursebill-form.vue";
export default {
meta: {
title: "我的业务单据",
......@@ -197,7 +201,8 @@
leaveBillForm,
zujuanBillForm,
examBillForm,
tougaoForm
tougaoForm,
vipcoursebillForm
},
data() {
return {
......@@ -274,7 +279,7 @@
EndTime: "", //结束时间
Conditon: 1,
ReceiptType: "", //单据类型
RelationId :0,
RelationId: 0,
},
tabCheck: "1",
pageCount: 0,
......@@ -290,7 +295,8 @@
isShowLeaveBillForm: false, //是否显示请假申请单详情
isShowZujuanBillForm: false, //是否显示组卷申请单详情
isShowExamBillForm: false, //是否显示考试申请详情
isShowTougaoForm: false //是否显示投稿申请详情
isShowTougaoForm: false, //是否显示投稿申请详情,
isShowVipCourseForm: false, //是否显示Vip课程申请详情,
};
},
created() {
......@@ -303,8 +309,6 @@
if (this.$route.query.RelationId) {
this.msg.RelationId = this.$route.query.RelationId;
}
if (this.$route.query.id) {
this.msg.Id = this.$route.query.id;
}
......@@ -356,6 +360,7 @@
this.isShowZujuanBillForm = false;
this.isShowExamBillForm = false;
this.isShowTougaoForm = false;
this.isShowVipCourseForm = false;
this.billObj = {};
},
//显示表单
......@@ -393,8 +398,10 @@
this.isShowExamBillForm = true;
}
//投稿审批
else if (item.ReceiptType == 10){
else if (item.ReceiptType == 10) {
this.isShowTougaoForm = true;
} else if (item.ReceiptType == 11) {
this.isShowVipCourseForm = true;
}
this.showType = type;
this.billObj = item;
......@@ -442,6 +449,7 @@
this.isShowLeaveBillForm = false;
this.isShowZujuanBillForm = false;
this.isShowExamBillForm = false;
this.isShowVipCourseForm = false;
this.billObj = {};
this.getStuBackBill();
},
......@@ -461,7 +469,6 @@
Id: item.Id,
};
var message = "是否要作废此单据？";
this.$q
.dialog({
title: "提示信息",
......@@ -502,9 +509,7 @@
},
},
};
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/pages/user/billquery.vue
View file @ 59b1e2b4
......@@ -20,8 +20,9 @@
width: 400px;
min-height: 150px;
}
.bill_Rearsons{
width:250px;
.bill_Rearsons {
width: 250px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis
......@@ -43,19 +44,19 @@
v-model="msg.ReceiptType" :options="OrderTypeList" emit-value map-options label="单据类型" />
</div>
<div class="col-3 Sysuser_Date">
<q-field filled>
 <template v-slot:control>
<q-field filled>
<template v-slot:control>
<el-date-picker v-model="applyDateList" @change="resetSearch()" value-format="yyyy-MM-dd" type="daterange" style="border:none;"
 range-separator="至"  start-placeholder="申请开始日期"  end-placeholder="申请结束日期">
 </el-date-picker>       
 range-separator="至"  start-placeholder="申请开始日期"  end-placeholder="申请结束日期" />
</template>
</q-field>
</div>
</div>
</div>
<div class="page-content">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-tow-column-table sticky-right-column-table"
separator="none" :data="data" :columns="columns" row-key="name">
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat
class="sticky-tow-column-table sticky-right-column-table" separator="none" :data="data" :columns="columns"
row-key="name">
<template v-slot:body-cell-ReceiptTypeName="props">
<q-td :props="props">
<span class="ReceipTypeName">{{props.row.ReceiptTypeName}}</span>
......@@ -64,7 +65,8 @@
<template v-slot:body-cell-ApplyReason="props">
<q-td :props="props">
<div class="bill_Rearsons">
<template v-if="props.row.ReceiptType==1||props.row.ReceiptType==5||props.row.ReceiptType==3||props.row.ReceiptType==4">
<template
v-if="props.row.ReceiptType==1||props.row.ReceiptType==5||props.row.ReceiptType==3||props.row.ReceiptType==4">
<span>
{{props.row.DataObj.Remarks}}
<q-tooltip :offset="[0, 10]">
......@@ -90,7 +92,7 @@
<q-tooltip :offset="[10, 10]">
<template v-if="props.row.AuditObj.AuditManList"
v-for="(sItem,sIndex) in props.row.AuditObj.AuditManList">
<span>{{sItem.AuditManName}} 待审</span><br />
<span :key="sIndex">{{sItem.AuditManName}} 待审</span><br />
</template>
</q-tooltip>
</span>
......@@ -137,7 +139,7 @@
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveBill" />
</q-card-actions>
</q-popup-proxy>
</q-btn>
<q-btn flat size="xs" icon="iconfont icon-View" color="accent" style="font-weight:400" label="查看"
@click="showBillForm(props.row,1)" />
</q-td>
......@@ -159,6 +161,9 @@
<temporaryClass-form v-if="isShowTemporaryClass" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage">
</temporaryClass-form>
<!-- 显示Vip课程申请 -->
<vipcoursebillForm v-if="isShowVipCourseForm" :seting-obj="billObj" :showType="showType" @close="closeBillForm"
@success="refreshPage"></vipcoursebillForm>
</div>
</div>
</template>
......@@ -179,6 +184,7 @@
import ordertransForm from '../../components/sale/ordertrans-form'
import stopbillForm from '../../components/sale/stopbill-form';
import temporaryClassForm from '../../components/sale/temporaryClassbill-form';
import vipcoursebillForm from "../../components/sale/vipcoursebill-form.vue";
export default {
meta: {
title: "教务单据查询"
......@@ -188,7 +194,8 @@
changebillForm,
ordertransForm,
stopbillForm,
temporaryClassForm
temporaryClassForm,
vipcoursebillForm
},
data() {
return {
......@@ -283,9 +290,10 @@
EmployeeList: [],
AllemployeeList: [],
IsEditEduReceipAudit: false, //是否有修改审核人权限
isShowTransForm:false,
isShowStopBillForm:false,//是否显示停课订单详情
isShowTemporaryClass:false,//是否显示临时上课邀请订单详情
isShowTransForm: false,
isShowStopBillForm: false, //是否显示停课订单详情
isShowTemporaryClass: false, //是否显示临时上课邀请订单详情
isShowVipCourseForm: false, //是否显示Vip课程申请详情
}
},
created() {
......@@ -300,7 +308,7 @@
}
},
mounted() {
if(this.$route.query.Id){
if (this.$route.query.Id) {
this.msg.Id = this.$route.query.Id;
}
this.currentUrl = this.$route.path;
......@@ -329,12 +337,14 @@
this.isShowBackBillForm = false;
this.isShowChangeBillForm = false;
this.isShowTransForm = false;
this.isShowStopBillForm=false;
this.isShowStopBillForm = false;
this.isShowTemporaryClass = false;
this.isShowVipCourseForm = false;
this.billObj = {};
},
//显示表单
showBillForm(item, type) {
//调课
if (item.ReceiptType == 1) {
this.isShowChangeBillForm = true;
......@@ -344,7 +354,7 @@
this.isShowBackBillForm = true;
}
//转班
else if(item.ReceiptType == 5||item.ReceiptType == 6){
else if (item.ReceiptType == 5 || item.ReceiptType == 6) {
this.isShowTransForm = true;
}
//停课
......@@ -352,8 +362,12 @@
this.isShowStopBillForm = true;
}
//临时上课邀请
else if (item.ReceiptType == 4){
this.isShowTemporaryClass =true;
else if (item.ReceiptType == 4) {
this.isShowTemporaryClass = true;
}
//临时上课邀请
else if (item.ReceiptType == 11) {
this.isShowVipCourseForm = true;
}
this.showType = type;
this.billObj = item;
......@@ -394,6 +408,7 @@
refreshPage() {
this.isShowBackBillForm = false;
this.isShowChangeBillForm = false;
this.isShowVipCourseForm = false;
this.billObj = {};
this.getStuBackBill();
},
......@@ -466,9 +481,7 @@
}
}
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</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