Skip to content

C
confucius
Commit 1d95c705 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

parents 7669b11b d4f736f3
Hide whitespace changes
Inline Side-by-side
Showing with 295 additions and 40 deletions
src/components/course/class-form.vue
View file @ 1d95c705
......@@ -277,8 +277,9 @@
<tbody v-for="(nItem,nIndex) in DefaultPlanTimeList" :key="nIndex+10000">
<tr v-for="(sItem,sIndex) in nItem.TimeList">
<td :rowspan="nItem.TimeList.length" v-if="sIndex==0" style="position:relative;">
<q-select filled style="width:220px;" stack-label multiple v-model="nItem.DateList" ref="DateList" :options="checkedDays"
:label="objOption.ClassStyle==1?'选择周几':'选择日期'" :dense="false" class="col-6" emit-value map-options clearable>
<q-select filled style="width:220px;" stack-label multiple v-model="nItem.DateList" ref="DateList"
:options="checkedDays" :label="objOption.ClassStyle==1?'选择周几':'选择日期'" :dense="false" class="col-6"
emit-value map-options clearable>
</q-select>
<a @click="deletePlan(nIndex)" style="color:blue;cursor:pointer;position:absolute;">删除</a>
</td>
......@@ -307,9 +308,10 @@
class="col-6 q-pr-lg q-pb-lg" label="学习课时" @keyup.native="checkInteger(objOption,'ClassHours')" />
</div>
<div class="col-6">
<q-select filled stack-label option-value="CTypeId" option-label="CTypeName" v-model="objOption.ClassType"
ref="CouseId" :options="classTypeList" label="班级类型" :dense="false" class="col-6 q-pr-lg q-pb-lg"
emit-value map-options />
<q-select label="课时分钟数" filled stack-label v-model="objOption.ClassHourMinute"
:options="ClassHourMinuteArray" option-value="Id" option-label="Name" :dense="false"
class="col-6 q-pr-lg q-pb-lg" emit-value map-options>
</q-select>
</div>
</div>
<div class="row wrap" style="margin-top:30px;">
......@@ -384,6 +386,7 @@
OutRemark: '', //对外备注
CompleteProgress: 0, //完成进度
ClassType: 1, //班级类型
ClassHourMinute: 45, //课时分钟数
},
optionTitle: "",
saveCourseLoading: false,
......@@ -439,10 +442,19 @@
value: '7',
icon: 7
}],
ClassHourMinuteArray: [{
Id: 45,
Name: 45
},
{
Id: 60,
Name: 60
},
],
//选中日期/星期
checkedDays: [],
//默认上课时间数组
DefaultPlanTimeList: [ ],
DefaultPlanTimeList: [],
}
},
created() {
......@@ -513,6 +525,7 @@
this.objOption.ClassStatus = TempData.ClassStatus;
this.objOption.InnerRemark = TempData.InnerRemark;
this.objOption.ClassType = TempData.ClassType;
this.objOption.ClassHourMinute = TempData.ClassHourMinute;
//默认时间
if (TempData.DefaultTimeList && TempData.DefaultTimeList.length > 0) {
this.DefaultPlanTimeList = TempData.DefaultTimeList;
......
src/components/sale/eduinfo-form.vue
View file @ 1d95c705
......@@ -115,7 +115,7 @@
<tr>
<td>培训课程内容</td>
<td>
<q-input filled disable v-model="objOption.CourseName" />
<q-input filled v-model="objOption.CourseName" />
</td>
<td>校区名称</td>
<td>
......
src/components/sale/orderlist.vue
View file @ 1d95c705
......@@ -124,7 +124,7 @@
<template v-if="item.Unit_Price>=0">
{{item.Unit_Price.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.Unit_Price.toFixed(2)}}</span>
</template>
</td>
......@@ -132,16 +132,16 @@
<template v-if="item.PreferPrice>=0">
{{item.PreferPrice.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.PreferPrice.toFixed(2)}}</span>
</template>
</td>
<td style="border:none">
<template v-if="item.Income>=0">
{{item.Income.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.Income.toFixed(2)}}</span>
</template>
</td>
......@@ -149,7 +149,7 @@
<template v-if="item.DiscountMoney>=0">
{{item.DiscountMoney.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.DiscountMoney.toFixed(2)}}</span>
</template>
</td>
......@@ -157,7 +157,7 @@
<template v-if="item.LessPrice>=0">
{{item.LessPrice.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.LessPrice.toFixed(2)}}</span>
</template>
</td>
......@@ -165,7 +165,7 @@
<template v-if="item.Refund>=0">
{{item.Refund.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.Refund.toFixed(2)}}</span>
</template>
</td>
......@@ -173,7 +173,7 @@
<template v-if="item.PlatformTax>=0">
{{item.PlatformTax.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.PlatformTax.toFixed(2)}}</span>
</template>
</td>
......@@ -181,7 +181,7 @@
<template v-if="item.DueInMoney>=0">
{{item.DueInMoney.toFixed(2)}}
</template>
<template v-else >
<template v-else>
<span class="redstyle">{{item.DueInMoney.toFixed(2)}}</span>
</template>
</td>
......@@ -303,15 +303,16 @@
<th>姓名</th>
<th style="width:180px;">合同编号</th>
<th>状态</th>
<th width="170px;" v-if="AuthorityObj.isShowEdit">操作</th>
<th width="170px;">操作</th>
</tr>
<tr v-for="subItem in item.GuestList">
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ContractNo}}</td>
<td>{{subItem.ContractStatusStr}}</td>
<td v-if="AuthorityObj.isShowEdit">
<td>
<template v-if="subItem.ContractId==0">
<q-btn color="accent" size="sm" @click="takeContractTwo(item,subItem)" label="领取合同" />
<q-btn v-if="AuthorityObj.isShowEdit" color="accent" size="sm"
@click="takeContractTwo(item,subItem)" label="领取合同" />
</template>
<template v-else>
<q-btn color="secondary" size="sm" @click="goContractMannage(subItem)" label="查看合同" />
......@@ -1572,8 +1573,9 @@
overflow-x: hidden;
overflow-y: auto;
}
.classorder .redstyle{
color:var(--q-color-negative);
.classorder .redstyle {
color: var(--q-color-negative);
}
</style>
src/pages/course/baseSet.vue
View file @ 1d95c705
......@@ -57,12 +57,10 @@
管理员：
</div>
<div class="col-3">
<q-select v-model="msg.AdminiIds" :options="EmployeeListOption" color="primary" stack-label filled multiple clearable
label="" option-label="EmployeeName" option-value="Id" ref="AdminiIds" emit-value map-options
/>
<q-select v-model="msg.AdminList" :options="EmployeeListOption" color="primary" stack-label filled multiple
clearable label="" option-label="EmployeeName" option-value="Id" ref="AdminList" emit-value map-options />
</div>
<div class="col-3" style="padding:18px 0 0 10px;color:gray">
</div>
</div>
<div class="col row wrap">
......@@ -129,14 +127,14 @@
<q-input filled stack-label :dense="false" maxlength="8" v-model="addMsg.DefaultClassNum" label="默认班级人数"
ref="DefaultClassNum" class="q-pb-lg" @keyup.native="checkInteger(addMsg,'DefaultClassNum')"
:rules="[val => !!val || '请填写默认班级人数']" />
<q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="persistent=false" />
<q-btn label="确认" color="accent q-px-md" style="font-weight:400 !important" @click="saveClassType()" />
</q-card-actions>
</q-card>
</q-dialog>
</div>
</template>
<script>
......@@ -166,7 +164,8 @@
BasicClassNum: '', //基础带班人数
BasicMinutes: '', //课时分钟数
BasicHours: 0, //基础课时
AdminiIds:[],//管理员
AdminList: [],
AdminiIds: "", //管理员
},
columns: [{
name: 'CTypeName',
......@@ -211,7 +210,6 @@
CTypeName: '', //类型名称
AddHourFee: '', //课时费加价
DefaultClassNum: '', //默认班级人数
},
//列表数据参数
tabeMsg: {
......@@ -233,7 +231,11 @@
methods: {
//保存基础数据
saveInfo() {
this.msg.AdminiIds=this.msg.AdminiIds.join(',');
if (this.msg.AdminList && this.msg.AdminList.length > 0) {
this.msg.AdminiIds = this.msg.AdminList.join(',')
} else {
this.msg.AdminiIds = "";
}
SetClassConfig(this.msg).then(res => {
if (res.Code == 1) {
this.$q.notify({
......@@ -257,10 +259,13 @@
this.msg.BasicClassNum = res.Data.BasicClassNum;
this.msg.BasicMinutes = res.Data.BasicMinutes;
this.msg.BasicHours = res.Data.BasicHours;
let arr=res.Data.AdminiIds.split(",");
this.msg.AdminiIds= arr.map(e=>{
return e=parseInt(e)
})
this.msg.AdminiIds = res.Data.AdminiIds;
if (res.Data.AdminiIds && res.Data.AdminiIds != '') {
let arr = res.Data.AdminiIds.split(",");
this.msg.AdminList = arr.map(e => {
return e = parseInt(e)
})
}
}
}
})
......@@ -376,7 +381,7 @@
closeSetForm() {
this.persistent = false;
},
//获取业务员
//获取业务员
getEmployee(id) {
var qMsg = {
Dept_Id: 0
......
src/pages/financial/lessonCostStatistics.vue
View file @ 1d95c705
......@@ -104,6 +104,7 @@
<el-table-column prop="LeaveStatus" label="职务"> </el-table-column>
<el-table-column prop="EmployeeName" label="老师名称"></el-table-column>
<el-table-column prop="KSNum" label="上课课时"> </el-table-column>
<el-table-column prop="DKNum" label="基础课时"></el-table-column>
<el-table-column prop="Hours" label="课时转换/小时"></el-table-column>
<el-table-column prop="KSMoney" label="课时费"> </el-table-column>
<el-table-column prop="StuLearnMoney" label="学生上课金额"> </el-table-column>
......@@ -244,8 +245,27 @@
})
},
goUrl(path, id) {
if(this.valuemonth ==null || this.valueyear==null){
this.$q.notify({
type: 'negative',
position: "top",
message: `请选择日期`
})
return
}
if(path == 'teacherclassfee' && this.datetype==1){
this.$q.notify({
type: 'negative',
position: "top",
message: `老师只能按月份查看`
})
return
}
this.OpenNewUrl('/financial/' + path, {
id: id
id: id,
datetype:this.datetype,
valueyear:this.valueyear,
valuemonth:this.valuemonth,
});
// this.$router.push({
// path: '/financial/' + path,
......
src/pages/financial/saleAchievementsRank.vue
View file @ 1d95c705
......@@ -49,7 +49,7 @@
background-color: transparent;
}
.lessonCostStatistics .el-input__inner {
.lessonCostStatistics .page-search .el-input__inner {
width: 100%;
border: none;
background-color: transparent;
......
src/pages/financial/studentsClassfee.vue
View file @ 1d95c705
......@@ -205,6 +205,15 @@
if(this.$route.query && this.$route.query.id){
this.msg.TeacherId = Number(this.$route.query.id)
}
if(this.$route.query && this.$route.query.datetype){
this.datetype = this.$route.query.datetype
}
if(this.$route.query && this.$route.query.valueyear){
this.valueyear = this.$route.query.valueyear
}
if(this.$route.query && this.$route.query.valuemonth){
this.valuemonth = this.$route.query.valuemonth
}
},
mounted() {
this.getList();//获取提成周期列表
......
src/pages/financial/teacherclassfee.vue
View file @ 1d95c705
......@@ -100,12 +100,14 @@
<template>
<el-table ref="filterTable" :data="tableData" v-loading='loading'
:header-cell-style="{backgroundColor:'#f5f6f7', color: '#a8a8b3'}" border style="width: 100%">
<el-table-column prop="ClassDate" label="上课日期"></el-table-column>
<el-table-column prop="Date" label="上课日期"></el-table-column>
<el-table-column prop="TimeBucket" label="上课时间段"> </el-table-column>
<el-table-column prop="TeacherName" label="老师名称"></el-table-column>
<el-table-column prop="ClassName" label="上课班级" width='200'> </el-table-column>
<el-table-column prop="CourseName" label="课程" width='230'></el-table-column>
<el-table-column prop="UnitPrice" label="课时单价"></el-table-column>
<el-table-column prop="KSNum" label="上课课时"></el-table-column>
<el-table-column prop="DKNum" label="基础课时"></el-table-column>
<el-table-column prop="Hours" label="课时转换/小时"> </el-table-column>
<el-table-column prop="HourMoney" label="课时费单价元/小时"></el-table-column>
<el-table-column prop="KSMoney" label="老师课时费"></el-table-column>
......@@ -162,7 +164,7 @@
TeacherList: [],
datetypelist: [
{ Id: '2', Name: '月份' },
{ Id: '1', Name: '年份' },
// { Id: '1', Name: '年份' },
]
}
},
......@@ -173,7 +175,15 @@
this.valueyear = myDate.getFullYear().toString()
if(this.$route.query && this.$route.query.id){
this.msg.TeacherId = Number(this.$route.query.id)
}
if(this.$route.query && this.$route.query.datetype){
this.datetype = this.$route.query.datetype
}
if(this.$route.query && this.$route.query.valueyear){
this.valueyear = this.$route.query.valueyear
}
if(this.$route.query && this.$route.query.valuemonth){
this.valuemonth = this.$route.query.valuemonth
}
},
mounted() {
......
src/pages/user/personalData.vue 0 → 100644
View file @ 1d95c705
<style>
.personalData {
justify-content: space-between;
}
.personalData .box_l,
.box_r {
background: #fff;
border-radius: 6px;
}
.personalData .box_l {
width: 380px;
margin-right: 30px;
padding: 40px;
}
.personalData .box_r {
flex: 1;
width: 1px;
padding: 20px 26px;
}
.personalData .box_l_t {
margin-top: 28px;
font-size: 14px;
color: #999999;
}
.personalData .box_l_t_l {
color: #3F4254;
font-weight: bold;
}
.personalData .box_l_title {
width: 100%;
height: 50px;
line-height: 50px;
background: #2961FE;
border-radius: 4px;
font-size: 16px;
font-weight: bold;
color: #FFFFFF;
padding-left: 39px;
margin-top: 55px;
}
.personalData .box_l_cen{
width: 100%;
height: 50px;
line-height: 50px;
border-radius: 4px;
font-size: 16px;
font-weight: bold;
color: #3F4254;
padding-left: 39px;
margin-top: 8px;
justify-content: space-between;
}
.personalData .headportrait{
width: 120px;
height: 120px;
border-radius: 20px;
position: relative;
margin-top: 20px;
}
.personalData .box_r_title{
font-size: 12px;font-weight: bold;color: #000000;margin-top: 27px
}
.personalData .box_r_input{
width: 55%;
height: 54px;
padding: 10px 22px;
border-radius: 4px;
background: #F0F5FB;
margin-top: 20px;
}
</style>
<template>
<div class="page-body personalData row" style="background: transparent;">
<div class="box_l">
<div class="q-mt-lg flex">
<q-avatar size="100px" font-size="36px" rounded style="background:#C9F7F5" text-color="white">
<img :src="showObj.UserIcon" v-if="showObj.UserIcon">
<span v-else>{{showObj.AccountName.substring(0,1)}}</span>
</q-avatar>
<div class="col q-ml-md">
<div class="text-weight-bold" style="font-size:18px;font-weight: 800;color: #3F4254;">
{{showObj.AccountName}}</div>
<div class="text-muted" style="font-size:14px;margin-top: 12px;">
{{showObj.SchoolName}}·{{showObj.PostName}}</div>
<div class="q-mt-xs">
<q-btn style="background: var(--q-color-negative);color: white;" @click="logout">退出登录</q-btn>
</div>
</div>
</div>
<div class="box_l_t" style="margin-top: 40px;">
<span class="box_l_t_l">邮箱：</span>
<span>{{showObj.Email}}</span>
</div>
<div class="box_l_t">
<span class="box_l_t_l">电话：</span>
<span>{{showObj.UserMobile}}</span>
</div>
<div class="box_l_t">
<span class="box_l_t_l">部门：</span>
<span>{{showObj.DeptName}}</span>
</div>
<div class="box_l_title">概要信息</div>
<div class="box_l_cen">预警信息</div>
<div class="box_l_cen">账户资料</div>
<div class="box_l_cen">密码修改</div>
</div>
<div class="box_r">
<template v-if='rightType == 1'>
<div style="font-size: 16px;font-weight: bold;color: #000000;">账户资料</div>
<div class="box_r_title" >账户资料</div>
<div class="headportrait">
<q-avatar size="120px" font-size="36px" rounded style="background:#C9F7F5" text-color="white">
<img :src="showObj.UserIcon" v-if="showObj.UserIcon">
<span v-else>{{showObj.AccountName.substring(0,1)}}</span>
</q-avatar>
</div>
<div style="font-size: 12px;color: #999999;margin-top: 12px;">图片格式：png、jpg、jpeg</div>
<div class="box_r_title" >基础资料</div>
<div class="box_r_input">
</div>
<div class="box_r_input"></div>
<div class="box_r_title" >联系方式</div>
</template>
</div>
</div>
</template>
<script>
import {
queryStudentBackClassPage,
} from '../../api/sale/bill'
export default {
meta: {
title: "个人资料"
},
components: {
},
data() {
return {
showObj: {},
rightType:1,//右边显示类型
}
},
created() {
this.showObj = this.getLocalStorage();
},
mounted() {
// this.getStuBackBill();
},
methods: {
//获取退课单据分页列表
getStuBackBill() {
queryStudentBackClassPage(this.msg).then(res => {
this.loading = false;
this.data = res.Data.PageData;
this.pageCount = res.Data.PageCount;
}).catch(() => {
this.loading = false;
})
},
logout() {
this.$store
.dispatch('LogOut')
.then(() => {
this.$router.push('/login')
})
.catch((e) => {
})
},
},
}
</script>
<style lang="sass">
@import url('~assets/css/table.sass')
</style>
\ No newline at end of file
src/router/routes.js
View file @ 1d95c705
......@@ -766,6 +766,12 @@ const routes = [{
component: () =>
import("pages/user/backbill.vue")
},
{
path: "/user/personalData", //个人资料
component: () =>
import("pages/user/personalData.vue")
},
{
path: "/course/questionlist", //题库列表
component: () =>
......
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